gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[libeufin] branch master updated: move to custom JAXB in kotlin, lots of


From: gnunet
Subject: [libeufin] branch master updated: move to custom JAXB in kotlin, lots of refactoring
Date: Tue, 29 Oct 2019 20:20:28 +0100

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository libeufin.

The following commit(s) were added to refs/heads/master by this push:
     new 1c2a672  move to custom JAXB in kotlin, lots of refactoring
1c2a672 is described below

commit 1c2a6721a727c3909b971b31a32a1ca606f18917
Author: Florian Dold <address@hidden>
AuthorDate: Tue Oct 29 20:20:12 2019 +0100

    move to custom JAXB in kotlin, lots of refactoring
---
 .idea/dictionaries/dold.xml                        |    1 +
 .idea/inspectionProfiles/Project_Default.xml       |    8 +
 .idea/misc.xml                                     |    2 +-
 gradle.properties                                  |    3 +-
 sandbox/build.gradle                               |    4 +
 .../messages/ebics/hev/HEVRequestDataType.java     |  107 --
 .../messages/ebics/hev/HEVResponseDataType.java    |  223 ---
 .../libeufin/messages/ebics/hev/ObjectFactory.java |   87 -
 .../messages/ebics/hev/SystemReturnCodeType.java   |  100 -
 .../ebics/keyrequest/AccountHolderRoleType.java    |   84 -
 .../ebics/keyrequest/AccountNumberRoleType.java    |   84 -
 .../messages/ebics/keyrequest/AccountType.java     |  620 ------
 .../messages/ebics/keyrequest/AddressInfoType.java |  265 ---
 .../messages/ebics/keyrequest/AmountType.java      |  104 -
 .../ebics/keyrequest/AttributedAccountType.java    |  967 ----------
 .../ebics/keyrequest/AuthOrderInfoType.java        |  262 ---
 .../AuthenticationCertificateInfoType.java         |   78 -
 .../keyrequest/AuthenticationPubKeyInfoType.java   |   78 -
 .../ebics/keyrequest/AuthorisationLevelType.java   |   70 -
 .../ebics/keyrequest/BankCodeRoleType.java         |   84 -
 .../messages/ebics/keyrequest/BankInfoType.java    |  147 --
 .../keyrequest/BankSignatureDataSigBookType.java   |  139 --
 .../keyrequest/CanonicalizationMethodType.java     |  109 --
 .../ebics/keyrequest/CertificateInfoType.java      |  115 --
 .../messages/ebics/keyrequest/CurrencyCode.java    | 1183 ------------
 .../messages/ebics/keyrequest/DSAKeyValueType.java |  227 ---
 .../messages/ebics/keyrequest/DataDigestType.java  |   99 -
 .../ebics/keyrequest/DataEncryptionInfoType.java   |  205 --
 .../ebics/keyrequest/DataTransferRequestType.java  |  386 ----
 .../ebics/keyrequest/DataTransferResponseType.java |  355 ----
 .../ebics/keyrequest/DigestMethodType.java         |  111 --
 .../keyrequest/EbicsNoPubKeyDigestsRequest.java    |  335 ----
 .../ebics/keyrequest/EbicsUnsecuredRequest.java    |  510 -----
 .../ebics/keyrequest/EbicsUnsignedRequest.java     |  633 -------
 .../ebics/keyrequest/EmptyMutableHeaderType.java   |   80 -
 .../keyrequest/EncryptionCertificateInfoType.java  |   78 -
 .../ebics/keyrequest/EncryptionPubKeyInfoType.java |   78 -
 .../ebics/keyrequest/FDLOrderParamsType.java       |  232 ---
 .../ebics/keyrequest/FULOrderParamsType.java       |  106 --
 .../messages/ebics/keyrequest/FileFormatType.java  |  102 -
 .../ebics/keyrequest/GenericOrderParamsType.java   |   78 -
 .../ebics/keyrequest/H3KRequestOrderDataType.java  |  190 --
 .../ebics/keyrequest/HAAResponseOrderDataType.java |  114 --
 .../ebics/keyrequest/HCARequestOrderDataType.java  |  200 --
 .../ebics/keyrequest/HCSRequestOrderDataType.java  |  228 ---
 .../ebics/keyrequest/HIARequestOrderDataType.java  |  200 --
 .../ebics/keyrequest/HKDResponseOrderDataType.java |  140 --
 .../ebics/keyrequest/HPBResponseOrderDataType.java |  169 --
 .../ebics/keyrequest/HPDAccessParamsType.java      |  274 ---
 .../ebics/keyrequest/HPDProtocolParamsType.java    |  713 -------
 .../ebics/keyrequest/HPDResponseOrderDataType.java |   99 -
 .../messages/ebics/keyrequest/HPDVersionType.java  |  234 ---
 .../ebics/keyrequest/HSARequestOrderDataType.java  |  200 --
 .../ebics/keyrequest/HTDReponseOrderDataType.java  |  137 --
 .../ebics/keyrequest/HVDOrderParamsType.java       |  199 --
 .../ebics/keyrequest/HVDResponseOrderDataType.java |  240 ---
 .../ebics/keyrequest/HVEOrderParamsType.java       |  199 --
 .../ebics/keyrequest/HVSOrderParamsType.java       |  199 --
 .../ebics/keyrequest/HVSRequestOrderDataType.java  |  109 --
 .../ebics/keyrequest/HVTAccountInfoType.java       |   41 -
 .../ebics/keyrequest/HVTOrderFlagsType.java        |  155 --
 .../ebics/keyrequest/HVTOrderInfoType.java         |  520 -----
 .../ebics/keyrequest/HVTOrderParamsType.java       |  295 ---
 .../ebics/keyrequest/HVTResponseOrderData.java     |   39 -
 .../ebics/keyrequest/HVTResponseOrderDataType.java |  149 --
 .../ebics/keyrequest/HVUOrderDetailsType.java      |  291 ---
 .../ebics/keyrequest/HVUOrderParamsType.java       |  116 --
 .../ebics/keyrequest/HVUOriginatorInfoType.java    |  203 --
 .../ebics/keyrequest/HVUResponseOrderDataType.java |  114 --
 .../ebics/keyrequest/HVUSigningInfoType.java       |  117 --
 .../ebics/keyrequest/HVZOrderDetailsType.java      | 1190 ------------
 .../ebics/keyrequest/HVZOrderParamsType.java       |  116 --
 .../ebics/keyrequest/HVZResponseOrderDataType.java |  114 --
 .../messages/ebics/keyrequest/KeyInfoType.java     |  142 --
 .../messages/ebics/keyrequest/KeyValueType.java    |   92 -
 .../messages/ebics/keyrequest/ManifestType.java    |  111 --
 .../NoPubKeyDigestsReqOrderDetailsType.java        |   45 -
 .../NoPubKeyDigestsRequestStaticHeaderType.java    |   53 -
 .../messages/ebics/keyrequest/ObjectFactory.java   | 1999 --------------------
 .../messages/ebics/keyrequest/ObjectType.java      |  171 --
 .../ebics/keyrequest/OrderAttributeType.java       |   62 -
 .../ebics/keyrequest/OrderDetailsType.java         |  107 --
 .../ebics/keyrequest/OrderSignatureDataType.java   |  190 --
 .../messages/ebics/keyrequest/OrderTType.java      |  723 -------
 .../messages/ebics/keyrequest/PGPDataType.java     |  105 -
 .../messages/ebics/keyrequest/Parameter.java       |  196 --
 .../messages/ebics/keyrequest/PartnerInfoType.java |  310 ---
 .../keyrequest/PreValidationAccountAuthType.java   |   73 -
 .../ebics/keyrequest/PreValidationRequestType.java |  147 --
 .../ebics/keyrequest/ProductElementType.java       |  129 --
 .../ebics/keyrequest/PubKeyDigestType.java         |  100 -
 .../PubKeyInfoTypeAtEbicsSignatures.java           |  143 --
 .../keyrequest/PubKeyInfoTypeAtEbicsTypes.java     |  144 --
 .../PubKeyValueTypeAtEbicsSignatures.java          |  140 --
 .../keyrequest/PubKeyValueTypeAtEbicsTypes.java    |  140 --
 .../messages/ebics/keyrequest/RSAKeyValueType.java |   93 -
 .../messages/ebics/keyrequest/ReferenceType.java   |  214 ---
 .../ebics/keyrequest/RetrievalMethodType.java      |  127 --
 .../messages/ebics/keyrequest/SPKIDataType.java    |   83 -
 .../keyrequest/SignatureCertificateInfoType.java   |   78 -
 .../ebics/keyrequest/SignatureMethodType.java      |  115 --
 .../ebics/keyrequest/SignaturePropertiesType.java  |  111 --
 .../ebics/keyrequest/SignaturePropertyType.java    |  144 --
 .../ebics/keyrequest/SignaturePubKeyInfoType.java  |   78 -
 .../keyrequest/SignaturePubKeyOrderDataType.java   |  172 --
 .../messages/ebics/keyrequest/SignatureType.java   |  195 --
 .../ebics/keyrequest/SignatureValueType.java       |   99 -
 .../messages/ebics/keyrequest/SignedInfoType.java  |  167 --
 .../messages/ebics/keyrequest/SignerInfoType.java  |  319 ----
 .../ebics/keyrequest/StandardOrderParamsType.java  |  169 --
 .../ebics/keyrequest/StaticHeaderBaseType.java     |  357 ----
 .../ebics/keyrequest/TransactionPhaseType.java     |   76 -
 .../keyrequest/TransferReceiptRequestType.java     |  103 -
 .../keyrequest/TransferReceiptResponseType.java    |  144 --
 .../messages/ebics/keyrequest/TransferType.java    |   68 -
 .../messages/ebics/keyrequest/TransformType.java   |  116 --
 .../messages/ebics/keyrequest/TransformsType.java  |   76 -
 .../keyrequest/UnsecuredReqOrderDetailsType.java   |   45 -
 .../UnsecuredRequestStaticHeaderType.java          |   53 -
 .../keyrequest/UnsignedReqOrderDetailsType.java    |   45 -
 .../UnsignedRequestStaticHeaderType.java           |   53 -
 .../messages/ebics/keyrequest/UserInfoType.java    |  258 ---
 .../ebics/keyrequest/UserPermissionType.java       |  258 ---
 .../keyrequest/UserSignatureDataSigBookType.java   |  211 ---
 .../messages/ebics/keyrequest/X509DataType.java    |  100 -
 .../ebics/keyrequest/X509IssuerSerialType.java     |   98 -
 .../messages/ebics/keyrequest/package-info.java    |    9 -
 .../ebics/keyresponse/AccountHolderRoleType.java   |   84 -
 .../ebics/keyresponse/AccountNumberRoleType.java   |   84 -
 .../messages/ebics/keyresponse/AccountType.java    |  620 ------
 .../ebics/keyresponse/AddressInfoType.java         |  265 ---
 .../messages/ebics/keyresponse/AmountType.java     |  104 -
 .../ebics/keyresponse/AttributedAccountType.java   |  967 ----------
 .../ebics/keyresponse/AuthOrderInfoType.java       |  262 ---
 .../AuthenticationCertificateInfoType.java         |   78 -
 .../keyresponse/AuthenticationPubKeyInfoType.java  |   78 -
 .../ebics/keyresponse/AuthorisationLevelType.java  |   70 -
 .../ebics/keyresponse/BankCodeRoleType.java        |   84 -
 .../messages/ebics/keyresponse/BankInfoType.java   |  147 --
 .../keyresponse/BankSignatureDataSigBookType.java  |  139 --
 .../keyresponse/CanonicalizationMethodType.java    |  109 --
 .../ebics/keyresponse/CertificateInfoType.java     |  115 --
 .../messages/ebics/keyresponse/CurrencyCode.java   | 1183 ------------
 .../ebics/keyresponse/DSAKeyValueType.java         |  227 ---
 .../messages/ebics/keyresponse/DataDigestType.java |   99 -
 .../ebics/keyresponse/DataEncryptionInfoType.java  |  206 --
 .../ebics/keyresponse/DataTransferRequestType.java |  386 ----
 .../keyresponse/DataTransferResponseType.java      |  355 ----
 .../ebics/keyresponse/DigestMethodType.java        |  111 --
 .../keyresponse/EbicsKeyManagementResponse.java    |  927 ---------
 .../keyresponse/EncryptionCertificateInfoType.java |   78 -
 .../keyresponse/EncryptionPubKeyInfoType.java      |   78 -
 .../ebics/keyresponse/FDLOrderParamsType.java      |  232 ---
 .../ebics/keyresponse/FULOrderParamsType.java      |  106 --
 .../messages/ebics/keyresponse/FileFormatType.java |  102 -
 .../ebics/keyresponse/GenericOrderParamsType.java  |   78 -
 .../ebics/keyresponse/H3KRequestOrderDataType.java |  190 --
 .../keyresponse/HAAResponseOrderDataType.java      |  114 --
 .../ebics/keyresponse/HCARequestOrderDataType.java |  200 --
 .../ebics/keyresponse/HCSRequestOrderDataType.java |  228 ---
 .../ebics/keyresponse/HIARequestOrderDataType.java |  200 --
 .../keyresponse/HKDResponseOrderDataType.java      |  140 --
 .../keyresponse/HPBResponseOrderDataType.java      |  169 --
 .../ebics/keyresponse/HPDAccessParamsType.java     |  274 ---
 .../ebics/keyresponse/HPDProtocolParamsType.java   |  713 -------
 .../keyresponse/HPDResponseOrderDataType.java      |   99 -
 .../messages/ebics/keyresponse/HPDVersionType.java |  234 ---
 .../ebics/keyresponse/HSARequestOrderDataType.java |  200 --
 .../ebics/keyresponse/HTDReponseOrderDataType.java |  137 --
 .../ebics/keyresponse/HVDOrderParamsType.java      |  199 --
 .../keyresponse/HVDResponseOrderDataType.java      |  240 ---
 .../ebics/keyresponse/HVEOrderParamsType.java      |  199 --
 .../ebics/keyresponse/HVSOrderParamsType.java      |  199 --
 .../ebics/keyresponse/HVSRequestOrderDataType.java |  109 --
 .../ebics/keyresponse/HVTAccountInfoType.java      |   41 -
 .../ebics/keyresponse/HVTOrderFlagsType.java       |  155 --
 .../ebics/keyresponse/HVTOrderInfoType.java        |  520 -----
 .../ebics/keyresponse/HVTOrderParamsType.java      |  295 ---
 .../ebics/keyresponse/HVTResponseOrderData.java    |   39 -
 .../keyresponse/HVTResponseOrderDataType.java      |  149 --
 .../ebics/keyresponse/HVUOrderDetailsType.java     |  291 ---
 .../ebics/keyresponse/HVUOrderParamsType.java      |  116 --
 .../ebics/keyresponse/HVUOriginatorInfoType.java   |  203 --
 .../keyresponse/HVUResponseOrderDataType.java      |  114 --
 .../ebics/keyresponse/HVUSigningInfoType.java      |  117 --
 .../ebics/keyresponse/HVZOrderDetailsType.java     | 1190 ------------
 .../ebics/keyresponse/HVZOrderParamsType.java      |  116 --
 .../keyresponse/HVZResponseOrderDataType.java      |  114 --
 .../messages/ebics/keyresponse/KeyInfoType.java    |  142 --
 .../KeyMgmntResponseMutableHeaderType.java         |  175 --
 .../messages/ebics/keyresponse/KeyValueType.java   |   92 -
 .../messages/ebics/keyresponse/ManifestType.java   |  111 --
 .../messages/ebics/keyresponse/ObjectFactory.java  | 1893 ------------------
 .../messages/ebics/keyresponse/ObjectType.java     |  171 --
 .../ebics/keyresponse/OrderAttributeType.java      |   62 -
 .../ebics/keyresponse/OrderSignatureDataType.java  |  190 --
 .../messages/ebics/keyresponse/OrderTType.java     |  723 -------
 .../messages/ebics/keyresponse/PGPDataType.java    |  105 -
 .../messages/ebics/keyresponse/Parameter.java      |  196 --
 .../ebics/keyresponse/PartnerInfoType.java         |  310 ---
 .../keyresponse/PreValidationAccountAuthType.java  |   73 -
 .../keyresponse/PreValidationRequestType.java      |  147 --
 .../ebics/keyresponse/PubKeyDigestType.java        |  100 -
 .../PubKeyInfoTypeAtEbicsSignatures.java           |  143 --
 .../keyresponse/PubKeyInfoTypeAtEbicsTypes.java    |  144 --
 .../PubKeyValueTypeAtEbicsSignatures.java          |  140 --
 .../keyresponse/PubKeyValueTypeAtEbicsTypes.java   |  140 --
 .../ebics/keyresponse/RSAKeyValueType.java         |   93 -
 .../messages/ebics/keyresponse/ReferenceType.java  |  214 ---
 .../ebics/keyresponse/RetrievalMethodType.java     |  127 --
 .../messages/ebics/keyresponse/SPKIDataType.java   |   83 -
 .../keyresponse/SignatureCertificateInfoType.java  |   78 -
 .../ebics/keyresponse/SignatureMethodType.java     |  115 --
 .../ebics/keyresponse/SignaturePropertiesType.java |  111 --
 .../ebics/keyresponse/SignaturePropertyType.java   |  144 --
 .../ebics/keyresponse/SignaturePubKeyInfoType.java |   78 -
 .../keyresponse/SignaturePubKeyOrderDataType.java  |  172 --
 .../messages/ebics/keyresponse/SignatureType.java  |  195 --
 .../ebics/keyresponse/SignatureValueType.java      |   99 -
 .../messages/ebics/keyresponse/SignedInfoType.java |  167 --
 .../messages/ebics/keyresponse/SignerInfoType.java |  319 ----
 .../ebics/keyresponse/StandardOrderParamsType.java |  169 --
 .../ebics/keyresponse/TransactionPhaseType.java    |   76 -
 .../keyresponse/TransferReceiptRequestType.java    |  103 -
 .../keyresponse/TransferReceiptResponseType.java   |  144 --
 .../messages/ebics/keyresponse/TransferType.java   |   68 -
 .../messages/ebics/keyresponse/TransformType.java  |  116 --
 .../messages/ebics/keyresponse/TransformsType.java |   76 -
 .../messages/ebics/keyresponse/UserInfoType.java   |  258 ---
 .../ebics/keyresponse/UserPermissionType.java      |  258 ---
 .../keyresponse/UserSignatureDataSigBookType.java  |  211 ---
 .../messages/ebics/keyresponse/X509DataType.java   |  100 -
 .../ebics/keyresponse/X509IssuerSerialType.java    |   98 -
 .../messages/ebics/keyresponse/package-info.java   |    9 -
 .../ebics/response/AccountHolderRoleType.java      |   84 -
 .../ebics/response/AccountNumberRoleType.java      |   84 -
 .../messages/ebics/response/AccountType.java       |  620 ------
 .../messages/ebics/response/AddressInfoType.java   |  265 ---
 .../messages/ebics/response/AmountType.java        |  104 -
 .../ebics/response/AttributedAccountType.java      |  967 ----------
 .../messages/ebics/response/AuthOrderInfoType.java |  262 ---
 .../AuthenticationCertificateInfoType.java         |   78 -
 .../response/AuthenticationPubKeyInfoType.java     |   78 -
 .../ebics/response/AuthorisationLevelType.java     |   70 -
 .../messages/ebics/response/BankCodeRoleType.java  |   84 -
 .../messages/ebics/response/BankInfoType.java      |  147 --
 .../response/BankSignatureDataSigBookType.java     |  139 --
 .../ebics/response/CanonicalizationMethodType.java |  109 --
 .../ebics/response/CertificateInfoType.java        |  115 --
 .../messages/ebics/response/CurrencyCode.java      | 1183 ------------
 .../messages/ebics/response/DSAKeyValueType.java   |  227 ---
 .../messages/ebics/response/DataDigestType.java    |   99 -
 .../ebics/response/DataEncryptionInfoType.java     |  205 --
 .../ebics/response/DataTransferRequestType.java    |  386 ----
 .../ebics/response/DataTransferResponseType.java   |  355 ----
 .../messages/ebics/response/DigestMethodType.java  |  111 --
 .../messages/ebics/response/EbicsResponse.java     |  623 ------
 .../response/EncryptionCertificateInfoType.java    |   78 -
 .../ebics/response/EncryptionPubKeyInfoType.java   |   78 -
 .../ebics/response/FDLOrderParamsType.java         |  232 ---
 .../ebics/response/FULOrderParamsType.java         |  106 --
 .../messages/ebics/response/FileFormatType.java    |  102 -
 .../ebics/response/GenericOrderParamsType.java     |   78 -
 .../ebics/response/H3KRequestOrderDataType.java    |  190 --
 .../ebics/response/HAAResponseOrderDataType.java   |  114 --
 .../ebics/response/HCARequestOrderDataType.java    |  200 --
 .../ebics/response/HCSRequestOrderDataType.java    |  228 ---
 .../ebics/response/HIARequestOrderDataType.java    |  200 --
 .../ebics/response/HKDResponseOrderDataType.java   |  140 --
 .../ebics/response/HPBResponseOrderDataType.java   |  169 --
 .../ebics/response/HPDAccessParamsType.java        |  274 ---
 .../ebics/response/HPDProtocolParamsType.java      |  713 -------
 .../ebics/response/HPDResponseOrderDataType.java   |   99 -
 .../messages/ebics/response/HPDVersionType.java    |  234 ---
 .../ebics/response/HSARequestOrderDataType.java    |  200 --
 .../ebics/response/HTDReponseOrderDataType.java    |  137 --
 .../ebics/response/HVDOrderParamsType.java         |  199 --
 .../ebics/response/HVDResponseOrderDataType.java   |  240 ---
 .../ebics/response/HVEOrderParamsType.java         |  199 --
 .../ebics/response/HVSOrderParamsType.java         |  199 --
 .../ebics/response/HVSRequestOrderDataType.java    |  109 --
 .../ebics/response/HVTAccountInfoType.java         |   41 -
 .../messages/ebics/response/HVTOrderFlagsType.java |  155 --
 .../messages/ebics/response/HVTOrderInfoType.java  |  520 -----
 .../ebics/response/HVTOrderParamsType.java         |  295 ---
 .../ebics/response/HVTResponseOrderData.java       |   39 -
 .../ebics/response/HVTResponseOrderDataType.java   |  149 --
 .../ebics/response/HVUOrderDetailsType.java        |  291 ---
 .../ebics/response/HVUOrderParamsType.java         |  116 --
 .../ebics/response/HVUOriginatorInfoType.java      |  203 --
 .../ebics/response/HVUResponseOrderDataType.java   |  114 --
 .../ebics/response/HVUSigningInfoType.java         |  117 --
 .../ebics/response/HVZOrderDetailsType.java        | 1190 ------------
 .../ebics/response/HVZOrderParamsType.java         |  116 --
 .../ebics/response/HVZResponseOrderDataType.java   |  114 --
 .../messages/ebics/response/KeyInfoType.java       |  142 --
 .../messages/ebics/response/KeyValueType.java      |   92 -
 .../messages/ebics/response/ManifestType.java      |  111 --
 .../messages/ebics/response/ObjectFactory.java     | 1877 ------------------
 .../messages/ebics/response/ObjectType.java        |  171 --
 .../ebics/response/OrderAttributeType.java         |   62 -
 .../ebics/response/OrderSignatureDataType.java     |  190 --
 .../messages/ebics/response/OrderTType.java        |  723 -------
 .../messages/ebics/response/PGPDataType.java       |  105 -
 .../messages/ebics/response/Parameter.java         |  196 --
 .../messages/ebics/response/PartnerInfoType.java   |  310 ---
 .../response/PreValidationAccountAuthType.java     |   73 -
 .../ebics/response/PreValidationRequestType.java   |  147 --
 .../messages/ebics/response/PubKeyDigestType.java  |  100 -
 .../response/PubKeyInfoTypeAtEbicsSignatures.java  |  143 --
 .../ebics/response/PubKeyInfoTypeAtEbicsTypes.java |  144 --
 .../response/PubKeyValueTypeAtEbicsSignatures.java |  140 --
 .../response/PubKeyValueTypeAtEbicsTypes.java      |  140 --
 .../messages/ebics/response/RSAKeyValueType.java   |   93 -
 .../messages/ebics/response/ReferenceType.java     |  214 ---
 .../ebics/response/ResponseMutableHeaderType.java  |  314 ---
 .../ebics/response/ResponseStaticHeaderType.java   |  106 --
 .../ebics/response/RetrievalMethodType.java        |  127 --
 .../messages/ebics/response/SPKIDataType.java      |   83 -
 .../response/SignatureCertificateInfoType.java     |   78 -
 .../ebics/response/SignatureMethodType.java        |  115 --
 .../ebics/response/SignaturePropertiesType.java    |  111 --
 .../ebics/response/SignaturePropertyType.java      |  144 --
 .../ebics/response/SignaturePubKeyInfoType.java    |   78 -
 .../response/SignaturePubKeyOrderDataType.java     |  172 --
 .../messages/ebics/response/SignatureType.java     |  195 --
 .../ebics/response/SignatureValueType.java         |   99 -
 .../messages/ebics/response/SignedInfoType.java    |  167 --
 .../messages/ebics/response/SignerInfoType.java    |  319 ----
 .../ebics/response/StandardOrderParamsType.java    |  169 --
 .../ebics/response/TransactionPhaseType.java       |   76 -
 .../ebics/response/TransferReceiptRequestType.java |  103 -
 .../response/TransferReceiptResponseType.java      |  144 --
 .../messages/ebics/response/TransferType.java      |   68 -
 .../messages/ebics/response/TransformType.java     |  116 --
 .../messages/ebics/response/TransformsType.java    |   76 -
 .../messages/ebics/response/UserInfoType.java      |  258 ---
 .../ebics/response/UserPermissionType.java         |  258 ---
 .../response/UserSignatureDataSigBookType.java     |  211 ---
 .../messages/ebics/response/X509DataType.java      |  100 -
 .../ebics/response/X509IssuerSerialType.java       |   98 -
 .../messages/ebics/response/package-info.java      |    9 -
 sandbox/src/main/kotlin/DB.kt                      |    8 +-
 sandbox/src/main/kotlin/EbicsResponse.kt           |   44 -
 sandbox/src/main/kotlin/HEVResponse.kt             |   39 -
 sandbox/src/main/kotlin/KeyManagementResponse.kt   |   42 -
 sandbox/src/main/kotlin/Main.kt                    |  298 +--
 sandbox/src/main/kotlin/XMLUtil.kt                 |  127 +-
 .../libeufin/schema/ebics_h004/EbicsMessages.kt    |  454 +++++
 .../libeufin/schema/ebics_h004/package-info.java   |   13 +
 .../libeufin/schema/ebics_hev/EbicsMessages.kt     |   81 +
 .../libeufin/schema/ebics_hev/package-info.java    |   13 +
 .../libeufin/schema/ebics_s001/EbicsMessages.kt    |   98 +
 .../libeufin/schema/ebics_s001/package-info.java   |   13 +
 sandbox/src/main/resources/bindings.xjb            |   35 -
 sandbox/src/test/kotlin/DbTest.kt                  |    7 +-
 sandbox/src/test/kotlin/GeneratePrivateKeyTest.kt  |    2 +
 sandbox/src/test/kotlin/HiaLoadTest.kt             |    4 +-
 sandbox/src/test/kotlin/InnerIniLoadTest.kt        |    7 +-
 sandbox/src/test/kotlin/JaxbTest.kt                |   62 +-
 sandbox/src/test/kotlin/MarshalNonJaxbTest.kt      |   40 -
 sandbox/src/test/kotlin/ResponseTest.kt            |   20 +-
 sandbox/src/test/kotlin/XsiTypeAttributeTest.kt    |    4 +-
 settings.gradle                                    |    1 -
 364 files changed, 831 insertions(+), 72736 deletions(-)

diff --git a/.idea/dictionaries/dold.xml b/.idea/dictionaries/dold.xml
index bef9337..8a95d7e 100644
--- a/.idea/dictionaries/dold.xml
+++ b/.idea/dictionaries/dold.xml
@@ -1,6 +1,7 @@
 <component name="ProjectDictionaryState">
   <dictionary name="dold">
     <words>
+      <w>affero</w>
       <w>ebics</w>
     </words>
   </dictionary>
diff --git a/.idea/inspectionProfiles/Project_Default.xml 
b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..dcb5f6b
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,8 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PropertyName" enabled="true" level="WEAK WARNING" 
enabled_by_default="true">
+      <option name="namePattern" value="_?[a-z][A-Za-z\d]*" />
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c1d4bf5..4663731 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" 
default="false" project-jdk-name="12" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" 
default="false" project-jdk-name="11" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 29e08e8..2381768 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,2 @@
-kotlin.code.style=official
\ No newline at end of file
+kotlin.code.style=official
+kotlin.incremental=false
diff --git a/sandbox/build.gradle b/sandbox/build.gradle
index 912ec8c..47b2e0b 100644
--- a/sandbox/build.gradle
+++ b/sandbox/build.gradle
@@ -20,6 +20,10 @@ compileTestKotlin {
     }
 }
 
+sourceSets {
+    main.java.srcDirs = ['src/main/java', 'src/main/kotlin']
+}
+
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     implementation "io.ktor:ktor-gson:1.1.5"
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/hev/HEVRequestDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/hev/HEVRequestDataType.java
deleted file mode 100644
index b14770d..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/hev/HEVRequestDataType.java
+++ /dev/null
@@ -1,107 +0,0 @@
-
-package tech.libeufin.messages.ebics.hev;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for Request data
- * 
- * <p>Java class for HEVRequestDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HEVRequestDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="HostID" 
type="{http://www.ebics.org/H000}HostIDType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HEVRequestDataType", namespace = "http://www.ebics.org/H000";, 
propOrder = {
-    "hostID",
-    "any"
-})
-public class HEVRequestDataType {
-
-    @XmlElement(name = "HostID", namespace = "http://www.ebics.org/H000";, 
required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String hostID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the hostID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getHostID() {
-        return hostID;
-    }
-
-    /**
-     * Sets the value of the hostID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setHostID(String value) {
-        this.hostID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/hev/HEVResponseDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/hev/HEVResponseDataType.java
deleted file mode 100644
index fcde6f9..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/hev/HEVResponseDataType.java
+++ /dev/null
@@ -1,223 +0,0 @@
-
-package tech.libeufin.messages.ebics.hev;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for Request data
- * 
- * <p>Java class for HEVResponseDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HEVResponseDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="SystemReturnCode" 
type="{http://www.ebics.org/H000}SystemReturnCodeType"/>
- *         &lt;element name="VersionNumber" maxOccurs="unbounded" 
minOccurs="0">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension 
base="&lt;http://www.ebics.org/H000>VersionNumberType">
- *                 &lt;attribute name="ProtocolVersion" use="required" 
type="{http://www.ebics.org/H000}ProtocolVersionType"; />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HEVResponseDataType", namespace = 
"http://www.ebics.org/H000";, propOrder = {
-    "systemReturnCode",
-    "versionNumber",
-    "any"
-})
-@XmlRootElement(name = "ebicsHEVResponse")
-public class HEVResponseDataType {
-
-    @XmlElement(name = "SystemReturnCode", namespace = 
"http://www.ebics.org/H000";, required = true)
-    protected SystemReturnCodeType systemReturnCode;
-    @XmlElement(name = "VersionNumber", namespace = 
"http://www.ebics.org/H000";)
-    protected List<HEVResponseDataType.VersionNumber> versionNumber;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the systemReturnCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SystemReturnCodeType }
-     *     
-     */
-    public SystemReturnCodeType getSystemReturnCode() {
-        return systemReturnCode;
-    }
-
-    /**
-     * Sets the value of the systemReturnCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SystemReturnCodeType }
-     *     
-     */
-    public void setSystemReturnCode(SystemReturnCodeType value) {
-        this.systemReturnCode = value;
-    }
-
-    /**
-     * Gets the value of the versionNumber property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
versionNumber property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getVersionNumber().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link HEVResponseDataType.VersionNumber }
-     * 
-     * 
-     */
-    public List<HEVResponseDataType.VersionNumber> getVersionNumber() {
-        if (versionNumber == null) {
-            versionNumber = new ArrayList<HEVResponseDataType.VersionNumber>();
-        }
-        return this.versionNumber;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension 
base="&lt;http://www.ebics.org/H000>VersionNumberType">
-     *       &lt;attribute name="ProtocolVersion" use="required" 
type="{http://www.ebics.org/H000}ProtocolVersionType"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class VersionNumber {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "ProtocolVersion", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String protocolVersion;
-
-        /**
-         * Datatype for a release number 
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the protocolVersion property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getProtocolVersion() {
-            return protocolVersion;
-        }
-
-        /**
-         * Sets the value of the protocolVersion property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setProtocolVersion(String value) {
-            this.protocolVersion = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/hev/ObjectFactory.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/hev/ObjectFactory.java
deleted file mode 100644
index 8674e2d..0000000
--- a/sandbox/src/main/java/tech/libeufin/messages/ebics/hev/ObjectFactory.java
+++ /dev/null
@@ -1,87 +0,0 @@
-
-package tech.libeufin.messages.ebics.hev;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the tech.libeufin package. 
- * <p>An ObjectFactory allows you to programmatically
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _EbicsHEVResponse_QNAME = new 
QName("http://www.ebics.org/H000";, "ebicsHEVResponse");
-    private final static QName _EbicsHEVRequest_QNAME = new 
QName("http://www.ebics.org/H000";, "ebicsHEVRequest");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of 
schema derived classes for package: tech.libeufin
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link HEVResponseDataType }
-     * 
-     */
-    public HEVResponseDataType createHEVResponseDataType() {
-        return new HEVResponseDataType();
-    }
-
-    /**
-     * Create an instance of {@link HEVRequestDataType }
-     * 
-     */
-    public HEVRequestDataType createHEVRequestDataType() {
-        return new HEVRequestDataType();
-    }
-
-    /**
-     * Create an instance of {@link SystemReturnCodeType }
-     * 
-     */
-    public SystemReturnCodeType createSystemReturnCodeType() {
-        return new SystemReturnCodeType();
-    }
-
-    /**
-     * Create an instance of {@link HEVResponseDataType.VersionNumber }
-     * 
-     */
-    public HEVResponseDataType.VersionNumber 
createHEVResponseDataTypeVersionNumber() {
-        return new HEVResponseDataType.VersionNumber();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HEVResponseDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.ebics.org/H000";, name = 
"ebicsHEVResponse")
-    public JAXBElement<HEVResponseDataType> 
createEbicsHEVResponse(HEVResponseDataType value) {
-        return new JAXBElement<HEVResponseDataType>(_EbicsHEVResponse_QNAME, 
HEVResponseDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HEVRequestDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.ebics.org/H000";, name = 
"ebicsHEVRequest")
-    public JAXBElement<HEVRequestDataType> 
createEbicsHEVRequest(HEVRequestDataType value) {
-        return new JAXBElement<HEVRequestDataType>(_EbicsHEVRequest_QNAME, 
HEVRequestDataType.class, null, value);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/hev/SystemReturnCodeType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/hev/SystemReturnCodeType.java
deleted file mode 100644
index b29c949..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/hev/SystemReturnCodeType.java
+++ /dev/null
@@ -1,100 +0,0 @@
-
-package tech.libeufin.messages.ebics.hev;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datatype for technical error
- * 
- * <p>Java class for SystemReturnCodeType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SystemReturnCodeType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="ReturnCode" 
type="{http://www.ebics.org/H000}ReturnCodeType"/>
- *         &lt;element name="ReportText" 
type="{http://www.ebics.org/H000}ReportTextType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SystemReturnCodeType", namespace = 
"http://www.ebics.org/H000";, propOrder = {
-    "returnCode",
-    "reportText"
-})
-public class SystemReturnCodeType {
-
-    @XmlElement(name = "ReturnCode", namespace = "http://www.ebics.org/H000";, 
required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String returnCode;
-    @XmlElement(name = "ReportText", namespace = "http://www.ebics.org/H000";, 
required = true)
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String reportText;
-
-    /**
-     * Gets the value of the returnCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getReturnCode() {
-        return returnCode;
-    }
-
-    /**
-     * Sets the value of the returnCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setReturnCode(String value) {
-        this.returnCode = value;
-    }
-
-    /**
-     * Gets the value of the reportText property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getReportText() {
-        return reportText;
-    }
-
-    /**
-     * Sets the value of the reportText property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setReportText(String value) {
-        this.reportText = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AccountHolderRoleType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AccountHolderRoleType.java
deleted file mode 100644
index 913166e..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AccountHolderRoleType.java
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for AccountHolderRoleType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="AccountHolderRoleType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token";>
- *     &lt;enumeration value="Originator"/>
- *     &lt;enumeration value="Recipient"/>
- *     &lt;enumeration value="Presenter"/>
- *     &lt;enumeration value="Other"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "AccountHolderRoleType")
-@XmlEnum
-public enum AccountHolderRoleType {
-
-
-    /**
-     * Auftraggeber
-     * 
-     */
-    @XmlEnumValue("Originator")
-    ORIGINATOR("Originator"),
-
-    /**
-     * Empfänger
-     * 
-     */
-    @XmlEnumValue("Recipient")
-    RECIPIENT("Recipient"),
-
-    /**
-     * Überbringer, Einreicher
-     * 
-     */
-    @XmlEnumValue("Presenter")
-    PRESENTER("Presenter"),
-
-    /**
-     * andere Rolle
-     * 
-     */
-    @XmlEnumValue("Other")
-    OTHER("Other");
-    private final String value;
-
-    AccountHolderRoleType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static AccountHolderRoleType fromValue(String v) {
-        for (AccountHolderRoleType c: AccountHolderRoleType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AccountNumberRoleType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AccountNumberRoleType.java
deleted file mode 100644
index 014faf9..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AccountNumberRoleType.java
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for AccountNumberRoleType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="AccountNumberRoleType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token";>
- *     &lt;enumeration value="Originator"/>
- *     &lt;enumeration value="Recipient"/>
- *     &lt;enumeration value="Charges"/>
- *     &lt;enumeration value="Other"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "AccountNumberRoleType")
-@XmlEnum
-public enum AccountNumberRoleType {
-
-
-    /**
-     * Auftraggeberkonto
-     * 
-     */
-    @XmlEnumValue("Originator")
-    ORIGINATOR("Originator"),
-
-    /**
-     * Empfängerkonto
-     * 
-     */
-    @XmlEnumValue("Recipient")
-    RECIPIENT("Recipient"),
-
-    /**
-     * Gebührenkonto
-     * 
-     */
-    @XmlEnumValue("Charges")
-    CHARGES("Charges"),
-
-    /**
-     * andere Kontorolle
-     * 
-     */
-    @XmlEnumValue("Other")
-    OTHER("Other");
-    private final String value;
-
-    AccountNumberRoleType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static AccountNumberRoleType fromValue(String v) {
-        for (AccountNumberRoleType c: AccountNumberRoleType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AccountType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AccountType.java
deleted file mode 100644
index 59123ba..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AccountType.java
+++ /dev/null
@@ -1,620 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für Kontoinformationen.
- * 
- * <p>Java class for AccountType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="AccountType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;choice maxOccurs="2">
- *           &lt;element name="AccountNumber">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;urn:org:ebics:H004>AccountNumberType">
- *                   &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *           &lt;element name="NationalAccountNumber">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;urn:org:ebics:H004>NationalAccountNumberType">
- *                   &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="2">
- *           &lt;element name="BankCode">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension base="&lt;urn:org:ebics:H004>BankCodeType">
- *                   &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
- *                   &lt;attribute name="Prefix" 
type="{urn:org:ebics:H004}BankCodePrefixType" />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *           &lt;element name="NationalBankCode">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;urn:org:ebics:H004>NationalBankCodeType">
- *                   &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *         &lt;/choice>
- *         &lt;element name="AccountHolder" 
type="{urn:org:ebics:H004}AccountHolderType" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Currency" 
type="{urn:org:ebics:H004}CurrencyBaseType" default="EUR" />
- *       &lt;attribute name="Description" 
type="{urn:org:ebics:H004}AccountDescriptionType" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AccountType", propOrder = {
-    "accountNumberOrNationalAccountNumber",
-    "bankCodeOrNationalBankCode",
-    "accountHolder"
-})
-@XmlSeeAlso({
-    tech.libeufin.messages.ebics.keyrequest.PartnerInfoType.AccountInfo.class,
-    PreValidationAccountAuthType.class
-})
-public class AccountType {
-
-    @XmlElements({
-        @XmlElement(name = "AccountNumber", type = 
AccountType.AccountNumber.class),
-        @XmlElement(name = "NationalAccountNumber", type = 
AccountType.NationalAccountNumber.class)
-    })
-    protected List<Object> accountNumberOrNationalAccountNumber;
-    @XmlElements({
-        @XmlElement(name = "BankCode", type = AccountType.BankCode.class),
-        @XmlElement(name = "NationalBankCode", type = 
AccountType.NationalBankCode.class)
-    })
-    protected List<Object> bankCodeOrNationalBankCode;
-    @XmlElement(name = "AccountHolder")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String accountHolder;
-    @XmlAttribute(name = "Currency")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String currency;
-    @XmlAttribute(name = "Description")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    protected String description;
-
-    /**
-     * Gets the value of the accountNumberOrNationalAccountNumber property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
accountNumberOrNationalAccountNumber property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAccountNumberOrNationalAccountNumber().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AccountType.AccountNumber }
-     * {@link AccountType.NationalAccountNumber }
-     * 
-     * 
-     */
-    public List<Object> getAccountNumberOrNationalAccountNumber() {
-        if (accountNumberOrNationalAccountNumber == null) {
-            accountNumberOrNationalAccountNumber = new ArrayList<Object>();
-        }
-        return this.accountNumberOrNationalAccountNumber;
-    }
-
-    /**
-     * Gets the value of the bankCodeOrNationalBankCode property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
bankCodeOrNationalBankCode property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getBankCodeOrNationalBankCode().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AccountType.BankCode }
-     * {@link AccountType.NationalBankCode }
-     * 
-     * 
-     */
-    public List<Object> getBankCodeOrNationalBankCode() {
-        if (bankCodeOrNationalBankCode == null) {
-            bankCodeOrNationalBankCode = new ArrayList<Object>();
-        }
-        return this.bankCodeOrNationalBankCode;
-    }
-
-    /**
-     * Gets the value of the accountHolder property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAccountHolder() {
-        return accountHolder;
-    }
-
-    /**
-     * Sets the value of the accountHolder property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAccountHolder(String value) {
-        this.accountHolder = value;
-    }
-
-    /**
-     * Gets the value of the currency property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCurrency() {
-        if (currency == null) {
-            return "EUR";
-        } else {
-            return currency;
-        }
-    }
-
-    /**
-     * Sets the value of the currency property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCurrency(String value) {
-        this.currency = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>AccountNumberType">
-     *       &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class AccountNumber {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "international")
-        protected Boolean international;
-
-        /**
-         * Datentyp für eine Kontonummer (national/international).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the international property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isInternational() {
-            if (international == null) {
-                return false;
-            } else {
-                return international;
-            }
-        }
-
-        /**
-         * Sets the value of the international property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setInternational(Boolean value) {
-            this.international = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>BankCodeType">
-     *       &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-     *       &lt;attribute name="Prefix" 
type="{urn:org:ebics:H004}BankCodePrefixType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class BankCode {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "international")
-        protected Boolean international;
-        @XmlAttribute(name = "Prefix")
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String prefix;
-
-        /**
-         * Datentyp für eine Bankleitzahl (national/international).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the international property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isInternational() {
-            if (international == null) {
-                return false;
-            } else {
-                return international;
-            }
-        }
-
-        /**
-         * Sets the value of the international property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setInternational(Boolean value) {
-            this.international = value;
-        }
-
-        /**
-         * Gets the value of the prefix property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getPrefix() {
-            return prefix;
-        }
-
-        /**
-         * Sets the value of the prefix property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setPrefix(String value) {
-            this.prefix = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension 
base="&lt;urn:org:ebics:H004>NationalAccountNumberType">
-     *       &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class NationalAccountNumber {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "format", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        @XmlSchemaType(name = "token")
-        protected String format;
-
-        /**
-         * Datentyp für eine Kontonummer (freies Format).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the format property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getFormat() {
-            return format;
-        }
-
-        /**
-         * Sets the value of the format property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setFormat(String value) {
-            this.format = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>NationalBankCodeType">
-     *       &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class NationalBankCode {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "format", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        @XmlSchemaType(name = "token")
-        protected String format;
-
-        /**
-         * Datentyp für eine Bankleitzahl (freies Format).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the format property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getFormat() {
-            return format;
-        }
-
-        /**
-         * Sets the value of the format property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setFormat(String value) {
-            this.format = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AddressInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AddressInfoType.java
deleted file mode 100644
index 5f6187b..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AddressInfoType.java
+++ /dev/null
@@ -1,265 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for address information with regard to distributed signature 
(order types HKD, HTD).
- * 
- * <p>Java class for AddressInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="AddressInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="Name" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;element name="Street" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;element name="PostCode" 
type="{http://www.w3.org/2001/XMLSchema}token"; minOccurs="0"/>
- *         &lt;element name="City" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;element name="Region" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;element name="Country" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AddressInfoType", propOrder = {
-    "name",
-    "street",
-    "postCode",
-    "city",
-    "region",
-    "country",
-    "any"
-})
-public class AddressInfoType {
-
-    @XmlElement(name = "Name")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String name;
-    @XmlElement(name = "Street")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String street;
-    @XmlElement(name = "PostCode")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String postCode;
-    @XmlElement(name = "City")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String city;
-    @XmlElement(name = "Region")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String region;
-    @XmlElement(name = "Country")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String country;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the street property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStreet() {
-        return street;
-    }
-
-    /**
-     * Sets the value of the street property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStreet(String value) {
-        this.street = value;
-    }
-
-    /**
-     * Gets the value of the postCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPostCode() {
-        return postCode;
-    }
-
-    /**
-     * Sets the value of the postCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPostCode(String value) {
-        this.postCode = value;
-    }
-
-    /**
-     * Gets the value of the city property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCity() {
-        return city;
-    }
-
-    /**
-     * Sets the value of the city property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCity(String value) {
-        this.city = value;
-    }
-
-    /**
-     * Gets the value of the region property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRegion() {
-        return region;
-    }
-
-    /**
-     * Sets the value of the region property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRegion(String value) {
-        this.region = value;
-    }
-
-    /**
-     * Gets the value of the country property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCountry() {
-        return country;
-    }
-
-    /**
-     * Sets the value of the country property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCountry(String value) {
-        this.country = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AmountType.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AmountType.java
deleted file mode 100644
index 3016371..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AmountType.java
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.math.BigDecimal;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für einen Betrag inkl. Währungscode-Attribut (Default = "EUR").
- * 
- * <p>Java class for AmountType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="AmountType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;urn:org:ebics:H004>AmountValueType">
- *       &lt;attribute name="Currency" 
type="{urn:org:ebics:H004}CurrencyBaseType" default="EUR" />
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AmountType", propOrder = {
-    "value"
-})
-public class AmountType {
-
-    @XmlValue
-    protected BigDecimal value;
-    @XmlAttribute(name = "Currency")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String currency;
-
-    /**
-     * Datentyp für einen Betragswert (ohne Währung).
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setValue(BigDecimal value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the currency property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCurrency() {
-        if (currency == null) {
-            return "EUR";
-        } else {
-            return currency;
-        }
-    }
-
-    /**
-     * Sets the value of the currency property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCurrency(String value) {
-        this.currency = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AttributedAccountType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AttributedAccountType.java
deleted file mode 100644
index e72669e..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AttributedAccountType.java
+++ /dev/null
@@ -1,967 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für Kontoinformationen inkl. der Eigenschaftszuordnung innerhalb 
einer Zahlungstransaktion.
- * 
- * <p>Java class for AttributedAccountType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="AttributedAccountType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;choice maxOccurs="2">
- *           &lt;element name="AccountNumber">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;urn:org:ebics:H004>AccountNumberType">
- *                   &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}AccountNumberRoleType" />
- *                   &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
- *                   &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *           &lt;element name="NationalAccountNumber">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;urn:org:ebics:H004>NationalAccountNumberType">
- *                   &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}AccountNumberRoleType" />
- *                   &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
- *                   &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="2">
- *           &lt;element name="BankCode">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension base="&lt;urn:org:ebics:H004>BankCodeType">
- *                   &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}BankCodeRoleType" />
- *                   &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
- *                   &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
- *                   &lt;attribute name="Prefix" 
type="{urn:org:ebics:H004}BankCodePrefixType" />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *           &lt;element name="NationalBankCode">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;urn:org:ebics:H004>NationalBankCodeType">
- *                   &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}BankCodeRoleType" />
- *                   &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
- *                   &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *         &lt;/choice>
- *         &lt;element name="AccountHolder" minOccurs="0">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension base="&lt;urn:org:ebics:H004>AccountHolderType">
- *                 &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}AccountHolderRoleType" />
- *                 &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *       &lt;attribute name="Currency" 
type="{urn:org:ebics:H004}CurrencyBaseType" default="EUR" />
- *       &lt;attribute name="Description" 
type="{urn:org:ebics:H004}AccountDescriptionType" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttributedAccountType", propOrder = {
-    "accountNumberOrNationalAccountNumber",
-    "bankCodeOrNationalBankCode",
-    "accountHolder"
-})
-@XmlSeeAlso({
-    HVTAccountInfoType.class
-})
-public class AttributedAccountType {
-
-    @XmlElements({
-        @XmlElement(name = "AccountNumber", type = 
AttributedAccountType.AccountNumber.class),
-        @XmlElement(name = "NationalAccountNumber", type = 
AttributedAccountType.NationalAccountNumber.class)
-    })
-    protected List<Object> accountNumberOrNationalAccountNumber;
-    @XmlElements({
-        @XmlElement(name = "BankCode", type = 
AttributedAccountType.BankCode.class),
-        @XmlElement(name = "NationalBankCode", type = 
AttributedAccountType.NationalBankCode.class)
-    })
-    protected List<Object> bankCodeOrNationalBankCode;
-    @XmlElement(name = "AccountHolder")
-    protected AttributedAccountType.AccountHolder accountHolder;
-    @XmlAttribute(name = "Currency")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String currency;
-    @XmlAttribute(name = "Description")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    protected String description;
-
-    /**
-     * Gets the value of the accountNumberOrNationalAccountNumber property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
accountNumberOrNationalAccountNumber property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAccountNumberOrNationalAccountNumber().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AttributedAccountType.AccountNumber }
-     * {@link AttributedAccountType.NationalAccountNumber }
-     * 
-     * 
-     */
-    public List<Object> getAccountNumberOrNationalAccountNumber() {
-        if (accountNumberOrNationalAccountNumber == null) {
-            accountNumberOrNationalAccountNumber = new ArrayList<Object>();
-        }
-        return this.accountNumberOrNationalAccountNumber;
-    }
-
-    /**
-     * Gets the value of the bankCodeOrNationalBankCode property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
bankCodeOrNationalBankCode property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getBankCodeOrNationalBankCode().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AttributedAccountType.BankCode }
-     * {@link AttributedAccountType.NationalBankCode }
-     * 
-     * 
-     */
-    public List<Object> getBankCodeOrNationalBankCode() {
-        if (bankCodeOrNationalBankCode == null) {
-            bankCodeOrNationalBankCode = new ArrayList<Object>();
-        }
-        return this.bankCodeOrNationalBankCode;
-    }
-
-    /**
-     * Gets the value of the accountHolder property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributedAccountType.AccountHolder }
-     *     
-     */
-    public AttributedAccountType.AccountHolder getAccountHolder() {
-        return accountHolder;
-    }
-
-    /**
-     * Sets the value of the accountHolder property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributedAccountType.AccountHolder }
-     *     
-     */
-    public void setAccountHolder(AttributedAccountType.AccountHolder value) {
-        this.accountHolder = value;
-    }
-
-    /**
-     * Gets the value of the currency property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCurrency() {
-        if (currency == null) {
-            return "EUR";
-        } else {
-            return currency;
-        }
-    }
-
-    /**
-     * Sets the value of the currency property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCurrency(String value) {
-        this.currency = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>AccountHolderType">
-     *       &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}AccountHolderRoleType" />
-     *       &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class AccountHolder {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "Role", required = true)
-        protected AccountHolderRoleType role;
-        @XmlAttribute(name = "Description")
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        @XmlSchemaType(name = "normalizedString")
-        protected String description;
-
-        /**
-         * Datentyp für den Namen des Kontoinhabers.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the role property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link AccountHolderRoleType }
-         *     
-         */
-        public AccountHolderRoleType getRole() {
-            return role;
-        }
-
-        /**
-         * Sets the value of the role property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link AccountHolderRoleType }
-         *     
-         */
-        public void setRole(AccountHolderRoleType value) {
-            this.role = value;
-        }
-
-        /**
-         * Gets the value of the description property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getDescription() {
-            return description;
-        }
-
-        /**
-         * Sets the value of the description property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setDescription(String value) {
-            this.description = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>AccountNumberType">
-     *       &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}AccountNumberRoleType" />
-     *       &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
-     *       &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class AccountNumber {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "Role", required = true)
-        protected AccountNumberRoleType role;
-        @XmlAttribute(name = "Description")
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        @XmlSchemaType(name = "normalizedString")
-        protected String description;
-        @XmlAttribute(name = "international")
-        protected Boolean international;
-
-        /**
-         * Datentyp für eine Kontonummer (national/international).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the role property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link AccountNumberRoleType }
-         *     
-         */
-        public AccountNumberRoleType getRole() {
-            return role;
-        }
-
-        /**
-         * Sets the value of the role property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link AccountNumberRoleType }
-         *     
-         */
-        public void setRole(AccountNumberRoleType value) {
-            this.role = value;
-        }
-
-        /**
-         * Gets the value of the description property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getDescription() {
-            return description;
-        }
-
-        /**
-         * Sets the value of the description property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setDescription(String value) {
-            this.description = value;
-        }
-
-        /**
-         * Gets the value of the international property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isInternational() {
-            if (international == null) {
-                return false;
-            } else {
-                return international;
-            }
-        }
-
-        /**
-         * Sets the value of the international property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setInternational(Boolean value) {
-            this.international = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>BankCodeType">
-     *       &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}BankCodeRoleType" />
-     *       &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
-     *       &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-     *       &lt;attribute name="Prefix" 
type="{urn:org:ebics:H004}BankCodePrefixType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class BankCode {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "Role", required = true)
-        protected BankCodeRoleType role;
-        @XmlAttribute(name = "Description")
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        @XmlSchemaType(name = "normalizedString")
-        protected String description;
-        @XmlAttribute(name = "international")
-        protected Boolean international;
-        @XmlAttribute(name = "Prefix")
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String prefix;
-
-        /**
-         * Datentyp für eine Bankleitzahl (national/international).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the role property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link BankCodeRoleType }
-         *     
-         */
-        public BankCodeRoleType getRole() {
-            return role;
-        }
-
-        /**
-         * Sets the value of the role property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BankCodeRoleType }
-         *     
-         */
-        public void setRole(BankCodeRoleType value) {
-            this.role = value;
-        }
-
-        /**
-         * Gets the value of the description property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getDescription() {
-            return description;
-        }
-
-        /**
-         * Sets the value of the description property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setDescription(String value) {
-            this.description = value;
-        }
-
-        /**
-         * Gets the value of the international property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isInternational() {
-            if (international == null) {
-                return false;
-            } else {
-                return international;
-            }
-        }
-
-        /**
-         * Sets the value of the international property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setInternational(Boolean value) {
-            this.international = value;
-        }
-
-        /**
-         * Gets the value of the prefix property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getPrefix() {
-            return prefix;
-        }
-
-        /**
-         * Sets the value of the prefix property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setPrefix(String value) {
-            this.prefix = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension 
base="&lt;urn:org:ebics:H004>NationalAccountNumberType">
-     *       &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}AccountNumberRoleType" />
-     *       &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
-     *       &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class NationalAccountNumber {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "Role", required = true)
-        protected AccountNumberRoleType role;
-        @XmlAttribute(name = "Description")
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        @XmlSchemaType(name = "normalizedString")
-        protected String description;
-        @XmlAttribute(name = "format", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        @XmlSchemaType(name = "token")
-        protected String format;
-
-        /**
-         * Datentyp für eine Kontonummer (freies Format).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the role property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link AccountNumberRoleType }
-         *     
-         */
-        public AccountNumberRoleType getRole() {
-            return role;
-        }
-
-        /**
-         * Sets the value of the role property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link AccountNumberRoleType }
-         *     
-         */
-        public void setRole(AccountNumberRoleType value) {
-            this.role = value;
-        }
-
-        /**
-         * Gets the value of the description property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getDescription() {
-            return description;
-        }
-
-        /**
-         * Sets the value of the description property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setDescription(String value) {
-            this.description = value;
-        }
-
-        /**
-         * Gets the value of the format property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getFormat() {
-            return format;
-        }
-
-        /**
-         * Sets the value of the format property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setFormat(String value) {
-            this.format = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>NationalBankCodeType">
-     *       &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}BankCodeRoleType" />
-     *       &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
-     *       &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class NationalBankCode {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "Role", required = true)
-        protected BankCodeRoleType role;
-        @XmlAttribute(name = "Description")
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        @XmlSchemaType(name = "normalizedString")
-        protected String description;
-        @XmlAttribute(name = "format", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        @XmlSchemaType(name = "token")
-        protected String format;
-
-        /**
-         * Datentyp für eine Bankleitzahl (freies Format).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the role property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link BankCodeRoleType }
-         *     
-         */
-        public BankCodeRoleType getRole() {
-            return role;
-        }
-
-        /**
-         * Sets the value of the role property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BankCodeRoleType }
-         *     
-         */
-        public void setRole(BankCodeRoleType value) {
-            this.role = value;
-        }
-
-        /**
-         * Gets the value of the description property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getDescription() {
-            return description;
-        }
-
-        /**
-         * Sets the value of the description property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setDescription(String value) {
-            this.description = value;
-        }
-
-        /**
-         * Gets the value of the format property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getFormat() {
-            return format;
-        }
-
-        /**
-         * Sets the value of the format property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setFormat(String value) {
-            this.format = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AuthOrderInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AuthOrderInfoType.java
deleted file mode 100644
index 1b84a82..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AuthOrderInfoType.java
+++ /dev/null
@@ -1,262 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for user permissions with regard to distributed signatures (order 
types HKD, HTD).
- * 
- * <p>Java class for AuthOrderInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="AuthOrderInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderType" 
type="{urn:org:ebics:H004}OrderTBaseType"/>
- *         &lt;element name="FileFormat" 
type="{urn:org:ebics:H004}FileFormatType" minOccurs="0"/>
- *         &lt;element name="TransferType" 
type="{urn:org:ebics:H004}TransferType"/>
- *         &lt;element name="OrderFormat" 
type="{urn:org:ebics:H004}OrderFormatType" minOccurs="0"/>
- *         &lt;element name="Description" 
type="{urn:org:ebics:H004}OrderDescriptionType"/>
- *         &lt;element name="NumSigRequired" 
type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"; minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AuthOrderInfoType", propOrder = {
-    "orderType",
-    "fileFormat",
-    "transferType",
-    "orderFormat",
-    "description",
-    "numSigRequired",
-    "any"
-})
-public class AuthOrderInfoType {
-
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "TransferType", required = true)
-    @XmlSchemaType(name = "token")
-    protected TransferType transferType;
-    @XmlElement(name = "OrderFormat")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderFormat;
-    @XmlElement(name = "Description", required = true)
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String description;
-    @XmlElement(name = "NumSigRequired", defaultValue = "0")
-    @XmlSchemaType(name = "nonNegativeInteger")
-    protected BigInteger numSigRequired;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the transferType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TransferType }
-     *     
-     */
-    public TransferType getTransferType() {
-        return transferType;
-    }
-
-    /**
-     * Sets the value of the transferType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TransferType }
-     *     
-     */
-    public void setTransferType(TransferType value) {
-        this.transferType = value;
-    }
-
-    /**
-     * Gets the value of the orderFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderFormat() {
-        return orderFormat;
-    }
-
-    /**
-     * Sets the value of the orderFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderFormat(String value) {
-        this.orderFormat = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the numSigRequired property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getNumSigRequired() {
-        return numSigRequired;
-    }
-
-    /**
-     * Sets the value of the numSigRequired property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setNumSigRequired(BigInteger value) {
-        this.numSigRequired = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AuthenticationCertificateInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AuthenticationCertificateInfoType.java
deleted file mode 100644
index f49b0de..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AuthenticationCertificateInfoType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Data type for public for identification and authentication.
- * 
- * <p>Java class for AuthenticationCertificateInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="AuthenticationCertificateInfoType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}CertificateInfoType">
- *       &lt;sequence>
- *         &lt;element name="AuthenticationVersion" 
type="{urn:org:ebics:H004}AuthenticationVersionType"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AuthenticationCertificateInfoType", propOrder = {
-    "authenticationVersion"
-})
-public class AuthenticationCertificateInfoType
-    extends CertificateInfoType
-{
-
-    @XmlElement(name = "AuthenticationVersion", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String authenticationVersion;
-
-    /**
-     * Gets the value of the authenticationVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAuthenticationVersion() {
-        return authenticationVersion;
-    }
-
-    /**
-     * Sets the value of the authenticationVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAuthenticationVersion(String value) {
-        this.authenticationVersion = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AuthenticationPubKeyInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AuthenticationPubKeyInfoType.java
deleted file mode 100644
index 319b457..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AuthenticationPubKeyInfoType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für öffentlichen Authentfikationsschlüssel.
- * 
- * <p>Java class for AuthenticationPubKeyInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="AuthenticationPubKeyInfoType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}PubKeyInfoType">
- *       &lt;sequence>
- *         &lt;element name="AuthenticationVersion" 
type="{urn:org:ebics:H004}AuthenticationVersionType"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AuthenticationPubKeyInfoType", propOrder = {
-    "authenticationVersion"
-})
-public class AuthenticationPubKeyInfoType
-    extends PubKeyInfoTypeAtEbicsTypes
-{
-
-    @XmlElement(name = "AuthenticationVersion", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String authenticationVersion;
-
-    /**
-     * Gets the value of the authenticationVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAuthenticationVersion() {
-        return authenticationVersion;
-    }
-
-    /**
-     * Sets the value of the authenticationVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAuthenticationVersion(String value) {
-        this.authenticationVersion = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AuthorisationLevelType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AuthorisationLevelType.java
deleted file mode 100644
index fad3af9..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/AuthorisationLevelType.java
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for AuthorisationLevelType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="AuthorisationLevelType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token";>
- *     &lt;length value="1"/>
- *     &lt;enumeration value="E"/>
- *     &lt;enumeration value="A"/>
- *     &lt;enumeration value="B"/>
- *     &lt;enumeration value="T"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "AuthorisationLevelType")
-@XmlEnum
-public enum AuthorisationLevelType {
-
-
-    /**
-     * Einzelunterschrift
-     * 
-     */
-    E,
-
-    /**
-     * Erstunterschrift
-     * 
-     */
-    A,
-
-    /**
-     * Zweitunterschrift
-     * 
-     */
-    B,
-
-    /**
-     * Transportunterschrift
-     * 
-     */
-    T;
-
-    public String value() {
-        return name();
-    }
-
-    public static AuthorisationLevelType fromValue(String v) {
-        return valueOf(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/BankCodeRoleType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/BankCodeRoleType.java
deleted file mode 100644
index 9d538fc..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/BankCodeRoleType.java
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for BankCodeRoleType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="BankCodeRoleType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token";>
- *     &lt;enumeration value="Originator"/>
- *     &lt;enumeration value="Recipient"/>
- *     &lt;enumeration value="Correspondent"/>
- *     &lt;enumeration value="Other"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "BankCodeRoleType")
-@XmlEnum
-public enum BankCodeRoleType {
-
-
-    /**
-     * Auftraggeberbank
-     * 
-     */
-    @XmlEnumValue("Originator")
-    ORIGINATOR("Originator"),
-
-    /**
-     * Empfängerbank
-     * 
-     */
-    @XmlEnumValue("Recipient")
-    RECIPIENT("Recipient"),
-
-    /**
-     * Korrespondenzbank
-     * 
-     */
-    @XmlEnumValue("Correspondent")
-    CORRESPONDENT("Correspondent"),
-
-    /**
-     * andere Bankrolle
-     * 
-     */
-    @XmlEnumValue("Other")
-    OTHER("Other");
-    private final String value;
-
-    BankCodeRoleType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static BankCodeRoleType fromValue(String v) {
-        for (BankCodeRoleType c: BankCodeRoleType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/BankInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/BankInfoType.java
deleted file mode 100644
index 4e872ff..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/BankInfoType.java
+++ /dev/null
@@ -1,147 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für VEU-Kreditinstitutsinformationen (HKD, HTD).
- * 
- * <p>Java class for BankInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="BankInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="HostID" type="{urn:org:ebics:H004}HostIDType"/>
- *         &lt;element ref="{urn:org:ebics:H004}Parameter" 
maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BankInfoType", propOrder = {
-    "hostID",
-    "parameter",
-    "any"
-})
-public class BankInfoType {
-
-    @XmlElement(name = "HostID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String hostID;
-    @XmlElement(name = "Parameter")
-    protected List<Parameter> parameter;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the hostID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getHostID() {
-        return hostID;
-    }
-
-    /**
-     * Sets the value of the hostID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setHostID(String value) {
-        this.hostID = value;
-    }
-
-    /**
-     * Gets the value of the parameter property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the parameter 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getParameter().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Parameter }
-     * 
-     * 
-     */
-    public List<Parameter> getParameter() {
-        if (parameter == null) {
-            parameter = new ArrayList<Parameter>();
-        }
-        return this.parameter;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/BankSignatureDataSigBookType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/BankSignatureDataSigBookType.java
deleted file mode 100644
index e7ec172..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/BankSignatureDataSigBookType.java
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for digital signature data transferred using EBICS.
- * 
- * <p>Java class for BankSignatureDataSigBookType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="BankSignatureDataSigBookType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderSignature" maxOccurs="0" minOccurs="0">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension base="&lt;urn:org:ebics:H004>SignatureType">
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BankSignatureDataSigBookType", propOrder = {
-    "any"
-})
-public class BankSignatureDataSigBookType {
-
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>SignatureType">
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class OrderSignature {
-
-        @XmlValue
-        protected byte[] value;
-
-        /**
-         * Datentyp für kryptographische Unterschriften.
-         * 
-         * @return
-         *     possible object is
-         *     byte[]
-         */
-        public byte[] getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     byte[]
-         */
-        public void setValue(byte[] value) {
-            this.value = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/CanonicalizationMethodType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/CanonicalizationMethodType.java
deleted file mode 100644
index f820038..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/CanonicalizationMethodType.java
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CanonicalizationMethodType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="CanonicalizationMethodType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;any maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Algorithm" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CanonicalizationMethodType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class CanonicalizationMethodType {
-
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Algorithm", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String algorithm;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link String }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-    /**
-     * Gets the value of the algorithm property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAlgorithm() {
-        return algorithm;
-    }
-
-    /**
-     * Sets the value of the algorithm property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAlgorithm(String value) {
-        this.algorithm = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/CertificateInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/CertificateInfoType.java
deleted file mode 100644
index 1163755..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/CertificateInfoType.java
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Data Type for Certificates for the bank-technical signature for 
authorisation (ES)
- * 
- * <p>Java class for CertificateInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="CertificateInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CertificateInfoType", propOrder = {
-    "x509Data",
-    "any"
-})
-@XmlSeeAlso({
-    AuthenticationCertificateInfoType.class,
-    EncryptionCertificateInfoType.class,
-    SignatureCertificateInfoType.class
-})
-public class CertificateInfoType {
-
-    @XmlElement(name = "X509Data", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, required = true)
-    protected X509DataType x509Data;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the x509Data property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link X509DataType }
-     *     
-     */
-    public X509DataType getX509Data() {
-        return x509Data;
-    }
-
-    /**
-     * Sets the value of the x509Data property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link X509DataType }
-     *     
-     */
-    public void setX509Data(X509DataType value) {
-        this.x509Data = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/CurrencyCode.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/CurrencyCode.java
deleted file mode 100644
index bbb7fe7..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/CurrencyCode.java
+++ /dev/null
@@ -1,1183 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CurrencyCode.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="CurrencyCode">
- *   &lt;restriction base="{urn:org:ebics:H004}CurrencyBaseType">
- *     &lt;length value="3"/>
- *     &lt;enumeration value="AFN"/>
- *     &lt;enumeration value="ALL"/>
- *     &lt;enumeration value="AMD"/>
- *     &lt;enumeration value="ANG"/>
- *     &lt;enumeration value="AOA"/>
- *     &lt;enumeration value="ARS"/>
- *     &lt;enumeration value="AUD"/>
- *     &lt;enumeration value="AWG"/>
- *     &lt;enumeration value="AZM"/>
- *     &lt;enumeration value="BAM"/>
- *     &lt;enumeration value="BBD"/>
- *     &lt;enumeration value="BDT"/>
- *     &lt;enumeration value="BGN"/>
- *     &lt;enumeration value="BHD"/>
- *     &lt;enumeration value="BMD"/>
- *     &lt;enumeration value="BND"/>
- *     &lt;enumeration value="BOB"/>
- *     &lt;enumeration value="BRL"/>
- *     &lt;enumeration value="BSD"/>
- *     &lt;enumeration value="BTN"/>
- *     &lt;enumeration value="BWP"/>
- *     &lt;enumeration value="BYR"/>
- *     &lt;enumeration value="BZD"/>
- *     &lt;enumeration value="CAD"/>
- *     &lt;enumeration value="CDF"/>
- *     &lt;enumeration value="CHF"/>
- *     &lt;enumeration value="CLP"/>
- *     &lt;enumeration value="CNY"/>
- *     &lt;enumeration value="COP"/>
- *     &lt;enumeration value="CRC"/>
- *     &lt;enumeration value="CSD"/>
- *     &lt;enumeration value="CUP"/>
- *     &lt;enumeration value="CVE"/>
- *     &lt;enumeration value="CYP"/>
- *     &lt;enumeration value="CZK"/>
- *     &lt;enumeration value="DJV"/>
- *     &lt;enumeration value="DKK"/>
- *     &lt;enumeration value="DOP"/>
- *     &lt;enumeration value="DZD"/>
- *     &lt;enumeration value="ECS"/>
- *     &lt;enumeration value="EEK"/>
- *     &lt;enumeration value="EGP"/>
- *     &lt;enumeration value="ETB"/>
- *     &lt;enumeration value="EUR"/>
- *     &lt;enumeration value="FJD"/>
- *     &lt;enumeration value="FKP"/>
- *     &lt;enumeration value="GBP"/>
- *     &lt;enumeration value="GEL"/>
- *     &lt;enumeration value="GHC"/>
- *     &lt;enumeration value="GIP"/>
- *     &lt;enumeration value="GMD"/>
- *     &lt;enumeration value="GNF"/>
- *     &lt;enumeration value="GTQ"/>
- *     &lt;enumeration value="GYD"/>
- *     &lt;enumeration value="HKD"/>
- *     &lt;enumeration value="HNL"/>
- *     &lt;enumeration value="HRK"/>
- *     &lt;enumeration value="HTG"/>
- *     &lt;enumeration value="HUF"/>
- *     &lt;enumeration value="IDR"/>
- *     &lt;enumeration value="ILS"/>
- *     &lt;enumeration value="INR"/>
- *     &lt;enumeration value="IQD"/>
- *     &lt;enumeration value="IRR"/>
- *     &lt;enumeration value="ISK"/>
- *     &lt;enumeration value="JMD"/>
- *     &lt;enumeration value="JOD"/>
- *     &lt;enumeration value="JPY"/>
- *     &lt;enumeration value="KES"/>
- *     &lt;enumeration value="KGS"/>
- *     &lt;enumeration value="KHR"/>
- *     &lt;enumeration value="KMF"/>
- *     &lt;enumeration value="KPW"/>
- *     &lt;enumeration value="KRW"/>
- *     &lt;enumeration value="KWD"/>
- *     &lt;enumeration value="KYD"/>
- *     &lt;enumeration value="KZT"/>
- *     &lt;enumeration value="LAK"/>
- *     &lt;enumeration value="LBP"/>
- *     &lt;enumeration value="LKR"/>
- *     &lt;enumeration value="LRD"/>
- *     &lt;enumeration value="LSL"/>
- *     &lt;enumeration value="LTL"/>
- *     &lt;enumeration value="LVL"/>
- *     &lt;enumeration value="LYD"/>
- *     &lt;enumeration value="MAD"/>
- *     &lt;enumeration value="MDL"/>
- *     &lt;enumeration value="MGF"/>
- *     &lt;enumeration value="MKD"/>
- *     &lt;enumeration value="MMK"/>
- *     &lt;enumeration value="MNT"/>
- *     &lt;enumeration value="MOP"/>
- *     &lt;enumeration value="MRO"/>
- *     &lt;enumeration value="MTL"/>
- *     &lt;enumeration value="MUR"/>
- *     &lt;enumeration value="MVR"/>
- *     &lt;enumeration value="MWK"/>
- *     &lt;enumeration value="MXN"/>
- *     &lt;enumeration value="MYR"/>
- *     &lt;enumeration value="MZM"/>
- *     &lt;enumeration value="NAD"/>
- *     &lt;enumeration value="NGN"/>
- *     &lt;enumeration value="NIO"/>
- *     &lt;enumeration value="NOK"/>
- *     &lt;enumeration value="NPR"/>
- *     &lt;enumeration value="NZD"/>
- *     &lt;enumeration value="OMR"/>
- *     &lt;enumeration value="PAB"/>
- *     &lt;enumeration value="PEN"/>
- *     &lt;enumeration value="PGK"/>
- *     &lt;enumeration value="PHP"/>
- *     &lt;enumeration value="PKR"/>
- *     &lt;enumeration value="PLN"/>
- *     &lt;enumeration value="PYG"/>
- *     &lt;enumeration value="QAR"/>
- *     &lt;enumeration value="ROL"/>
- *     &lt;enumeration value="RUB"/>
- *     &lt;enumeration value="RWF"/>
- *     &lt;enumeration value="SAR"/>
- *     &lt;enumeration value="SBD"/>
- *     &lt;enumeration value="SCR"/>
- *     &lt;enumeration value="SDD"/>
- *     &lt;enumeration value="SEK"/>
- *     &lt;enumeration value="SGD"/>
- *     &lt;enumeration value="SHP"/>
- *     &lt;enumeration value="SIT"/>
- *     &lt;enumeration value="SKK"/>
- *     &lt;enumeration value="SLL"/>
- *     &lt;enumeration value="SOS"/>
- *     &lt;enumeration value="SRD"/>
- *     &lt;enumeration value="STD"/>
- *     &lt;enumeration value="SVC"/>
- *     &lt;enumeration value="SYP"/>
- *     &lt;enumeration value="SZL"/>
- *     &lt;enumeration value="THB"/>
- *     &lt;enumeration value="TJS"/>
- *     &lt;enumeration value="TMM"/>
- *     &lt;enumeration value="TND"/>
- *     &lt;enumeration value="TOP"/>
- *     &lt;enumeration value="TRL"/>
- *     &lt;enumeration value="TRY"/>
- *     &lt;enumeration value="TTD"/>
- *     &lt;enumeration value="TWD"/>
- *     &lt;enumeration value="TZS"/>
- *     &lt;enumeration value="UAH"/>
- *     &lt;enumeration value="UGX"/>
- *     &lt;enumeration value="USD"/>
- *     &lt;enumeration value="UYU"/>
- *     &lt;enumeration value="UZS"/>
- *     &lt;enumeration value="VEB"/>
- *     &lt;enumeration value="VND"/>
- *     &lt;enumeration value="VUV"/>
- *     &lt;enumeration value="WST"/>
- *     &lt;enumeration value="XAF"/>
- *     &lt;enumeration value="XCD"/>
- *     &lt;enumeration value="XOF"/>
- *     &lt;enumeration value="XPF"/>
- *     &lt;enumeration value="XTS"/>
- *     &lt;enumeration value="XXX"/>
- *     &lt;enumeration value="YER"/>
- *     &lt;enumeration value="ZAR"/>
- *     &lt;enumeration value="ZMK"/>
- *     &lt;enumeration value="ZWD"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "CurrencyCode")
-@XmlEnum
-public enum CurrencyCode {
-
-
-    /**
-     * Afghanistan: Afghani
-     * 
-     */
-    AFN,
-
-    /**
-     * Albanien: Lek
-     * 
-     */
-    ALL,
-
-    /**
-     * Armenien: Dram
-     * 
-     */
-    AMD,
-
-    /**
-     * Niederländische Antillen: Gulden
-     * 
-     */
-    ANG,
-
-    /**
-     * Angola: Kwanza
-     * 
-     */
-    AOA,
-
-    /**
-     * Argentinien: Peso
-     * 
-     */
-    ARS,
-
-    /**
-     * Australien: Dollar
-     * 
-     */
-    AUD,
-
-    /**
-     * Aruba: Florin
-     * 
-     */
-    AWG,
-
-    /**
-     * Aserbaidschan: Manat
-     * 
-     */
-    AZM,
-
-    /**
-     * Bosnien und Herzegowina: Konvertible Mark
-     * 
-     */
-    BAM,
-
-    /**
-     * Barbados: Dollar
-     * 
-     */
-    BBD,
-
-    /**
-     * Bangladesch: Taka
-     * 
-     */
-    BDT,
-
-    /**
-     * Bulgarien: Lew
-     * 
-     */
-    BGN,
-
-    /**
-     * Bahrain: Dinar
-     * 
-     */
-    BHD,
-
-    /**
-     * Bermuda: Dollar
-     * 
-     */
-    BMD,
-
-    /**
-     * Brunei: Dollar
-     * 
-     */
-    BND,
-
-    /**
-     * Bolivien: Boliviano
-     * 
-     */
-    BOB,
-
-    /**
-     * Brasilien: Real
-     * 
-     */
-    BRL,
-
-    /**
-     * Bahamas: Dollar
-     * 
-     */
-    BSD,
-
-    /**
-     * Bhutan: Ngultrum
-     * 
-     */
-    BTN,
-
-    /**
-     * Botswana: Pula
-     * 
-     */
-    BWP,
-
-    /**
-     * Weißrussland (Belarus): Rubel
-     * 
-     */
-    BYR,
-
-    /**
-     * Belize: Dollar
-     * 
-     */
-    BZD,
-
-    /**
-     * Kanada: Dollar
-     * 
-     */
-    CAD,
-
-    /**
-     * Demokratische Republik Kongo: Franc
-     * 
-     */
-    CDF,
-
-    /**
-     * Schweiz: Franken
-     * 
-     */
-    CHF,
-
-    /**
-     * Chile: Peso
-     * 
-     */
-    CLP,
-
-    /**
-     * China (Volksrepublik): Renminbi Yuan
-     * 
-     */
-    CNY,
-
-    /**
-     * Kolumbien: Peso
-     * 
-     */
-    COP,
-
-    /**
-     * Costa Rica: Colón
-     * 
-     */
-    CRC,
-
-    /**
-     * Serbien: Dinar
-     * 
-     */
-    CSD,
-
-    /**
-     * Kuba: Peso
-     * 
-     */
-    CUP,
-
-    /**
-     * Kap Verde: Escudo
-     * 
-     */
-    CVE,
-
-    /**
-     * Zypern (griechischer Teil): Pfund
-     * 
-     */
-    CYP,
-
-    /**
-     * Tschechien: Krone
-     * 
-     */
-    CZK,
-
-    /**
-     * Dschibuti: Franc
-     * 
-     */
-    DJV,
-
-    /**
-     * Dänemark: Krone
-     * 
-     */
-    DKK,
-
-    /**
-     * Dominikanische Republik: Peso
-     * 
-     */
-    DOP,
-
-    /**
-     * Algerien: Dinar
-     * 
-     */
-    DZD,
-
-    /**
-     * Ecuador (bis 2000): Sucre
-     * 
-     */
-    ECS,
-
-    /**
-     * Estland: Krone
-     * 
-     */
-    EEK,
-
-    /**
-     * Ägypten: Pfund
-     * 
-     */
-    EGP,
-
-    /**
-     * Äthiopien: Birr
-     * 
-     */
-    ETB,
-
-    /**
-     * Europäische Währungsunion: Euro
-     * 
-     */
-    EUR,
-
-    /**
-     * Fidschi: Dollar
-     * 
-     */
-    FJD,
-
-    /**
-     * Falklandinseln: Pfund
-     * 
-     */
-    FKP,
-
-    /**
-     * Vereinigtes Königreich: Pfund
-     * 
-     */
-    GBP,
-
-    /**
-     * Georgien: Lari
-     * 
-     */
-    GEL,
-
-    /**
-     * Ghana: Cedi
-     * 
-     */
-    GHC,
-
-    /**
-     * Gibraltar: Pfund
-     * 
-     */
-    GIP,
-
-    /**
-     * Gambia: Dalasi
-     * 
-     */
-    GMD,
-
-    /**
-     * Guinea: Franc
-     * 
-     */
-    GNF,
-
-    /**
-     * Guatemala: Quetzal
-     * 
-     */
-    GTQ,
-
-    /**
-     * Guyana: Dollar
-     * 
-     */
-    GYD,
-
-    /**
-     * Hongkong: Dollar
-     * 
-     */
-    HKD,
-
-    /**
-     * Honduras: Lempira
-     * 
-     */
-    HNL,
-
-    /**
-     * Kroatien: Kuna
-     * 
-     */
-    HRK,
-
-    /**
-     * Haiti: Gourde
-     * 
-     */
-    HTG,
-
-    /**
-     * Ungarn: Forint
-     * 
-     */
-    HUF,
-
-    /**
-     * Indonesien: Rupiah
-     * 
-     */
-    IDR,
-
-    /**
-     * Israel: Schekel
-     * 
-     */
-    ILS,
-
-    /**
-     * Indien: Rupie
-     * 
-     */
-    INR,
-
-    /**
-     * Irak: Dinar
-     * 
-     */
-    IQD,
-
-    /**
-     * Iran: Rial
-     * 
-     */
-    IRR,
-
-    /**
-     * Island: Krone
-     * 
-     */
-    ISK,
-
-    /**
-     * Jamaika: Dollar
-     * 
-     */
-    JMD,
-
-    /**
-     * Jordanien: Dinar
-     * 
-     */
-    JOD,
-
-    /**
-     * Japan: Yen
-     * 
-     */
-    JPY,
-
-    /**
-     * Kenia: Schilling
-     * 
-     */
-    KES,
-
-    /**
-     * Kirgisistan: Som
-     * 
-     */
-    KGS,
-
-    /**
-     * Kambodscha: Riel
-     * 
-     */
-    KHR,
-
-    /**
-     * Komoren: Franc
-     * 
-     */
-    KMF,
-
-    /**
-     * Nordkorea: Won
-     * 
-     */
-    KPW,
-
-    /**
-     * Südkorea: Won
-     * 
-     */
-    KRW,
-
-    /**
-     * Kuwait: Dinar
-     * 
-     */
-    KWD,
-
-    /**
-     * Kaimaninseln: Dollar
-     * 
-     */
-    KYD,
-
-    /**
-     * Kasachstan: Tenge
-     * 
-     */
-    KZT,
-
-    /**
-     * Laos: Kip
-     * 
-     */
-    LAK,
-
-    /**
-     * Libanon: Pfund
-     * 
-     */
-    LBP,
-
-    /**
-     * Sri Lanka: Rupie
-     * 
-     */
-    LKR,
-
-    /**
-     * Liberia: Dollar
-     * 
-     */
-    LRD,
-
-    /**
-     * Lesotho: Loti
-     * 
-     */
-    LSL,
-
-    /**
-     * Litauen: Litas
-     * 
-     */
-    LTL,
-
-    /**
-     * Lettland: Lats
-     * 
-     */
-    LVL,
-
-    /**
-     * Libyen: Dinar
-     * 
-     */
-    LYD,
-
-    /**
-     * Marokko: Dirham
-     * 
-     */
-    MAD,
-
-    /**
-     * Moldawien: Leu
-     * 
-     */
-    MDL,
-
-    /**
-     * Madagaskar: Franc
-     * 
-     */
-    MGF,
-
-    /**
-     * Mazedonien: Denar
-     * 
-     */
-    MKD,
-
-    /**
-     * Myanmar: Kyat
-     * 
-     */
-    MMK,
-
-    /**
-     * Mongolei: Tugrik
-     * 
-     */
-    MNT,
-
-    /**
-     * Macau: Pataca
-     * 
-     */
-    MOP,
-
-    /**
-     * Mauretanien: Ouguiya
-     * 
-     */
-    MRO,
-
-    /**
-     * Malta: Lira
-     * 
-     */
-    MTL,
-
-    /**
-     * Mauritius: Rupie
-     * 
-     */
-    MUR,
-
-    /**
-     * Malediven: Rufiyaa
-     * 
-     */
-    MVR,
-
-    /**
-     * Malawi: Kwacha
-     * 
-     */
-    MWK,
-
-    /**
-     * Mexiko: Peso
-     * 
-     */
-    MXN,
-
-    /**
-     * Malaysia: Ringgit
-     * 
-     */
-    MYR,
-
-    /**
-     * Mosambik: Metical
-     * 
-     */
-    MZM,
-
-    /**
-     * Namibia: Dollar
-     * 
-     */
-    NAD,
-
-    /**
-     * Nigeria: Naira
-     * 
-     */
-    NGN,
-
-    /**
-     * Nicaragua: Cordoba Oro
-     * 
-     */
-    NIO,
-
-    /**
-     * Norwegen: Krone
-     * 
-     */
-    NOK,
-
-    /**
-     * Nepal: Rupie
-     * 
-     */
-    NPR,
-
-    /**
-     * Neuseeland: Dollar
-     * 
-     */
-    NZD,
-
-    /**
-     * Oman: Rial
-     * 
-     */
-    OMR,
-
-    /**
-     * Panama: Balboa
-     * 
-     */
-    PAB,
-
-    /**
-     * Peru: Nuevo Sol
-     * 
-     */
-    PEN,
-
-    /**
-     * Papua-Neuguinea: Kina
-     * 
-     */
-    PGK,
-
-    /**
-     * Philippinen: Peso
-     * 
-     */
-    PHP,
-
-    /**
-     * Pakistan: Rupie
-     * 
-     */
-    PKR,
-
-    /**
-     * Polen: Zloty
-     * 
-     */
-    PLN,
-
-    /**
-     * Paraguay: Guaraní
-     * 
-     */
-    PYG,
-
-    /**
-     * Katar: Riyal
-     * 
-     */
-    QAR,
-
-    /**
-     * Rumänien: Leu
-     * 
-     */
-    ROL,
-
-    /**
-     * Russland: Rubel
-     * 
-     */
-    RUB,
-
-    /**
-     * Ruanda: Franc
-     * 
-     */
-    RWF,
-
-    /**
-     * Saudi-Arabien: Riyal
-     * 
-     */
-    SAR,
-
-    /**
-     * Salomonen: Dollar
-     * 
-     */
-    SBD,
-
-    /**
-     * Seychellen: Rupie
-     * 
-     */
-    SCR,
-
-    /**
-     * Sudan: Dinar
-     * 
-     */
-    SDD,
-
-    /**
-     * Schweden: Krone
-     * 
-     */
-    SEK,
-
-    /**
-     * Singapur: Dollar
-     * 
-     */
-    SGD,
-
-    /**
-     * St. Helena: Pfund
-     * 
-     */
-    SHP,
-
-    /**
-     * Slowenien: Tolar
-     * 
-     */
-    SIT,
-
-    /**
-     * Slowakei: Krone
-     * 
-     */
-    SKK,
-
-    /**
-     * Sierra Leone: Leone
-     * 
-     */
-    SLL,
-
-    /**
-     * Somalia: Schilling
-     * 
-     */
-    SOS,
-
-    /**
-     * Suriname: Dollar
-     * 
-     */
-    SRD,
-
-    /**
-     * São Tomé und Príncipe: Dobra
-     * 
-     */
-    STD,
-
-    /**
-     * El Salvador: Colón
-     * 
-     */
-    SVC,
-
-    /**
-     * Syrien: Pfund
-     * 
-     */
-    SYP,
-
-    /**
-     * Swasiland: Lilangeni
-     * 
-     */
-    SZL,
-
-    /**
-     * Thailand: Baht
-     * 
-     */
-    THB,
-
-    /**
-     * Tadschikistan: Somoni
-     * 
-     */
-    TJS,
-
-    /**
-     * Turkmenistan: Manat
-     * 
-     */
-    TMM,
-
-    /**
-     * Tunesien: Dinar
-     * 
-     */
-    TND,
-
-    /**
-     * Tonga: Pa'anga
-     * 
-     */
-    TOP,
-
-    /**
-     * Türkei: Lira
-     * 
-     */
-    TRL,
-
-    /**
-     * Türkei: Neue Lira (ab 2005)
-     * 
-     */
-    TRY,
-
-    /**
-     * Trinidad und Tobago: Dollar
-     * 
-     */
-    TTD,
-
-    /**
-     * Taiwan: Dollar
-     * 
-     */
-    TWD,
-
-    /**
-     * Tansania: Schilling
-     * 
-     */
-    TZS,
-
-    /**
-     * Ukraine: Hrywnja
-     * 
-     */
-    UAH,
-
-    /**
-     * Uganda: Shilling
-     * 
-     */
-    UGX,
-
-    /**
-     * USA: Dollar
-     * 
-     */
-    USD,
-
-    /**
-     * Uruguay: Peso
-     * 
-     */
-    UYU,
-
-    /**
-     * Usbekistan: Sum
-     * 
-     */
-    UZS,
-
-    /**
-     * Venezuela: Bolivar
-     * 
-     */
-    VEB,
-
-    /**
-     * Vietnam: Dong
-     * 
-     */
-    VND,
-
-    /**
-     * Vanuatu: Vatu
-     * 
-     */
-    VUV,
-
-    /**
-     * Samoa: Tala
-     * 
-     */
-    WST,
-
-    /**
-     * Zentralafrikanische Wirtschafts- und Währungsunion: CFA-Franc
-     * 
-     */
-    XAF,
-
-    /**
-     * Ostkaribische Währungsunion: Dollar
-     * 
-     */
-    XCD,
-
-    /**
-     * Westafrikanische Wirtschafts- und Währungsunion: CFA-Franc
-     * 
-     */
-    XOF,
-
-    /**
-     * Neukaledonien: CFP-Franc
-     * 
-     */
-    XPF,
-
-    /**
-     * Spezialcode für Testzwecke; keine existierende Währung
-     * 
-     */
-    XTS,
-
-    /**
-     * keine Währung
-     * 
-     */
-    XXX,
-
-    /**
-     * Jemen: Rial
-     * 
-     */
-    YER,
-
-    /**
-     * Südafrika: Rand
-     * 
-     */
-    ZAR,
-
-    /**
-     * Sambia: Kwacha
-     * 
-     */
-    ZMK,
-
-    /**
-     * Simbabwe: Dollar
-     * 
-     */
-    ZWD;
-
-    public String value() {
-        return name();
-    }
-
-    public static CurrencyCode fromValue(String v) {
-        return valueOf(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/DSAKeyValueType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/DSAKeyValueType.java
deleted file mode 100644
index 9de982d..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/DSAKeyValueType.java
+++ /dev/null
@@ -1,227 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for DSAKeyValueType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="DSAKeyValueType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;sequence minOccurs="0">
- *           &lt;element name="P" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *           &lt;element name="Q" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         &lt;/sequence>
- *         &lt;element name="G" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"; minOccurs="0"/>
- *         &lt;element name="Y" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         &lt;element name="J" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"; minOccurs="0"/>
- *         &lt;sequence minOccurs="0">
- *           &lt;element name="Seed" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *           &lt;element name="PgenCounter" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         &lt;/sequence>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DSAKeyValueType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "p",
-    "q",
-    "g",
-    "y",
-    "j",
-    "seed",
-    "pgenCounter"
-})
-public class DSAKeyValueType {
-
-    @XmlElement(name = "P")
-    protected byte[] p;
-    @XmlElement(name = "Q")
-    protected byte[] q;
-    @XmlElement(name = "G")
-    protected byte[] g;
-    @XmlElement(name = "Y", required = true)
-    protected byte[] y;
-    @XmlElement(name = "J")
-    protected byte[] j;
-    @XmlElement(name = "Seed")
-    protected byte[] seed;
-    @XmlElement(name = "PgenCounter")
-    protected byte[] pgenCounter;
-
-    /**
-     * Gets the value of the p property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getP() {
-        return p;
-    }
-
-    /**
-     * Sets the value of the p property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setP(byte[] value) {
-        this.p = value;
-    }
-
-    /**
-     * Gets the value of the q property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getQ() {
-        return q;
-    }
-
-    /**
-     * Sets the value of the q property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setQ(byte[] value) {
-        this.q = value;
-    }
-
-    /**
-     * Gets the value of the g property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getG() {
-        return g;
-    }
-
-    /**
-     * Sets the value of the g property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setG(byte[] value) {
-        this.g = value;
-    }
-
-    /**
-     * Gets the value of the y property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getY() {
-        return y;
-    }
-
-    /**
-     * Sets the value of the y property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setY(byte[] value) {
-        this.y = value;
-    }
-
-    /**
-     * Gets the value of the j property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getJ() {
-        return j;
-    }
-
-    /**
-     * Sets the value of the j property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setJ(byte[] value) {
-        this.j = value;
-    }
-
-    /**
-     * Gets the value of the seed property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getSeed() {
-        return seed;
-    }
-
-    /**
-     * Sets the value of the seed property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setSeed(byte[] value) {
-        this.seed = value;
-    }
-
-    /**
-     * Gets the value of the pgenCounter property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getPgenCounter() {
-        return pgenCounter;
-    }
-
-    /**
-     * Sets the value of the pgenCounter property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setPgenCounter(byte[] value) {
-        this.pgenCounter = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/DataDigestType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/DataDigestType.java
deleted file mode 100644
index 7572129..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/DataDigestType.java
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for DataDigestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="DataDigestType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;urn:org:ebics:H004>DigestType">
- *       &lt;attribute name="SignatureVersion" 
type="{urn:org:ebics:H004}SignatureVersionType" default="A004" />
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DataDigestType", propOrder = {
-    "value"
-})
-public class DataDigestType {
-
-    @XmlValue
-    protected byte[] value;
-    @XmlAttribute(name = "SignatureVersion")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String signatureVersion;
-
-    /**
-     * Datentyp für Hashwerte.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setValue(byte[] value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the signatureVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSignatureVersion() {
-        if (signatureVersion == null) {
-            return "A004";
-        } else {
-            return signatureVersion;
-        }
-    }
-
-    /**
-     * Sets the value of the signatureVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSignatureVersion(String value) {
-        this.signatureVersion = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/DataEncryptionInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/DataEncryptionInfoType.java
deleted file mode 100644
index bfdbe50..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/DataEncryptionInfoType.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for the modelling of information regarding the encryption of 
signature and order data.
- * 
- * <p>Java class for DataEncryptionInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="DataEncryptionInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="EncryptionPubKeyDigest">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension base="&lt;urn:org:ebics:H004>PubKeyDigestType">
- *                 &lt;attribute name="Version" use="required" 
type="{urn:org:ebics:H004}EncryptionVersionType" />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="TransactionKey" 
type="{urn:org:ebics:H004}SymmetricKeyType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DataEncryptionInfoType", propOrder = {
-    "encryptionPubKeyDigest",
-    "transactionKey",
-    "any"
-})
-@XmlSeeAlso({
-    
tech.libeufin.messages.ebics.keyrequest.DataTransferRequestType.DataEncryptionInfo.class,
-    
tech.libeufin.messages.ebics.keyrequest.DataTransferResponseType.DataEncryptionInfo.class
-})
-public class DataEncryptionInfoType {
-
-    @XmlElement(name = "EncryptionPubKeyDigest", required = true)
-    protected DataEncryptionInfoType.EncryptionPubKeyDigest 
encryptionPubKeyDigest;
-    @XmlElement(name = "TransactionKey", required = true)
-    protected byte[] transactionKey;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the encryptionPubKeyDigest property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataEncryptionInfoType.EncryptionPubKeyDigest }
-     *     
-     */
-    public DataEncryptionInfoType.EncryptionPubKeyDigest 
getEncryptionPubKeyDigest() {
-        return encryptionPubKeyDigest;
-    }
-
-    /**
-     * Sets the value of the encryptionPubKeyDigest property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataEncryptionInfoType.EncryptionPubKeyDigest }
-     *     
-     */
-    public void 
setEncryptionPubKeyDigest(DataEncryptionInfoType.EncryptionPubKeyDigest value) {
-        this.encryptionPubKeyDigest = value;
-    }
-
-    /**
-     * Gets the value of the transactionKey property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getTransactionKey() {
-        return transactionKey;
-    }
-
-    /**
-     * Sets the value of the transactionKey property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setTransactionKey(byte[] value) {
-        this.transactionKey = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>PubKeyDigestType">
-     *       &lt;attribute name="Version" use="required" 
type="{urn:org:ebics:H004}EncryptionVersionType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class EncryptionPubKeyDigest
-        extends PubKeyDigestType
-    {
-
-        @XmlAttribute(name = "Version", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String version;
-
-        /**
-         * Gets the value of the version property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getVersion() {
-            return version;
-        }
-
-        /**
-         * Sets the value of the version property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setVersion(String value) {
-            this.version = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/DataTransferRequestType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/DataTransferRequestType.java
deleted file mode 100644
index 16a8ee9..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/DataTransferRequestType.java
+++ /dev/null
@@ -1,386 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.namespace.QName;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für den Transfer von Auftragsdaten (Anfrage).
- * 
- * <p>Java class for DataTransferRequestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="DataTransferRequestType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;choice>
- *           &lt;sequence>
- *             &lt;element name="DataEncryptionInfo">
- *               &lt;complexType>
- *                 &lt;complexContent>
- *                   &lt;extension 
base="{urn:org:ebics:H004}DataEncryptionInfoType">
- *                     &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *                   &lt;/extension>
- *                 &lt;/complexContent>
- *               &lt;/complexType>
- *             &lt;/element>
- *             &lt;element name="SignatureData">
- *               &lt;complexType>
- *                 &lt;simpleContent>
- *                   &lt;extension 
base="&lt;urn:org:ebics:H004>SignatureDataType">
- *                     &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *                   &lt;/extension>
- *                 &lt;/simpleContent>
- *               &lt;/complexType>
- *             &lt;/element>
- *           &lt;/sequence>
- *           &lt;sequence>
- *             &lt;element name="OrderData">
- *               &lt;complexType>
- *                 &lt;simpleContent>
- *                   &lt;extension base="&lt;urn:org:ebics:H004>OrderDataType">
- *                     &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
- *                   &lt;/extension>
- *                 &lt;/simpleContent>
- *               &lt;/complexType>
- *             &lt;/element>
- *           &lt;/sequence>
- *         &lt;/choice>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DataTransferRequestType", propOrder = {
-    "dataEncryptionInfo",
-    "signatureData",
-    "orderData",
-    "any"
-})
-public class DataTransferRequestType {
-
-    @XmlElement(name = "DataEncryptionInfo")
-    protected DataTransferRequestType.DataEncryptionInfo dataEncryptionInfo;
-    @XmlElement(name = "SignatureData")
-    protected DataTransferRequestType.SignatureData signatureData;
-    @XmlElement(name = "OrderData")
-    protected DataTransferRequestType.OrderData orderData;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the dataEncryptionInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataTransferRequestType.DataEncryptionInfo }
-     *     
-     */
-    public DataTransferRequestType.DataEncryptionInfo getDataEncryptionInfo() {
-        return dataEncryptionInfo;
-    }
-
-    /**
-     * Sets the value of the dataEncryptionInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataTransferRequestType.DataEncryptionInfo }
-     *     
-     */
-    public void 
setDataEncryptionInfo(DataTransferRequestType.DataEncryptionInfo value) {
-        this.dataEncryptionInfo = value;
-    }
-
-    /**
-     * Gets the value of the signatureData property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataTransferRequestType.SignatureData }
-     *     
-     */
-    public DataTransferRequestType.SignatureData getSignatureData() {
-        return signatureData;
-    }
-
-    /**
-     * Sets the value of the signatureData property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataTransferRequestType.SignatureData }
-     *     
-     */
-    public void setSignatureData(DataTransferRequestType.SignatureData value) {
-        this.signatureData = value;
-    }
-
-    /**
-     * Gets the value of the orderData property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataTransferRequestType.OrderData }
-     *     
-     */
-    public DataTransferRequestType.OrderData getOrderData() {
-        return orderData;
-    }
-
-    /**
-     * Sets the value of the orderData property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataTransferRequestType.OrderData }
-     *     
-     */
-    public void setOrderData(DataTransferRequestType.OrderData value) {
-        this.orderData = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:org:ebics:H004}DataEncryptionInfoType">
-     *       &lt;attGroup ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class DataEncryptionInfo
-        extends DataEncryptionInfoType
-    {
-
-        @XmlAttribute(name = "authenticate", required = true)
-        protected boolean authenticate;
-
-        /**
-         * Gets the value of the authenticate property.
-         * 
-         */
-        public boolean isAuthenticate() {
-            return authenticate;
-        }
-
-        /**
-         * Sets the value of the authenticate property.
-         * 
-         */
-        public void setAuthenticate(boolean value) {
-            this.authenticate = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>OrderDataType">
-     *       &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class OrderData {
-
-        @XmlValue
-        protected byte[] value;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Datentyp für binäre Auftragsdaten (komprimiert, verschlüsselt und 
kodiert).
-         * 
-         * @return
-         *     possible object is
-         *     byte[]
-         */
-        public byte[] getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     byte[]
-         */
-        public void setValue(byte[] value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>SignatureDataType">
-     *       &lt;attGroup ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class SignatureData {
-
-        @XmlValue
-        protected byte[] value;
-        @XmlAttribute(name = "authenticate", required = true)
-        protected boolean authenticate;
-
-        /**
-         * Datentyp für binäre Signaturdaten (komprimiert, verschlüsselt und 
kodiert).
-         * 
-         * @return
-         *     possible object is
-         *     byte[]
-         */
-        public byte[] getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     byte[]
-         */
-        public void setValue(byte[] value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the authenticate property.
-         * 
-         */
-        public boolean isAuthenticate() {
-            return authenticate;
-        }
-
-        /**
-         * Sets the value of the authenticate property.
-         * 
-         */
-        public void setAuthenticate(boolean value) {
-            this.authenticate = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/DataTransferResponseType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/DataTransferResponseType.java
deleted file mode 100644
index bb4b186..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/DataTransferResponseType.java
+++ /dev/null
@@ -1,355 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.namespace.QName;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für den Transfer von Auftragsdaten (Antwort).
- * 
- * <p>Java class for DataTransferResponseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="DataTransferResponseType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;sequence minOccurs="0">
- *           &lt;element name="DataEncryptionInfo">
- *             &lt;complexType>
- *               &lt;complexContent>
- *                 &lt;extension 
base="{urn:org:ebics:H004}DataEncryptionInfoType">
- *                   &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *                 &lt;/extension>
- *               &lt;/complexContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *           &lt;element name="SignatureData" maxOccurs="0" minOccurs="0">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;urn:org:ebics:H004>SignatureDataType">
- *                   &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *         &lt;/sequence>
- *         &lt;element name="OrderData">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension base="&lt;urn:org:ebics:H004>OrderDataType">
- *                 &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DataTransferResponseType", propOrder = {
-    "dataEncryptionInfo",
-    "orderData",
-    "any"
-})
-public class DataTransferResponseType {
-
-    @XmlElement(name = "DataEncryptionInfo")
-    protected DataTransferResponseType.DataEncryptionInfo dataEncryptionInfo;
-    @XmlElement(name = "OrderData", required = true)
-    protected DataTransferResponseType.OrderData orderData;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the dataEncryptionInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataTransferResponseType.DataEncryptionInfo }
-     *     
-     */
-    public DataTransferResponseType.DataEncryptionInfo getDataEncryptionInfo() 
{
-        return dataEncryptionInfo;
-    }
-
-    /**
-     * Sets the value of the dataEncryptionInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataTransferResponseType.DataEncryptionInfo }
-     *     
-     */
-    public void 
setDataEncryptionInfo(DataTransferResponseType.DataEncryptionInfo value) {
-        this.dataEncryptionInfo = value;
-    }
-
-    /**
-     * Gets the value of the orderData property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataTransferResponseType.OrderData }
-     *     
-     */
-    public DataTransferResponseType.OrderData getOrderData() {
-        return orderData;
-    }
-
-    /**
-     * Sets the value of the orderData property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataTransferResponseType.OrderData }
-     *     
-     */
-    public void setOrderData(DataTransferResponseType.OrderData value) {
-        this.orderData = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:org:ebics:H004}DataEncryptionInfoType">
-     *       &lt;attGroup ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class DataEncryptionInfo
-        extends DataEncryptionInfoType
-    {
-
-        @XmlAttribute(name = "authenticate", required = true)
-        protected boolean authenticate;
-
-        /**
-         * Gets the value of the authenticate property.
-         * 
-         */
-        public boolean isAuthenticate() {
-            return authenticate;
-        }
-
-        /**
-         * Sets the value of the authenticate property.
-         * 
-         */
-        public void setAuthenticate(boolean value) {
-            this.authenticate = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>OrderDataType">
-     *       &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class OrderData {
-
-        @XmlValue
-        protected byte[] value;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Datentyp für binäre Auftragsdaten (komprimiert, verschlüsselt und 
kodiert).
-         * 
-         * @return
-         *     possible object is
-         *     byte[]
-         */
-        public byte[] getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     byte[]
-         */
-        public void setValue(byte[] value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>SignatureDataType">
-     *       &lt;attGroup ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class SignatureData {
-
-        @XmlValue
-        protected byte[] value;
-        @XmlAttribute(name = "authenticate", required = true)
-        protected boolean authenticate;
-
-        /**
-         * Datentyp für binäre Signaturdaten (komprimiert, verschlüsselt und 
kodiert).
-         * 
-         * @return
-         *     possible object is
-         *     byte[]
-         */
-        public byte[] getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     byte[]
-         */
-        public void setValue(byte[] value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the authenticate property.
-         * 
-         */
-        public boolean isAuthenticate() {
-            return authenticate;
-        }
-
-        /**
-         * Sets the value of the authenticate property.
-         * 
-         */
-        public void setAuthenticate(boolean value) {
-            this.authenticate = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/DigestMethodType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/DigestMethodType.java
deleted file mode 100644
index 1cd54c7..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/DigestMethodType.java
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for DigestMethodType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="DigestMethodType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Algorithm" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DigestMethodType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class DigestMethodType {
-
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Algorithm", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String algorithm;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * {@link String }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-    /**
-     * Gets the value of the algorithm property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAlgorithm() {
-        return algorithm;
-    }
-
-    /**
-     * Sets the value of the algorithm property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAlgorithm(String value) {
-        this.algorithm = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/EbicsNoPubKeyDigestsRequest.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/EbicsNoPubKeyDigestsRequest.java
deleted file mode 100644
index 5eaf069..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/EbicsNoPubKeyDigestsRequest.java
+++ /dev/null
@@ -1,335 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="header">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;sequence>
- *                   &lt;element name="static" 
type="{urn:org:ebics:H004}NoPubKeyDigestsRequestStaticHeaderType"/>
- *                   &lt;element name="mutable" 
type="{urn:org:ebics:H004}EmptyMutableHeaderType"/>
- *                 &lt;/sequence>
- *                 &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element ref="{urn:org:ebics:H004}AuthSignature"/>
- *         &lt;element name="body">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;sequence>
- *                   &lt;element 
ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"; maxOccurs="0" minOccurs="0"/>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *       &lt;attGroup ref="{urn:org:ebics:H004}VersionAttrGroup"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "header",
-    "authSignature",
-    "body"
-})
-@XmlRootElement(name = "ebicsNoPubKeyDigestsRequest")
-public class EbicsNoPubKeyDigestsRequest {
-
-    @XmlElement(required = true)
-    protected EbicsNoPubKeyDigestsRequest.Header header;
-    @XmlElement(name = "AuthSignature", required = true)
-    protected SignatureType authSignature;
-    @XmlElement(required = true)
-    protected EbicsNoPubKeyDigestsRequest.Body body;
-    @XmlAttribute(name = "Version", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String version;
-    @XmlAttribute(name = "Revision")
-    protected Integer revision;
-
-    /**
-     * Gets the value of the header property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EbicsNoPubKeyDigestsRequest.Header }
-     *     
-     */
-    public EbicsNoPubKeyDigestsRequest.Header getHeader() {
-        return header;
-    }
-
-    /**
-     * Sets the value of the header property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EbicsNoPubKeyDigestsRequest.Header }
-     *     
-     */
-    public void setHeader(EbicsNoPubKeyDigestsRequest.Header value) {
-        this.header = value;
-    }
-
-    /**
-     * Authentifikationssignatur.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignatureType }
-     *     
-     */
-    public SignatureType getAuthSignature() {
-        return authSignature;
-    }
-
-    /**
-     * Sets the value of the authSignature property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignatureType }
-     *     
-     */
-    public void setAuthSignature(SignatureType value) {
-        this.authSignature = value;
-    }
-
-    /**
-     * Gets the value of the body property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EbicsNoPubKeyDigestsRequest.Body }
-     *     
-     */
-    public EbicsNoPubKeyDigestsRequest.Body getBody() {
-        return body;
-    }
-
-    /**
-     * Sets the value of the body property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EbicsNoPubKeyDigestsRequest.Body }
-     *     
-     */
-    public void setBody(EbicsNoPubKeyDigestsRequest.Body value) {
-        this.body = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVersion() {
-        return version;
-    }
-
-    /**
-     * Sets the value of the version property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVersion(String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the revision property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getRevision() {
-        return revision;
-    }
-
-    /**
-     * Sets the value of the revision property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setRevision(Integer value) {
-        this.revision = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;sequence>
-     *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"; 
maxOccurs="0" minOccurs="0"/>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Body {
-
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;sequence>
-     *         &lt;element name="static" 
type="{urn:org:ebics:H004}NoPubKeyDigestsRequestStaticHeaderType"/>
-     *         &lt;element name="mutable" 
type="{urn:org:ebics:H004}EmptyMutableHeaderType"/>
-     *       &lt;/sequence>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "_static",
-        "mutable"
-    })
-    public static class Header {
-
-        @XmlElement(name = "static", required = true)
-        protected NoPubKeyDigestsRequestStaticHeaderType _static;
-        @XmlElement(required = true)
-        protected EmptyMutableHeaderType mutable;
-        @XmlAttribute(name = "authenticate", required = true)
-        protected boolean authenticate;
-
-        /**
-         * Gets the value of the static property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link NoPubKeyDigestsRequestStaticHeaderType }
-         *     
-         */
-        public NoPubKeyDigestsRequestStaticHeaderType getStatic() {
-            return _static;
-        }
-
-        /**
-         * Sets the value of the static property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link NoPubKeyDigestsRequestStaticHeaderType }
-         *     
-         */
-        public void setStatic(NoPubKeyDigestsRequestStaticHeaderType value) {
-            this._static = value;
-        }
-
-        /**
-         * Gets the value of the mutable property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link EmptyMutableHeaderType }
-         *     
-         */
-        public EmptyMutableHeaderType getMutable() {
-            return mutable;
-        }
-
-        /**
-         * Sets the value of the mutable property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link EmptyMutableHeaderType }
-         *     
-         */
-        public void setMutable(EmptyMutableHeaderType value) {
-            this.mutable = value;
-        }
-
-        /**
-         * Gets the value of the authenticate property.
-         * 
-         */
-        public boolean isAuthenticate() {
-            return authenticate;
-        }
-
-        /**
-         * Sets the value of the authenticate property.
-         * 
-         */
-        public void setAuthenticate(boolean value) {
-            this.authenticate = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/EbicsUnsecuredRequest.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/EbicsUnsecuredRequest.java
deleted file mode 100644
index 0762dfe..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/EbicsUnsecuredRequest.java
+++ /dev/null
@@ -1,510 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="header">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;sequence>
- *                   &lt;element name="static" 
type="{urn:org:ebics:H004}UnsecuredRequestStaticHeaderType"/>
- *                   &lt;element name="mutable" 
type="{urn:org:ebics:H004}EmptyMutableHeaderType"/>
- *                 &lt;/sequence>
- *                 &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="body">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;sequence>
- *                   &lt;element name="DataTransfer">
- *                     &lt;complexType>
- *                       &lt;complexContent>
- *                         &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                           &lt;sequence>
- *                             &lt;element name="OrderData">
- *                               &lt;complexType>
- *                                 &lt;simpleContent>
- *                                   &lt;extension 
base="&lt;urn:org:ebics:H004>OrderDataType">
- *                                     &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
- *                                   &lt;/extension>
- *                                 &lt;/simpleContent>
- *                               &lt;/complexType>
- *                             &lt;/element>
- *                           &lt;/sequence>
- *                         &lt;/restriction>
- *                       &lt;/complexContent>
- *                     &lt;/complexType>
- *                   &lt;/element>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *       &lt;attGroup ref="{urn:org:ebics:H004}VersionAttrGroup"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "header",
-    "body"
-})
-@XmlRootElement(name = "ebicsUnsecuredRequest")
-public class EbicsUnsecuredRequest {
-
-    @XmlElement(required = true)
-    protected EbicsUnsecuredRequest.Header header;
-    @XmlElement(required = true)
-    protected EbicsUnsecuredRequest.Body body;
-    @XmlAttribute(name = "Version", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String version;
-    @XmlAttribute(name = "Revision")
-    protected Integer revision;
-
-    /**
-     * Gets the value of the header property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EbicsUnsecuredRequest.Header }
-     *     
-     */
-    public EbicsUnsecuredRequest.Header getHeader() {
-        return header;
-    }
-
-    /**
-     * Sets the value of the header property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EbicsUnsecuredRequest.Header }
-     *     
-     */
-    public void setHeader(EbicsUnsecuredRequest.Header value) {
-        this.header = value;
-    }
-
-    /**
-     * Gets the value of the body property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EbicsUnsecuredRequest.Body }
-     *     
-     */
-    public EbicsUnsecuredRequest.Body getBody() {
-        return body;
-    }
-
-    /**
-     * Sets the value of the body property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EbicsUnsecuredRequest.Body }
-     *     
-     */
-    public void setBody(EbicsUnsecuredRequest.Body value) {
-        this.body = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVersion() {
-        return version;
-    }
-
-    /**
-     * Sets the value of the version property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVersion(String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the revision property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getRevision() {
-        return revision;
-    }
-
-    /**
-     * Sets the value of the revision property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setRevision(Integer value) {
-        this.revision = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;sequence>
-     *         &lt;element name="DataTransfer">
-     *           &lt;complexType>
-     *             &lt;complexContent>
-     *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *                 &lt;sequence>
-     *                   &lt;element name="OrderData">
-     *                     &lt;complexType>
-     *                       &lt;simpleContent>
-     *                         &lt;extension 
base="&lt;urn:org:ebics:H004>OrderDataType">
-     *                           &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
-     *                         &lt;/extension>
-     *                       &lt;/simpleContent>
-     *                     &lt;/complexType>
-     *                   &lt;/element>
-     *                 &lt;/sequence>
-     *               &lt;/restriction>
-     *             &lt;/complexContent>
-     *           &lt;/complexType>
-     *         &lt;/element>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "dataTransfer"
-    })
-    public static class Body {
-
-        @XmlElement(name = "DataTransfer", required = true)
-        protected EbicsUnsecuredRequest.Body.DataTransfer dataTransfer;
-
-        /**
-         * Gets the value of the dataTransfer property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link EbicsUnsecuredRequest.Body.DataTransfer }
-         *     
-         */
-        public EbicsUnsecuredRequest.Body.DataTransfer getDataTransfer() {
-            return dataTransfer;
-        }
-
-        /**
-         * Sets the value of the dataTransfer property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link EbicsUnsecuredRequest.Body.DataTransfer }
-         *     
-         */
-        public void setDataTransfer(EbicsUnsecuredRequest.Body.DataTransfer 
value) {
-            this.dataTransfer = value;
-        }
-
-
-        /**
-         * <p>Java class for anonymous complex type.
-         * 
-         * <p>The following schema fragment specifies the expected content 
contained within this class.
-         * 
-         * <pre>
-         * &lt;complexType>
-         *   &lt;complexContent>
-         *     &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
-         *       &lt;sequence>
-         *         &lt;element name="OrderData">
-         *           &lt;complexType>
-         *             &lt;simpleContent>
-         *               &lt;extension 
base="&lt;urn:org:ebics:H004>OrderDataType">
-         *                 &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
-         *               &lt;/extension>
-         *             &lt;/simpleContent>
-         *           &lt;/complexType>
-         *         &lt;/element>
-         *       &lt;/sequence>
-         *     &lt;/restriction>
-         *   &lt;/complexContent>
-         * &lt;/complexType>
-         * </pre>
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "orderData"
-        })
-        public static class DataTransfer {
-
-            @XmlElement(name = "OrderData", required = true)
-            protected EbicsUnsecuredRequest.Body.DataTransfer.OrderData 
orderData;
-
-            /**
-             * Gets the value of the orderData property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link EbicsUnsecuredRequest.Body.DataTransfer.OrderData }
-             *     
-             */
-            public EbicsUnsecuredRequest.Body.DataTransfer.OrderData 
getOrderData() {
-                return orderData;
-            }
-
-            /**
-             * Sets the value of the orderData property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link EbicsUnsecuredRequest.Body.DataTransfer.OrderData }
-             *     
-             */
-            public void 
setOrderData(EbicsUnsecuredRequest.Body.DataTransfer.OrderData value) {
-                this.orderData = value;
-            }
-
-
-            /**
-             * <p>Java class for anonymous complex type.
-             * 
-             * <p>The following schema fragment specifies the expected content 
contained within this class.
-             * 
-             * <pre>
-             * &lt;complexType>
-             *   &lt;simpleContent>
-             *     &lt;extension base="&lt;urn:org:ebics:H004>OrderDataType">
-             *       &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
-             *     &lt;/extension>
-             *   &lt;/simpleContent>
-             * &lt;/complexType>
-             * </pre>
-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "", propOrder = {
-                "value"
-            })
-            public static class OrderData {
-
-                @XmlValue
-                protected byte[] value;
-                @XmlAnyAttribute
-                private Map<QName, String> otherAttributes = new 
HashMap<QName, String>();
-
-                /**
-                 * Datentyp für binäre Auftragsdaten (komprimiert, 
verschlüsselt und kodiert).
-                 * 
-                 * @return
-                 *     possible object is
-                 *     byte[]
-                 */
-                public byte[] getValue() {
-                    return value;
-                }
-
-                /**
-                 * Sets the value of the value property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     byte[]
-                 */
-                public void setValue(byte[] value) {
-                    this.value = value;
-                }
-
-                /**
-                 * Gets a map that contains attributes that aren't bound to 
any typed property on this class.
-                 * 
-                 * <p>
-                 * the map is keyed by the name of the attribute and 
-                 * the value is the string value of the attribute.
-                 * 
-                 * the map returned by this method is live, and you can add 
new attribute
-                 * by updating the map directly. Because of this design, 
there's no setter.
-                 * 
-                 * 
-                 * @return
-                 *     always non-null
-                 */
-                public Map<QName, String> getOtherAttributes() {
-                    return otherAttributes;
-                }
-
-            }
-
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;sequence>
-     *         &lt;element name="static" 
type="{urn:org:ebics:H004}UnsecuredRequestStaticHeaderType"/>
-     *         &lt;element name="mutable" 
type="{urn:org:ebics:H004}EmptyMutableHeaderType"/>
-     *       &lt;/sequence>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "_static",
-        "mutable"
-    })
-    public static class Header {
-
-        @XmlElement(name = "static", required = true)
-        protected UnsecuredRequestStaticHeaderType _static;
-        @XmlElement(required = true)
-        protected EmptyMutableHeaderType mutable;
-        @XmlAttribute(name = "authenticate", required = true)
-        protected boolean authenticate;
-
-        /**
-         * Gets the value of the static property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link UnsecuredRequestStaticHeaderType }
-         *     
-         */
-        public UnsecuredRequestStaticHeaderType getStatic() {
-            return _static;
-        }
-
-        /**
-         * Sets the value of the static property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link UnsecuredRequestStaticHeaderType }
-         *     
-         */
-        public void setStatic(UnsecuredRequestStaticHeaderType value) {
-            this._static = value;
-        }
-
-        /**
-         * Gets the value of the mutable property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link EmptyMutableHeaderType }
-         *     
-         */
-        public EmptyMutableHeaderType getMutable() {
-            return mutable;
-        }
-
-        /**
-         * Sets the value of the mutable property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link EmptyMutableHeaderType }
-         *     
-         */
-        public void setMutable(EmptyMutableHeaderType value) {
-            this.mutable = value;
-        }
-
-        /**
-         * Gets the value of the authenticate property.
-         * 
-         */
-        public boolean isAuthenticate() {
-            return authenticate;
-        }
-
-        /**
-         * Sets the value of the authenticate property.
-         * 
-         */
-        public void setAuthenticate(boolean value) {
-            this.authenticate = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/EbicsUnsignedRequest.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/EbicsUnsignedRequest.java
deleted file mode 100644
index 4d358fb..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/EbicsUnsignedRequest.java
+++ /dev/null
@@ -1,633 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="header">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;sequence>
- *                   &lt;element name="static" 
type="{urn:org:ebics:H004}UnsignedRequestStaticHeaderType"/>
- *                   &lt;element name="mutable" 
type="{urn:org:ebics:H004}EmptyMutableHeaderType"/>
- *                 &lt;/sequence>
- *                 &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="body">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;sequence>
- *                   &lt;element name="DataTransfer">
- *                     &lt;complexType>
- *                       &lt;complexContent>
- *                         &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                           &lt;sequence>
- *                             &lt;element name="SignatureData">
- *                               &lt;complexType>
- *                                 &lt;simpleContent>
- *                                   &lt;extension 
base="&lt;urn:org:ebics:H004>SignatureDataType">
- *                                     &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *                                   &lt;/extension>
- *                                 &lt;/simpleContent>
- *                               &lt;/complexType>
- *                             &lt;/element>
- *                             &lt;element name="OrderData">
- *                               &lt;complexType>
- *                                 &lt;simpleContent>
- *                                   &lt;extension 
base="&lt;urn:org:ebics:H004>OrderDataType">
- *                                     &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
- *                                   &lt;/extension>
- *                                 &lt;/simpleContent>
- *                               &lt;/complexType>
- *                             &lt;/element>
- *                           &lt;/sequence>
- *                         &lt;/restriction>
- *                       &lt;/complexContent>
- *                     &lt;/complexType>
- *                   &lt;/element>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *       &lt;attGroup ref="{urn:org:ebics:H004}VersionAttrGroup"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "header",
-    "body"
-})
-@XmlRootElement(name = "ebicsUnsignedRequest")
-public class EbicsUnsignedRequest {
-
-    @XmlElement(required = true)
-    protected EbicsUnsignedRequest.Header header;
-    @XmlElement(required = true)
-    protected EbicsUnsignedRequest.Body body;
-    @XmlAttribute(name = "Version", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String version;
-    @XmlAttribute(name = "Revision")
-    protected Integer revision;
-
-    /**
-     * Gets the value of the header property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EbicsUnsignedRequest.Header }
-     *     
-     */
-    public EbicsUnsignedRequest.Header getHeader() {
-        return header;
-    }
-
-    /**
-     * Sets the value of the header property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EbicsUnsignedRequest.Header }
-     *     
-     */
-    public void setHeader(EbicsUnsignedRequest.Header value) {
-        this.header = value;
-    }
-
-    /**
-     * Gets the value of the body property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EbicsUnsignedRequest.Body }
-     *     
-     */
-    public EbicsUnsignedRequest.Body getBody() {
-        return body;
-    }
-
-    /**
-     * Sets the value of the body property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EbicsUnsignedRequest.Body }
-     *     
-     */
-    public void setBody(EbicsUnsignedRequest.Body value) {
-        this.body = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVersion() {
-        return version;
-    }
-
-    /**
-     * Sets the value of the version property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVersion(String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the revision property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getRevision() {
-        return revision;
-    }
-
-    /**
-     * Sets the value of the revision property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setRevision(Integer value) {
-        this.revision = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;sequence>
-     *         &lt;element name="DataTransfer">
-     *           &lt;complexType>
-     *             &lt;complexContent>
-     *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *                 &lt;sequence>
-     *                   &lt;element name="SignatureData">
-     *                     &lt;complexType>
-     *                       &lt;simpleContent>
-     *                         &lt;extension 
base="&lt;urn:org:ebics:H004>SignatureDataType">
-     *                           &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *                         &lt;/extension>
-     *                       &lt;/simpleContent>
-     *                     &lt;/complexType>
-     *                   &lt;/element>
-     *                   &lt;element name="OrderData">
-     *                     &lt;complexType>
-     *                       &lt;simpleContent>
-     *                         &lt;extension 
base="&lt;urn:org:ebics:H004>OrderDataType">
-     *                           &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
-     *                         &lt;/extension>
-     *                       &lt;/simpleContent>
-     *                     &lt;/complexType>
-     *                   &lt;/element>
-     *                 &lt;/sequence>
-     *               &lt;/restriction>
-     *             &lt;/complexContent>
-     *           &lt;/complexType>
-     *         &lt;/element>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "dataTransfer"
-    })
-    public static class Body {
-
-        @XmlElement(name = "DataTransfer", required = true)
-        protected EbicsUnsignedRequest.Body.DataTransfer dataTransfer;
-
-        /**
-         * Gets the value of the dataTransfer property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link EbicsUnsignedRequest.Body.DataTransfer }
-         *     
-         */
-        public EbicsUnsignedRequest.Body.DataTransfer getDataTransfer() {
-            return dataTransfer;
-        }
-
-        /**
-         * Sets the value of the dataTransfer property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link EbicsUnsignedRequest.Body.DataTransfer }
-         *     
-         */
-        public void setDataTransfer(EbicsUnsignedRequest.Body.DataTransfer 
value) {
-            this.dataTransfer = value;
-        }
-
-
-        /**
-         * <p>Java class for anonymous complex type.
-         * 
-         * <p>The following schema fragment specifies the expected content 
contained within this class.
-         * 
-         * <pre>
-         * &lt;complexType>
-         *   &lt;complexContent>
-         *     &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
-         *       &lt;sequence>
-         *         &lt;element name="SignatureData">
-         *           &lt;complexType>
-         *             &lt;simpleContent>
-         *               &lt;extension 
base="&lt;urn:org:ebics:H004>SignatureDataType">
-         *                 &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-         *               &lt;/extension>
-         *             &lt;/simpleContent>
-         *           &lt;/complexType>
-         *         &lt;/element>
-         *         &lt;element name="OrderData">
-         *           &lt;complexType>
-         *             &lt;simpleContent>
-         *               &lt;extension 
base="&lt;urn:org:ebics:H004>OrderDataType">
-         *                 &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
-         *               &lt;/extension>
-         *             &lt;/simpleContent>
-         *           &lt;/complexType>
-         *         &lt;/element>
-         *       &lt;/sequence>
-         *     &lt;/restriction>
-         *   &lt;/complexContent>
-         * &lt;/complexType>
-         * </pre>
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "signatureData",
-            "orderData"
-        })
-        public static class DataTransfer {
-
-            @XmlElement(name = "SignatureData", required = true)
-            protected EbicsUnsignedRequest.Body.DataTransfer.SignatureData 
signatureData;
-            @XmlElement(name = "OrderData", required = true)
-            protected EbicsUnsignedRequest.Body.DataTransfer.OrderData 
orderData;
-
-            /**
-             * Gets the value of the signatureData property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link EbicsUnsignedRequest.Body.DataTransfer.SignatureData 
}
-             *     
-             */
-            public EbicsUnsignedRequest.Body.DataTransfer.SignatureData 
getSignatureData() {
-                return signatureData;
-            }
-
-            /**
-             * Sets the value of the signatureData property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link EbicsUnsignedRequest.Body.DataTransfer.SignatureData 
}
-             *     
-             */
-            public void 
setSignatureData(EbicsUnsignedRequest.Body.DataTransfer.SignatureData value) {
-                this.signatureData = value;
-            }
-
-            /**
-             * Gets the value of the orderData property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link EbicsUnsignedRequest.Body.DataTransfer.OrderData }
-             *     
-             */
-            public EbicsUnsignedRequest.Body.DataTransfer.OrderData 
getOrderData() {
-                return orderData;
-            }
-
-            /**
-             * Sets the value of the orderData property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link EbicsUnsignedRequest.Body.DataTransfer.OrderData }
-             *     
-             */
-            public void 
setOrderData(EbicsUnsignedRequest.Body.DataTransfer.OrderData value) {
-                this.orderData = value;
-            }
-
-
-            /**
-             * <p>Java class for anonymous complex type.
-             * 
-             * <p>The following schema fragment specifies the expected content 
contained within this class.
-             * 
-             * <pre>
-             * &lt;complexType>
-             *   &lt;simpleContent>
-             *     &lt;extension base="&lt;urn:org:ebics:H004>OrderDataType">
-             *       &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
-             *     &lt;/extension>
-             *   &lt;/simpleContent>
-             * &lt;/complexType>
-             * </pre>
-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "", propOrder = {
-                "value"
-            })
-            public static class OrderData {
-
-                @XmlValue
-                protected byte[] value;
-                @XmlAnyAttribute
-                private Map<QName, String> otherAttributes = new 
HashMap<QName, String>();
-
-                /**
-                 * Datentyp für binäre Auftragsdaten (komprimiert, 
verschlüsselt und kodiert).
-                 * 
-                 * @return
-                 *     possible object is
-                 *     byte[]
-                 */
-                public byte[] getValue() {
-                    return value;
-                }
-
-                /**
-                 * Sets the value of the value property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     byte[]
-                 */
-                public void setValue(byte[] value) {
-                    this.value = value;
-                }
-
-                /**
-                 * Gets a map that contains attributes that aren't bound to 
any typed property on this class.
-                 * 
-                 * <p>
-                 * the map is keyed by the name of the attribute and 
-                 * the value is the string value of the attribute.
-                 * 
-                 * the map returned by this method is live, and you can add 
new attribute
-                 * by updating the map directly. Because of this design, 
there's no setter.
-                 * 
-                 * 
-                 * @return
-                 *     always non-null
-                 */
-                public Map<QName, String> getOtherAttributes() {
-                    return otherAttributes;
-                }
-
-            }
-
-
-            /**
-             * <p>Java class for anonymous complex type.
-             * 
-             * <p>The following schema fragment specifies the expected content 
contained within this class.
-             * 
-             * <pre>
-             * &lt;complexType>
-             *   &lt;simpleContent>
-             *     &lt;extension 
base="&lt;urn:org:ebics:H004>SignatureDataType">
-             *       &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-             *     &lt;/extension>
-             *   &lt;/simpleContent>
-             * &lt;/complexType>
-             * </pre>
-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "", propOrder = {
-                "value"
-            })
-            public static class SignatureData {
-
-                @XmlValue
-                protected byte[] value;
-                @XmlAttribute(name = "authenticate", required = true)
-                protected boolean authenticate;
-
-                /**
-                 * Datentyp für binäre Signaturdaten (komprimiert, 
verschlüsselt und kodiert).
-                 * 
-                 * @return
-                 *     possible object is
-                 *     byte[]
-                 */
-                public byte[] getValue() {
-                    return value;
-                }
-
-                /**
-                 * Sets the value of the value property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     byte[]
-                 */
-                public void setValue(byte[] value) {
-                    this.value = value;
-                }
-
-                /**
-                 * Gets the value of the authenticate property.
-                 * 
-                 */
-                public boolean isAuthenticate() {
-                    return authenticate;
-                }
-
-                /**
-                 * Sets the value of the authenticate property.
-                 * 
-                 */
-                public void setAuthenticate(boolean value) {
-                    this.authenticate = value;
-                }
-
-            }
-
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;sequence>
-     *         &lt;element name="static" 
type="{urn:org:ebics:H004}UnsignedRequestStaticHeaderType"/>
-     *         &lt;element name="mutable" 
type="{urn:org:ebics:H004}EmptyMutableHeaderType"/>
-     *       &lt;/sequence>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "_static",
-        "mutable"
-    })
-    public static class Header {
-
-        @XmlElement(name = "static", required = true)
-        protected UnsignedRequestStaticHeaderType _static;
-        @XmlElement(required = true)
-        protected EmptyMutableHeaderType mutable;
-        @XmlAttribute(name = "authenticate", required = true)
-        protected boolean authenticate;
-
-        /**
-         * Gets the value of the static property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link UnsignedRequestStaticHeaderType }
-         *     
-         */
-        public UnsignedRequestStaticHeaderType getStatic() {
-            return _static;
-        }
-
-        /**
-         * Sets the value of the static property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link UnsignedRequestStaticHeaderType }
-         *     
-         */
-        public void setStatic(UnsignedRequestStaticHeaderType value) {
-            this._static = value;
-        }
-
-        /**
-         * Gets the value of the mutable property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link EmptyMutableHeaderType }
-         *     
-         */
-        public EmptyMutableHeaderType getMutable() {
-            return mutable;
-        }
-
-        /**
-         * Sets the value of the mutable property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link EmptyMutableHeaderType }
-         *     
-         */
-        public void setMutable(EmptyMutableHeaderType value) {
-            this.mutable = value;
-        }
-
-        /**
-         * Gets the value of the authenticate property.
-         * 
-         */
-        public boolean isAuthenticate() {
-            return authenticate;
-        }
-
-        /**
-         * Sets the value of the authenticate property.
-         * 
-         */
-        public void setAuthenticate(boolean value) {
-            this.authenticate = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/EmptyMutableHeaderType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/EmptyMutableHeaderType.java
deleted file mode 100644
index 3c9a893..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/EmptyMutableHeaderType.java
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für den leeren variablen EBICS-Header von Key Managemen Aufträgen.
- * 
- * <p>Java class for EmptyMutableHeaderType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="EmptyMutableHeaderType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EmptyMutableHeaderType", propOrder = {
-    "any"
-})
-public class EmptyMutableHeaderType {
-
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/EncryptionCertificateInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/EncryptionCertificateInfoType.java
deleted file mode 100644
index 2640127..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/EncryptionCertificateInfoType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Data type for encryption key.
- * 
- * <p>Java class for EncryptionCertificateInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="EncryptionCertificateInfoType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}CertificateInfoType">
- *       &lt;sequence>
- *         &lt;element name="EncryptionVersion" 
type="{urn:org:ebics:H004}EncryptionVersionType"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EncryptionCertificateInfoType", propOrder = {
-    "encryptionVersion"
-})
-public class EncryptionCertificateInfoType
-    extends CertificateInfoType
-{
-
-    @XmlElement(name = "EncryptionVersion", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String encryptionVersion;
-
-    /**
-     * Gets the value of the encryptionVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getEncryptionVersion() {
-        return encryptionVersion;
-    }
-
-    /**
-     * Sets the value of the encryptionVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setEncryptionVersion(String value) {
-        this.encryptionVersion = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/EncryptionPubKeyInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/EncryptionPubKeyInfoType.java
deleted file mode 100644
index e4aeb0d..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/EncryptionPubKeyInfoType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für öffentliche Verschlüsselungsschlüssel.
- * 
- * <p>Java class for EncryptionPubKeyInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="EncryptionPubKeyInfoType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}PubKeyInfoType">
- *       &lt;sequence>
- *         &lt;element name="EncryptionVersion" 
type="{urn:org:ebics:H004}EncryptionVersionType"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EncryptionPubKeyInfoType", propOrder = {
-    "encryptionVersion"
-})
-public class EncryptionPubKeyInfoType
-    extends PubKeyInfoTypeAtEbicsTypes
-{
-
-    @XmlElement(name = "EncryptionVersion", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String encryptionVersion;
-
-    /**
-     * Gets the value of the encryptionVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getEncryptionVersion() {
-        return encryptionVersion;
-    }
-
-    /**
-     * Sets the value of the encryptionVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setEncryptionVersion(String value) {
-        this.encryptionVersion = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/FDLOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/FDLOrderParamsType.java
deleted file mode 100644
index 1babb4e..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/FDLOrderParamsType.java
+++ /dev/null
@@ -1,232 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für Auftragsart FDL.
- * 
- * <p>Java class for FDLOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="FDLOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="DateRange" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;sequence>
- *                   &lt;element name="Start" 
type="{urn:org:ebics:H004}DateType"/>
- *                   &lt;element name="End" 
type="{urn:org:ebics:H004}DateType"/>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element ref="{urn:org:ebics:H004}Parameter" 
maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="FileFormat" 
type="{urn:org:ebics:H004}FileFormatType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FDLOrderParamsType", propOrder = {
-    "dateRange",
-    "parameter",
-    "fileFormat"
-})
-public class FDLOrderParamsType {
-
-    @XmlElement(name = "DateRange")
-    protected FDLOrderParamsType.DateRange dateRange;
-    @XmlElement(name = "Parameter")
-    protected List<Parameter> parameter;
-    @XmlElement(name = "FileFormat", required = true)
-    protected FileFormatType fileFormat;
-
-    /**
-     * Gets the value of the dateRange property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FDLOrderParamsType.DateRange }
-     *     
-     */
-    public FDLOrderParamsType.DateRange getDateRange() {
-        return dateRange;
-    }
-
-    /**
-     * Sets the value of the dateRange property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FDLOrderParamsType.DateRange }
-     *     
-     */
-    public void setDateRange(FDLOrderParamsType.DateRange value) {
-        this.dateRange = value;
-    }
-
-    /**
-     * Gets the value of the parameter property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the parameter 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getParameter().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Parameter }
-     * 
-     * 
-     */
-    public List<Parameter> getParameter() {
-        if (parameter == null) {
-            parameter = new ArrayList<Parameter>();
-        }
-        return this.parameter;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;sequence>
-     *         &lt;element name="Start" type="{urn:org:ebics:H004}DateType"/>
-     *         &lt;element name="End" type="{urn:org:ebics:H004}DateType"/>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "start",
-        "end"
-    })
-    public static class DateRange {
-
-        @XmlElement(name = "Start", required = true)
-        @XmlSchemaType(name = "date")
-        protected XMLGregorianCalendar start;
-        @XmlElement(name = "End", required = true)
-        @XmlSchemaType(name = "date")
-        protected XMLGregorianCalendar end;
-
-        /**
-         * Gets the value of the start property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public XMLGregorianCalendar getStart() {
-            return start;
-        }
-
-        /**
-         * Sets the value of the start property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public void setStart(XMLGregorianCalendar value) {
-            this.start = value;
-        }
-
-        /**
-         * Gets the value of the end property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public XMLGregorianCalendar getEnd() {
-            return end;
-        }
-
-        /**
-         * Sets the value of the end property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public void setEnd(XMLGregorianCalendar value) {
-            this.end = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/FULOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/FULOrderParamsType.java
deleted file mode 100644
index 3efc905..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/FULOrderParamsType.java
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für Auftragsart FUL.
- * 
- * <p>Java class for FULOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="FULOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{urn:org:ebics:H004}Parameter" 
maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="FileFormat" 
type="{urn:org:ebics:H004}FileFormatType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FULOrderParamsType", propOrder = {
-    "parameter",
-    "fileFormat"
-})
-public class FULOrderParamsType {
-
-    @XmlElement(name = "Parameter")
-    protected List<Parameter> parameter;
-    @XmlElement(name = "FileFormat", required = true)
-    protected FileFormatType fileFormat;
-
-    /**
-     * Gets the value of the parameter property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the parameter 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getParameter().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Parameter }
-     * 
-     * 
-     */
-    public List<Parameter> getParameter() {
-        if (parameter == null) {
-            parameter = new ArrayList<Parameter>();
-        }
-        return this.parameter;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/FileFormatType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/FileFormatType.java
deleted file mode 100644
index 845651b..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/FileFormatType.java
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für das Dateiformat.
- * 
- * <p>Java class for FileFormatType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="FileFormatType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>token">
- *       &lt;attribute name="CountryCode" 
type="{urn:org:ebics:H004}CountryCodeType" />
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FileFormatType", propOrder = {
-    "value"
-})
-public class FileFormatType {
-
-    @XmlValue
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String value;
-    @XmlAttribute(name = "CountryCode")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String countryCode;
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the countryCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCountryCode() {
-        return countryCode;
-    }
-
-    /**
-     * Sets the value of the countryCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCountryCode(String value) {
-        this.countryCode = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/GenericOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/GenericOrderParamsType.java
deleted file mode 100644
index 0c7be89..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/GenericOrderParamsType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für beliebige Auftragsarten.
- * 
- * <p>Java class for GenericOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="GenericOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{urn:org:ebics:H004}Parameter" 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GenericOrderParamsType", propOrder = {
-    "parameter"
-})
-public class GenericOrderParamsType {
-
-    @XmlElement(name = "Parameter")
-    protected List<Parameter> parameter;
-
-    /**
-     * Gets the value of the parameter property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the parameter 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getParameter().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Parameter }
-     * 
-     * 
-     */
-    public List<Parameter> getParameter() {
-        if (parameter == null) {
-            parameter = new ArrayList<Parameter>();
-        }
-        return this.parameter;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/H3KRequestOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/H3KRequestOrderDataType.java
deleted file mode 100644
index b7fb153..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/H3KRequestOrderDataType.java
+++ /dev/null
@@ -1,190 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Order type for order data H3K (request: initialise all three user's keys).
- * 
- * <p>Java class for H3KRequestOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="H3KRequestOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="SignatureCertificateInfo" 
type="{urn:org:ebics:H004}SignatureCertificateInfoType"/>
- *         &lt;element name="AuthenticationCertificateInfo" 
type="{urn:org:ebics:H004}AuthenticationCertificateInfoType"/>
- *         &lt;element name="EncryptionCertificateInfo" 
type="{urn:org:ebics:H004}EncryptionCertificateInfoType"/>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "H3KRequestOrderDataType", propOrder = {
-    "signatureCertificateInfo",
-    "authenticationCertificateInfo",
-    "encryptionCertificateInfo",
-    "partnerID",
-    "userID"
-})
-public class H3KRequestOrderDataType {
-
-    @XmlElement(name = "SignatureCertificateInfo", required = true)
-    protected SignatureCertificateInfoType signatureCertificateInfo;
-    @XmlElement(name = "AuthenticationCertificateInfo", required = true)
-    protected AuthenticationCertificateInfoType authenticationCertificateInfo;
-    @XmlElement(name = "EncryptionCertificateInfo", required = true)
-    protected EncryptionCertificateInfoType encryptionCertificateInfo;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-
-    /**
-     * Gets the value of the signatureCertificateInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignatureCertificateInfoType }
-     *     
-     */
-    public SignatureCertificateInfoType getSignatureCertificateInfo() {
-        return signatureCertificateInfo;
-    }
-
-    /**
-     * Sets the value of the signatureCertificateInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignatureCertificateInfoType }
-     *     
-     */
-    public void setSignatureCertificateInfo(SignatureCertificateInfoType 
value) {
-        this.signatureCertificateInfo = value;
-    }
-
-    /**
-     * Gets the value of the authenticationCertificateInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthenticationCertificateInfoType }
-     *     
-     */
-    public AuthenticationCertificateInfoType 
getAuthenticationCertificateInfo() {
-        return authenticationCertificateInfo;
-    }
-
-    /**
-     * Sets the value of the authenticationCertificateInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthenticationCertificateInfoType }
-     *     
-     */
-    public void 
setAuthenticationCertificateInfo(AuthenticationCertificateInfoType value) {
-        this.authenticationCertificateInfo = value;
-    }
-
-    /**
-     * Gets the value of the encryptionCertificateInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EncryptionCertificateInfoType }
-     *     
-     */
-    public EncryptionCertificateInfoType getEncryptionCertificateInfo() {
-        return encryptionCertificateInfo;
-    }
-
-    /**
-     * Sets the value of the encryptionCertificateInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EncryptionCertificateInfoType }
-     *     
-     */
-    public void setEncryptionCertificateInfo(EncryptionCertificateInfoType 
value) {
-        this.encryptionCertificateInfo = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HAAResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HAAResponseOrderDataType.java
deleted file mode 100644
index 25522bb..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HAAResponseOrderDataType.java
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HAA (Antwort: abrufbare 
Auftragsarten abholen).
- * 
- * <p>Java class for HAAResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HAAResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderTypes" 
type="{urn:org:ebics:H004}OrderTListType"/>
- *         &lt;any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HAAResponseOrderDataType", propOrder = {
-    "orderTypes",
-    "any"
-})
-public class HAAResponseOrderDataType {
-
-    @XmlList
-    @XmlElement(name = "OrderTypes", required = true)
-    protected List<String> orderTypes;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderTypes property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderTypes 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderTypes().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getOrderTypes() {
-        if (orderTypes == null) {
-            orderTypes = new ArrayList<String>();
-        }
-        return this.orderTypes;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HCARequestOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HCARequestOrderDataType.java
deleted file mode 100644
index d6fa57d..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HCARequestOrderDataType.java
+++ /dev/null
@@ -1,200 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HCA (Anfrage: Änderung der 
Teilnehmerschlüssel für Authentifikation und Verschlüsselung).
- * 
- * <p>Java class for HCARequestOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HCARequestOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="AuthenticationPubKeyInfo" 
type="{urn:org:ebics:H004}AuthenticationPubKeyInfoType"/>
- *         &lt;element name="EncryptionPubKeyInfo" 
type="{urn:org:ebics:H004}EncryptionPubKeyInfoType"/>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HCARequestOrderDataType", propOrder = {
-    "authenticationPubKeyInfo",
-    "encryptionPubKeyInfo",
-    "partnerID",
-    "userID",
-    "any"
-})
-public class HCARequestOrderDataType {
-
-    @XmlElement(name = "AuthenticationPubKeyInfo", required = true)
-    protected AuthenticationPubKeyInfoType authenticationPubKeyInfo;
-    @XmlElement(name = "EncryptionPubKeyInfo", required = true)
-    protected EncryptionPubKeyInfoType encryptionPubKeyInfo;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the authenticationPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public AuthenticationPubKeyInfoType getAuthenticationPubKeyInfo() {
-        return authenticationPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the authenticationPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public void setAuthenticationPubKeyInfo(AuthenticationPubKeyInfoType 
value) {
-        this.authenticationPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the encryptionPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public EncryptionPubKeyInfoType getEncryptionPubKeyInfo() {
-        return encryptionPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the encryptionPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public void setEncryptionPubKeyInfo(EncryptionPubKeyInfoType value) {
-        this.encryptionPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HCSRequestOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HCSRequestOrderDataType.java
deleted file mode 100644
index bbbcb15..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HCSRequestOrderDataType.java
+++ /dev/null
@@ -1,228 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HCS (Anfrage: Schlüsselwechsel 
aller Schlüssel).
- * 
- * <p>Java class for HCSRequestOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HCSRequestOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="AuthenticationPubKeyInfo" 
type="{urn:org:ebics:H004}AuthenticationPubKeyInfoType"/>
- *         &lt;element name="EncryptionPubKeyInfo" 
type="{urn:org:ebics:H004}EncryptionPubKeyInfoType"/>
- *         &lt;element ref="{http://www.ebics.org/S001}SignaturePubKeyInfo"/>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HCSRequestOrderDataType", propOrder = {
-    "authenticationPubKeyInfo",
-    "encryptionPubKeyInfo",
-    "signaturePubKeyInfo",
-    "partnerID",
-    "userID",
-    "any"
-})
-public class HCSRequestOrderDataType {
-
-    @XmlElement(name = "AuthenticationPubKeyInfo", required = true)
-    protected AuthenticationPubKeyInfoType authenticationPubKeyInfo;
-    @XmlElement(name = "EncryptionPubKeyInfo", required = true)
-    protected EncryptionPubKeyInfoType encryptionPubKeyInfo;
-    @XmlElement(name = "SignaturePubKeyInfo", namespace = 
"http://www.ebics.org/S001";, required = true)
-    protected SignaturePubKeyInfoType signaturePubKeyInfo;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the authenticationPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public AuthenticationPubKeyInfoType getAuthenticationPubKeyInfo() {
-        return authenticationPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the authenticationPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public void setAuthenticationPubKeyInfo(AuthenticationPubKeyInfoType 
value) {
-        this.authenticationPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the encryptionPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public EncryptionPubKeyInfoType getEncryptionPubKeyInfo() {
-        return encryptionPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the encryptionPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public void setEncryptionPubKeyInfo(EncryptionPubKeyInfoType value) {
-        this.encryptionPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the signaturePubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignaturePubKeyInfoType }
-     *     
-     */
-    public SignaturePubKeyInfoType getSignaturePubKeyInfo() {
-        return signaturePubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the signaturePubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignaturePubKeyInfoType }
-     *     
-     */
-    public void setSignaturePubKeyInfo(SignaturePubKeyInfoType value) {
-        this.signaturePubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HIARequestOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HIARequestOrderDataType.java
deleted file mode 100644
index c7adbae..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HIARequestOrderDataType.java
+++ /dev/null
@@ -1,200 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HIA (Anfrage: Initialisierung 
der Teilnehmerschlüssel für Authentifikation und Verschlüsselung).
- * 
- * <p>Java class for HIARequestOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HIARequestOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="AuthenticationPubKeyInfo" 
type="{urn:org:ebics:H004}AuthenticationPubKeyInfoType"/>
- *         &lt;element name="EncryptionPubKeyInfo" 
type="{urn:org:ebics:H004}EncryptionPubKeyInfoType"/>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HIARequestOrderDataType", propOrder = {
-    "authenticationPubKeyInfo",
-    "encryptionPubKeyInfo",
-    "partnerID",
-    "userID",
-    "any"
-})
-public class HIARequestOrderDataType {
-
-    @XmlElement(name = "AuthenticationPubKeyInfo", required = true)
-    protected AuthenticationPubKeyInfoType authenticationPubKeyInfo;
-    @XmlElement(name = "EncryptionPubKeyInfo", required = true)
-    protected EncryptionPubKeyInfoType encryptionPubKeyInfo;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the authenticationPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public AuthenticationPubKeyInfoType getAuthenticationPubKeyInfo() {
-        return authenticationPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the authenticationPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public void setAuthenticationPubKeyInfo(AuthenticationPubKeyInfoType 
value) {
-        this.authenticationPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the encryptionPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public EncryptionPubKeyInfoType getEncryptionPubKeyInfo() {
-        return encryptionPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the encryptionPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public void setEncryptionPubKeyInfo(EncryptionPubKeyInfoType value) {
-        this.encryptionPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HKDResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HKDResponseOrderDataType.java
deleted file mode 100644
index a577659..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HKDResponseOrderDataType.java
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Order data for order type HKD (response: receive customer based information 
on the customer and the customer's user.
- * 
- * <p>Java class for HKDResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HKDResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="PartnerInfo" 
type="{urn:org:ebics:H004}PartnerInfoType"/>
- *         &lt;element name="UserInfo" type="{urn:org:ebics:H004}UserInfoType" 
maxOccurs="unbounded"/>
- *         &lt;any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HKDResponseOrderDataType", propOrder = {
-    "partnerInfo",
-    "userInfo",
-    "any"
-})
-public class HKDResponseOrderDataType {
-
-    @XmlElement(name = "PartnerInfo", required = true)
-    protected PartnerInfoType partnerInfo;
-    @XmlElement(name = "UserInfo", required = true)
-    protected List<UserInfoType> userInfo;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PartnerInfoType }
-     *     
-     */
-    public PartnerInfoType getPartnerInfo() {
-        return partnerInfo;
-    }
-
-    /**
-     * Sets the value of the partnerInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PartnerInfoType }
-     *     
-     */
-    public void setPartnerInfo(PartnerInfoType value) {
-        this.partnerInfo = value;
-    }
-
-    /**
-     * Gets the value of the userInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the userInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getUserInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link UserInfoType }
-     * 
-     * 
-     */
-    public List<UserInfoType> getUserInfo() {
-        if (userInfo == null) {
-            userInfo = new ArrayList<UserInfoType>();
-        }
-        return this.userInfo;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HPBResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HPBResponseOrderDataType.java
deleted file mode 100644
index 109eed5..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HPBResponseOrderDataType.java
+++ /dev/null
@@ -1,169 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HPB (Antwort: Transfer der 
Bankschlüssel).
- * 
- * <p>Java class for HPBResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HPBResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="AuthenticationPubKeyInfo" 
type="{urn:org:ebics:H004}AuthenticationPubKeyInfoType"/>
- *         &lt;element name="EncryptionPubKeyInfo" 
type="{urn:org:ebics:H004}EncryptionPubKeyInfoType"/>
- *         &lt;element ref="{http://www.ebics.org/S001}SignaturePubKeyInfo"; 
maxOccurs="0" minOccurs="0"/>
- *         &lt;element name="HostID" type="{urn:org:ebics:H004}HostIDType"/>
- *         &lt;any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HPBResponseOrderDataType", propOrder = {
-    "authenticationPubKeyInfo",
-    "encryptionPubKeyInfo",
-    "hostID",
-    "any"
-})
-public class HPBResponseOrderDataType {
-
-    @XmlElement(name = "AuthenticationPubKeyInfo", required = true)
-    protected AuthenticationPubKeyInfoType authenticationPubKeyInfo;
-    @XmlElement(name = "EncryptionPubKeyInfo", required = true)
-    protected EncryptionPubKeyInfoType encryptionPubKeyInfo;
-    @XmlElement(name = "HostID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String hostID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the authenticationPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public AuthenticationPubKeyInfoType getAuthenticationPubKeyInfo() {
-        return authenticationPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the authenticationPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public void setAuthenticationPubKeyInfo(AuthenticationPubKeyInfoType 
value) {
-        this.authenticationPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the encryptionPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public EncryptionPubKeyInfoType getEncryptionPubKeyInfo() {
-        return encryptionPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the encryptionPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public void setEncryptionPubKeyInfo(EncryptionPubKeyInfoType value) {
-        this.encryptionPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the hostID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getHostID() {
-        return hostID;
-    }
-
-    /**
-     * Sets the value of the hostID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setHostID(String value) {
-        this.hostID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HPDAccessParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HPDAccessParamsType.java
deleted file mode 100644
index c2f2c01..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HPDAccessParamsType.java
+++ /dev/null
@@ -1,274 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.datatype.XMLGregorianCalendar;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für HPD-Zugangsparameter.
- * 
- * <p>Java class for HPDAccessParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HPDAccessParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="URL" maxOccurs="unbounded">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension 
base="&lt;http://www.w3.org/2001/XMLSchema>anyURI">
- *                 &lt;attribute name="valid_from" 
type="{urn:org:ebics:H004}TimestampType" />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="Institute">
- *           &lt;simpleType>
- *             &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}normalizedString";>
- *               &lt;maxLength value="80"/>
- *             &lt;/restriction>
- *           &lt;/simpleType>
- *         &lt;/element>
- *         &lt;element name="HostID" type="{urn:org:ebics:H004}HostIDType" 
minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HPDAccessParamsType", propOrder = {
-    "url",
-    "institute",
-    "hostID",
-    "any"
-})
-public class HPDAccessParamsType {
-
-    @XmlElement(name = "URL", required = true)
-    protected List<HPDAccessParamsType.URL> url;
-    @XmlElement(name = "Institute", required = true)
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    protected String institute;
-    @XmlElement(name = "HostID")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String hostID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the url property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the url property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getURL().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link HPDAccessParamsType.URL }
-     * 
-     * 
-     */
-    public List<HPDAccessParamsType.URL> getURL() {
-        if (url == null) {
-            url = new ArrayList<HPDAccessParamsType.URL>();
-        }
-        return this.url;
-    }
-
-    /**
-     * Gets the value of the institute property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getInstitute() {
-        return institute;
-    }
-
-    /**
-     * Sets the value of the institute property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setInstitute(String value) {
-        this.institute = value;
-    }
-
-    /**
-     * Gets the value of the hostID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getHostID() {
-        return hostID;
-    }
-
-    /**
-     * Sets the value of the hostID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setHostID(String value) {
-        this.hostID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>anyURI">
-     *       &lt;attribute name="valid_from" 
type="{urn:org:ebics:H004}TimestampType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class URL {
-
-        @XmlValue
-        @XmlSchemaType(name = "anyURI")
-        protected String value;
-        @XmlAttribute(name = "valid_from")
-        protected XMLGregorianCalendar validFrom;
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the validFrom property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public XMLGregorianCalendar getValidFrom() {
-            return validFrom;
-        }
-
-        /**
-         * Sets the value of the validFrom property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public void setValidFrom(XMLGregorianCalendar value) {
-            this.validFrom = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HPDProtocolParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HPDProtocolParamsType.java
deleted file mode 100644
index da19d2c..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HPDProtocolParamsType.java
+++ /dev/null
@@ -1,713 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for HPD's parameters regarding the EBICS protocol.
- * 
- * <p>Java class for HPDProtocolParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HPDProtocolParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="Version" 
type="{urn:org:ebics:H004}HPDVersionType"/>
- *         &lt;element name="Recovery" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
- *                 &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="PreValidation" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
- *                 &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="X509Data" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
- *                 &lt;attribute name="persistent" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
- *                 &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="ClientDataDownload" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
- *                 &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="DownloadableOrderData" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
- *                 &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HPDProtocolParamsType", propOrder = {
-    "version",
-    "recovery",
-    "preValidation",
-    "x509Data",
-    "clientDataDownload",
-    "downloadableOrderData",
-    "any"
-})
-public class HPDProtocolParamsType {
-
-    @XmlElement(name = "Version", required = true)
-    protected HPDVersionType version;
-    @XmlElement(name = "Recovery")
-    protected HPDProtocolParamsType.Recovery recovery;
-    @XmlElement(name = "PreValidation")
-    protected HPDProtocolParamsType.PreValidation preValidation;
-    @XmlElement(name = "X509Data")
-    protected HPDProtocolParamsType.X509Data x509Data;
-    @XmlElement(name = "ClientDataDownload")
-    protected HPDProtocolParamsType.ClientDataDownload clientDataDownload;
-    @XmlElement(name = "DownloadableOrderData")
-    protected HPDProtocolParamsType.DownloadableOrderData 
downloadableOrderData;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the version property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDVersionType }
-     *     
-     */
-    public HPDVersionType getVersion() {
-        return version;
-    }
-
-    /**
-     * Sets the value of the version property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDVersionType }
-     *     
-     */
-    public void setVersion(HPDVersionType value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the recovery property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDProtocolParamsType.Recovery }
-     *     
-     */
-    public HPDProtocolParamsType.Recovery getRecovery() {
-        return recovery;
-    }
-
-    /**
-     * Sets the value of the recovery property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDProtocolParamsType.Recovery }
-     *     
-     */
-    public void setRecovery(HPDProtocolParamsType.Recovery value) {
-        this.recovery = value;
-    }
-
-    /**
-     * Gets the value of the preValidation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDProtocolParamsType.PreValidation }
-     *     
-     */
-    public HPDProtocolParamsType.PreValidation getPreValidation() {
-        return preValidation;
-    }
-
-    /**
-     * Sets the value of the preValidation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDProtocolParamsType.PreValidation }
-     *     
-     */
-    public void setPreValidation(HPDProtocolParamsType.PreValidation value) {
-        this.preValidation = value;
-    }
-
-    /**
-     * Gets the value of the x509Data property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDProtocolParamsType.X509Data }
-     *     
-     */
-    public HPDProtocolParamsType.X509Data getX509Data() {
-        return x509Data;
-    }
-
-    /**
-     * Sets the value of the x509Data property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDProtocolParamsType.X509Data }
-     *     
-     */
-    public void setX509Data(HPDProtocolParamsType.X509Data value) {
-        this.x509Data = value;
-    }
-
-    /**
-     * Gets the value of the clientDataDownload property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDProtocolParamsType.ClientDataDownload }
-     *     
-     */
-    public HPDProtocolParamsType.ClientDataDownload getClientDataDownload() {
-        return clientDataDownload;
-    }
-
-    /**
-     * Sets the value of the clientDataDownload property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDProtocolParamsType.ClientDataDownload }
-     *     
-     */
-    public void setClientDataDownload(HPDProtocolParamsType.ClientDataDownload 
value) {
-        this.clientDataDownload = value;
-    }
-
-    /**
-     * Gets the value of the downloadableOrderData property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDProtocolParamsType.DownloadableOrderData }
-     *     
-     */
-    public HPDProtocolParamsType.DownloadableOrderData 
getDownloadableOrderData() {
-        return downloadableOrderData;
-    }
-
-    /**
-     * Sets the value of the downloadableOrderData property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDProtocolParamsType.DownloadableOrderData }
-     *     
-     */
-    public void 
setDownloadableOrderData(HPDProtocolParamsType.DownloadableOrderData value) {
-        this.downloadableOrderData = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
-     *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class ClientDataDownload {
-
-        @XmlAttribute(name = "supported")
-        protected Boolean supported;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Gets the value of the supported property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isSupported() {
-            if (supported == null) {
-                return true;
-            } else {
-                return supported;
-            }
-        }
-
-        /**
-         * Sets the value of the supported property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setSupported(Boolean value) {
-            this.supported = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
-     *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class DownloadableOrderData {
-
-        @XmlAttribute(name = "supported")
-        protected Boolean supported;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Gets the value of the supported property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isSupported() {
-            if (supported == null) {
-                return true;
-            } else {
-                return supported;
-            }
-        }
-
-        /**
-         * Sets the value of the supported property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setSupported(Boolean value) {
-            this.supported = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-
-    /**
-     * Optional support flag, default = true.
-     * 
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
-     *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class PreValidation {
-
-        @XmlAttribute(name = "supported")
-        protected Boolean supported;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Gets the value of the supported property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isSupported() {
-            if (supported == null) {
-                return true;
-            } else {
-                return supported;
-            }
-        }
-
-        /**
-         * Sets the value of the supported property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setSupported(Boolean value) {
-            this.supported = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
-     *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Recovery {
-
-        @XmlAttribute(name = "supported")
-        protected Boolean supported;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Gets the value of the supported property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isSupported() {
-            if (supported == null) {
-                return true;
-            } else {
-                return supported;
-            }
-        }
-
-        /**
-         * Sets the value of the supported property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setSupported(Boolean value) {
-            this.supported = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
-     *       &lt;attribute name="persistent" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-     *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class X509Data {
-
-        @XmlAttribute(name = "persistent")
-        protected Boolean persistent;
-        @XmlAttribute(name = "supported")
-        protected Boolean supported;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Gets the value of the persistent property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isPersistent() {
-            if (persistent == null) {
-                return false;
-            } else {
-                return persistent;
-            }
-        }
-
-        /**
-         * Sets the value of the persistent property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setPersistent(Boolean value) {
-            this.persistent = value;
-        }
-
-        /**
-         * Gets the value of the supported property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isSupported() {
-            if (supported == null) {
-                return true;
-            } else {
-                return supported;
-            }
-        }
-
-        /**
-         * Sets the value of the supported property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setSupported(Boolean value) {
-            this.supported = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HPDResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HPDResponseOrderDataType.java
deleted file mode 100644
index 9b4e66f..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HPDResponseOrderDataType.java
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HPD (Antwort: Bankparameter 
abholen).
- * 
- * <p>Java class for HPDResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HPDResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="AccessParams" 
type="{urn:org:ebics:H004}HPDAccessParamsType"/>
- *         &lt;element name="ProtocolParams" 
type="{urn:org:ebics:H004}HPDProtocolParamsType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HPDResponseOrderDataType", propOrder = {
-    "accessParams",
-    "protocolParams"
-})
-public class HPDResponseOrderDataType {
-
-    @XmlElement(name = "AccessParams", required = true)
-    protected HPDAccessParamsType accessParams;
-    @XmlElement(name = "ProtocolParams", required = true)
-    protected HPDProtocolParamsType protocolParams;
-
-    /**
-     * Gets the value of the accessParams property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDAccessParamsType }
-     *     
-     */
-    public HPDAccessParamsType getAccessParams() {
-        return accessParams;
-    }
-
-    /**
-     * Sets the value of the accessParams property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDAccessParamsType }
-     *     
-     */
-    public void setAccessParams(HPDAccessParamsType value) {
-        this.accessParams = value;
-    }
-
-    /**
-     * Gets the value of the protocolParams property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDProtocolParamsType }
-     *     
-     */
-    public HPDProtocolParamsType getProtocolParams() {
-        return protocolParams;
-    }
-
-    /**
-     * Sets the value of the protocolParams property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDProtocolParamsType }
-     *     
-     */
-    public void setProtocolParams(HPDProtocolParamsType value) {
-        this.protocolParams = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HPDVersionType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HPDVersionType.java
deleted file mode 100644
index ecd8166..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HPDVersionType.java
+++ /dev/null
@@ -1,234 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für HPD-Versionsinformationen.
- * 
- * <p>Java class for HPDVersionType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HPDVersionType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="Protocol">
- *           &lt;simpleType>
- *             &lt;list itemType="{urn:org:ebics:H004}ProtocolVersionType" />
- *           &lt;/simpleType>
- *         &lt;/element>
- *         &lt;element name="Authentication">
- *           &lt;simpleType>
- *             &lt;list 
itemType="{urn:org:ebics:H004}AuthenticationVersionType" />
- *           &lt;/simpleType>
- *         &lt;/element>
- *         &lt;element name="Encryption">
- *           &lt;simpleType>
- *             &lt;list itemType="{urn:org:ebics:H004}EncryptionVersionType" />
- *           &lt;/simpleType>
- *         &lt;/element>
- *         &lt;element name="Signature">
- *           &lt;simpleType>
- *             &lt;list 
itemType="{http://www.ebics.org/S001}SignatureVersionType"; />
- *           &lt;/simpleType>
- *         &lt;/element>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HPDVersionType", propOrder = {
-    "protocol",
-    "authentication",
-    "encryption",
-    "signature",
-    "any"
-})
-public class HPDVersionType {
-
-    @XmlList
-    @XmlElement(name = "Protocol", required = true)
-    protected List<String> protocol;
-    @XmlList
-    @XmlElement(name = "Authentication", required = true)
-    protected List<String> authentication;
-    @XmlList
-    @XmlElement(name = "Encryption", required = true)
-    protected List<String> encryption;
-    @XmlList
-    @XmlElement(name = "Signature", required = true)
-    protected List<String> signature;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the protocol property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the protocol 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getProtocol().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getProtocol() {
-        if (protocol == null) {
-            protocol = new ArrayList<String>();
-        }
-        return this.protocol;
-    }
-
-    /**
-     * Gets the value of the authentication property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
authentication property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAuthentication().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getAuthentication() {
-        if (authentication == null) {
-            authentication = new ArrayList<String>();
-        }
-        return this.authentication;
-    }
-
-    /**
-     * Gets the value of the encryption property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the encryption 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getEncryption().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getEncryption() {
-        if (encryption == null) {
-            encryption = new ArrayList<String>();
-        }
-        return this.encryption;
-    }
-
-    /**
-     * Gets the value of the signature property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the signature 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSignature().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getSignature() {
-        if (signature == null) {
-            signature = new ArrayList<String>();
-        }
-        return this.signature;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HSARequestOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HSARequestOrderDataType.java
deleted file mode 100644
index fb5af34..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HSARequestOrderDataType.java
+++ /dev/null
@@ -1,200 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HSA (Anfrage: Initialisierung 
der Teilnehmerschlüssel für Authentifikation und Verschlüsselung, bankfachlich 
signiert mit FTAM-Schlüssel).
- * 
- * <p>Java class for HSARequestOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HSARequestOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="AuthenticationPubKeyInfo" 
type="{urn:org:ebics:H004}AuthenticationPubKeyInfoType"/>
- *         &lt;element name="EncryptionPubKeyInfo" 
type="{urn:org:ebics:H004}EncryptionPubKeyInfoType"/>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HSARequestOrderDataType", propOrder = {
-    "authenticationPubKeyInfo",
-    "encryptionPubKeyInfo",
-    "partnerID",
-    "userID",
-    "any"
-})
-public class HSARequestOrderDataType {
-
-    @XmlElement(name = "AuthenticationPubKeyInfo", required = true)
-    protected AuthenticationPubKeyInfoType authenticationPubKeyInfo;
-    @XmlElement(name = "EncryptionPubKeyInfo", required = true)
-    protected EncryptionPubKeyInfoType encryptionPubKeyInfo;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the authenticationPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public AuthenticationPubKeyInfoType getAuthenticationPubKeyInfo() {
-        return authenticationPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the authenticationPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public void setAuthenticationPubKeyInfo(AuthenticationPubKeyInfoType 
value) {
-        this.authenticationPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the encryptionPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public EncryptionPubKeyInfoType getEncryptionPubKeyInfo() {
-        return encryptionPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the encryptionPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public void setEncryptionPubKeyInfo(EncryptionPubKeyInfoType value) {
-        this.encryptionPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HTDReponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HTDReponseOrderDataType.java
deleted file mode 100644
index 20f3eb9..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HTDReponseOrderDataType.java
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HTD (Antwort: Kunden- und 
Teilnehmerdaten des Teilnehmers abholen).
- * 
- * <p>Java class for HTDReponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HTDReponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="PartnerInfo" 
type="{urn:org:ebics:H004}PartnerInfoType"/>
- *         &lt;element name="UserInfo" 
type="{urn:org:ebics:H004}UserInfoType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HTDReponseOrderDataType", propOrder = {
-    "partnerInfo",
-    "userInfo",
-    "any"
-})
-public class HTDReponseOrderDataType {
-
-    @XmlElement(name = "PartnerInfo", required = true)
-    protected PartnerInfoType partnerInfo;
-    @XmlElement(name = "UserInfo", required = true)
-    protected UserInfoType userInfo;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PartnerInfoType }
-     *     
-     */
-    public PartnerInfoType getPartnerInfo() {
-        return partnerInfo;
-    }
-
-    /**
-     * Sets the value of the partnerInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PartnerInfoType }
-     *     
-     */
-    public void setPartnerInfo(PartnerInfoType value) {
-        this.partnerInfo = value;
-    }
-
-    /**
-     * Gets the value of the userInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link UserInfoType }
-     *     
-     */
-    public UserInfoType getUserInfo() {
-        return userInfo;
-    }
-
-    /**
-     * Sets the value of the userInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link UserInfoType }
-     *     
-     */
-    public void setUserInfo(UserInfoType value) {
-        this.userInfo = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVDOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVDOrderParamsType.java
deleted file mode 100644
index 2cb8478..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVDOrderParamsType.java
+++ /dev/null
@@ -1,199 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für Auftragsart HVD.
- * 
- * <p>Java class for HVDOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVDOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;group ref="{urn:org:ebics:H004}HVRequestStructure"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVDOrderParamsType", propOrder = {
-    "partnerID",
-    "orderType",
-    "fileFormat",
-    "orderID",
-    "any"
-})
-public class HVDOrderParamsType {
-
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "OrderID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the orderID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderID() {
-        return orderID;
-    }
-
-    /**
-     * Sets the value of the orderID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderID(String value) {
-        this.orderID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVDResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVDResponseOrderDataType.java
deleted file mode 100644
index 5923c8b..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVDResponseOrderDataType.java
+++ /dev/null
@@ -1,240 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HVD (Antwort: VEU-Status 
abrufen).
- * 
- * <p>Java class for HVDResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVDResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="DataDigest" 
type="{urn:org:ebics:H004}DataDigestType"/>
- *         &lt;element name="DisplayFile" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         &lt;element name="OrderDataAvailable" 
type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="OrderDataSize" 
type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *         &lt;element name="OrderDetailsAvailable" 
type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="BankSignature" 
type="{urn:org:ebics:H004}SignatureType" maxOccurs="0" minOccurs="0"/>
- *         &lt;element name="SignerInfo" 
type="{urn:org:ebics:H004}SignerInfoType" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVDResponseOrderDataType", propOrder = {
-    "dataDigest",
-    "displayFile",
-    "orderDataAvailable",
-    "orderDataSize",
-    "orderDetailsAvailable",
-    "signerInfo",
-    "any"
-})
-public class HVDResponseOrderDataType {
-
-    @XmlElement(name = "DataDigest", required = true)
-    protected DataDigestType dataDigest;
-    @XmlElement(name = "DisplayFile", required = true)
-    protected byte[] displayFile;
-    @XmlElement(name = "OrderDataAvailable")
-    protected boolean orderDataAvailable;
-    @XmlElement(name = "OrderDataSize", required = true)
-    @XmlSchemaType(name = "positiveInteger")
-    protected BigInteger orderDataSize;
-    @XmlElement(name = "OrderDetailsAvailable")
-    protected boolean orderDetailsAvailable;
-    @XmlElement(name = "SignerInfo")
-    protected List<SignerInfoType> signerInfo;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the dataDigest property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataDigestType }
-     *     
-     */
-    public DataDigestType getDataDigest() {
-        return dataDigest;
-    }
-
-    /**
-     * Sets the value of the dataDigest property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataDigestType }
-     *     
-     */
-    public void setDataDigest(DataDigestType value) {
-        this.dataDigest = value;
-    }
-
-    /**
-     * Gets the value of the displayFile property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getDisplayFile() {
-        return displayFile;
-    }
-
-    /**
-     * Sets the value of the displayFile property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setDisplayFile(byte[] value) {
-        this.displayFile = value;
-    }
-
-    /**
-     * Gets the value of the orderDataAvailable property.
-     * 
-     */
-    public boolean isOrderDataAvailable() {
-        return orderDataAvailable;
-    }
-
-    /**
-     * Sets the value of the orderDataAvailable property.
-     * 
-     */
-    public void setOrderDataAvailable(boolean value) {
-        this.orderDataAvailable = value;
-    }
-
-    /**
-     * Gets the value of the orderDataSize property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getOrderDataSize() {
-        return orderDataSize;
-    }
-
-    /**
-     * Sets the value of the orderDataSize property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setOrderDataSize(BigInteger value) {
-        this.orderDataSize = value;
-    }
-
-    /**
-     * Gets the value of the orderDetailsAvailable property.
-     * 
-     */
-    public boolean isOrderDetailsAvailable() {
-        return orderDetailsAvailable;
-    }
-
-    /**
-     * Sets the value of the orderDetailsAvailable property.
-     * 
-     */
-    public void setOrderDetailsAvailable(boolean value) {
-        this.orderDetailsAvailable = value;
-    }
-
-    /**
-     * Gets the value of the signerInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the signerInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSignerInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SignerInfoType }
-     * 
-     * 
-     */
-    public List<SignerInfoType> getSignerInfo() {
-        if (signerInfo == null) {
-            signerInfo = new ArrayList<SignerInfoType>();
-        }
-        return this.signerInfo;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVEOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVEOrderParamsType.java
deleted file mode 100644
index 4ce217f..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVEOrderParamsType.java
+++ /dev/null
@@ -1,199 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für Auftragsart HVE.
- * 
- * <p>Java class for HVEOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVEOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;group ref="{urn:org:ebics:H004}HVRequestStructure"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVEOrderParamsType", propOrder = {
-    "partnerID",
-    "orderType",
-    "fileFormat",
-    "orderID",
-    "any"
-})
-public class HVEOrderParamsType {
-
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "OrderID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the orderID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderID() {
-        return orderID;
-    }
-
-    /**
-     * Sets the value of the orderID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderID(String value) {
-        this.orderID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVSOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVSOrderParamsType.java
deleted file mode 100644
index 6c4594a..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVSOrderParamsType.java
+++ /dev/null
@@ -1,199 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für Auftragsart HVS.
- * 
- * <p>Java class for HVSOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVSOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;group ref="{urn:org:ebics:H004}HVRequestStructure"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVSOrderParamsType", propOrder = {
-    "partnerID",
-    "orderType",
-    "fileFormat",
-    "orderID",
-    "any"
-})
-public class HVSOrderParamsType {
-
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "OrderID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the orderID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderID() {
-        return orderID;
-    }
-
-    /**
-     * Sets the value of the orderID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderID(String value) {
-        this.orderID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVSRequestOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVSRequestOrderDataType.java
deleted file mode 100644
index fddefef..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVSRequestOrderDataType.java
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HVS (Anfrage: VEU-Storno).
- * 
- * <p>Java class for HVSRequestOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVSRequestOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="CancelledDataDigest" 
type="{urn:org:ebics:H004}DataDigestType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVSRequestOrderDataType", propOrder = {
-    "cancelledDataDigest",
-    "any"
-})
-public class HVSRequestOrderDataType {
-
-    @XmlElement(name = "CancelledDataDigest", required = true)
-    protected DataDigestType cancelledDataDigest;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the cancelledDataDigest property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataDigestType }
-     *     
-     */
-    public DataDigestType getCancelledDataDigest() {
-        return cancelledDataDigest;
-    }
-
-    /**
-     * Sets the value of the cancelledDataDigest property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataDigestType }
-     *     
-     */
-    public void setCancelledDataDigest(DataDigestType value) {
-        this.cancelledDataDigest = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVTAccountInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVTAccountInfoType.java
deleted file mode 100644
index c65023a..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVTAccountInfoType.java
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Data type for account information regarding order type HVT.
- * 
- * <p>Java class for HVTAccountInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVTAccountInfoType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}AttributedAccountType">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVTAccountInfoType")
-public class HVTAccountInfoType
-    extends AttributedAccountType
-{
-
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVTOrderFlagsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVTOrderFlagsType.java
deleted file mode 100644
index a85837f..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVTOrderFlagsType.java
+++ /dev/null
@@ -1,155 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.math.BigInteger;
-import java.util.HashMap;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-
-/**
- * Datentyp für HVT-Auftragsflags.
- * 
- * <p>Java class for HVTOrderFlagsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVTOrderFlagsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;attribute name="completeOrderData" use="required" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; />
- *       &lt;attribute name="fetchLimit" use="required">
- *         &lt;simpleType>
- *           &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger";>
- *             &lt;totalDigits value="10"/>
- *           &lt;/restriction>
- *         &lt;/simpleType>
- *       &lt;/attribute>
- *       &lt;attribute name="fetchOffset" use="required">
- *         &lt;simpleType>
- *           &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger";>
- *             &lt;totalDigits value="10"/>
- *           &lt;/restriction>
- *         &lt;/simpleType>
- *       &lt;/attribute>
- *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVTOrderFlagsType")
-@XmlSeeAlso({
-    tech.libeufin.messages.ebics.keyrequest.HVTOrderParamsType.OrderFlags.class
-})
-public class HVTOrderFlagsType {
-
-    @XmlAttribute(name = "completeOrderData", required = true)
-    protected boolean completeOrderData;
-    @XmlAttribute(name = "fetchLimit", required = true)
-    protected BigInteger fetchLimit;
-    @XmlAttribute(name = "fetchOffset", required = true)
-    protected BigInteger fetchOffset;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-    /**
-     * Gets the value of the completeOrderData property.
-     * 
-     */
-    public boolean isCompleteOrderData() {
-        return completeOrderData;
-    }
-
-    /**
-     * Sets the value of the completeOrderData property.
-     * 
-     */
-    public void setCompleteOrderData(boolean value) {
-        this.completeOrderData = value;
-    }
-
-    /**
-     * Gets the value of the fetchLimit property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getFetchLimit() {
-        return fetchLimit;
-    }
-
-    /**
-     * Sets the value of the fetchLimit property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setFetchLimit(BigInteger value) {
-        this.fetchLimit = value;
-    }
-
-    /**
-     * Gets the value of the fetchOffset property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getFetchOffset() {
-        return fetchOffset;
-    }
-
-    /**
-     * Sets the value of the fetchOffset property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setFetchOffset(BigInteger value) {
-        this.fetchOffset = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVTOrderInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVTOrderInfoType.java
deleted file mode 100644
index 95e70d5..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVTOrderInfoType.java
+++ /dev/null
@@ -1,520 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.datatype.XMLGregorianCalendar;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für HVT-Auftragsinformationen.
- * 
- * <p>Java class for HVTOrderInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVTOrderInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderFormat" 
type="{urn:org:ebics:H004}OrderFormatType" minOccurs="0"/>
- *         &lt;element name="AccountInfo" 
type="{urn:org:ebics:H004}HVTAccountInfoType" maxOccurs="3" minOccurs="2"/>
- *         &lt;element name="ExecutionDate" minOccurs="0">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension 
base="&lt;http://www.w3.org/2001/XMLSchema>date">
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="Amount">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension base="&lt;urn:org:ebics:H004>AmountValueType">
- *                 &lt;attribute name="isCredit" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; />
- *                 &lt;attribute name="Currency" 
type="{urn:org:ebics:H004}CurrencyBaseType" />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="Description" maxOccurs="4" minOccurs="0">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension 
base="&lt;http://www.w3.org/2001/XMLSchema>string">
- *                 &lt;attribute name="Type" use="required">
- *                   &lt;simpleType>
- *                     &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}token";>
- *                       &lt;enumeration value="Purpose"/>
- *                       &lt;enumeration value="Details"/>
- *                       &lt;enumeration value="Comment"/>
- *                     &lt;/restriction>
- *                   &lt;/simpleType>
- *                 &lt;/attribute>
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVTOrderInfoType", propOrder = {
-    "orderFormat",
-    "accountInfo",
-    "executionDate",
-    "amount",
-    "description",
-    "any"
-})
-public class HVTOrderInfoType {
-
-    @XmlElement(name = "OrderFormat")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderFormat;
-    @XmlElement(name = "AccountInfo", required = true)
-    protected List<HVTAccountInfoType> accountInfo;
-    @XmlElement(name = "ExecutionDate")
-    protected HVTOrderInfoType.ExecutionDate executionDate;
-    @XmlElement(name = "Amount", required = true)
-    protected HVTOrderInfoType.Amount amount;
-    @XmlElement(name = "Description")
-    protected List<HVTOrderInfoType.Description> description;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderFormat() {
-        return orderFormat;
-    }
-
-    /**
-     * Sets the value of the orderFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderFormat(String value) {
-        this.orderFormat = value;
-    }
-
-    /**
-     * Gets the value of the accountInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the accountInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAccountInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link HVTAccountInfoType }
-     * 
-     * 
-     */
-    public List<HVTAccountInfoType> getAccountInfo() {
-        if (accountInfo == null) {
-            accountInfo = new ArrayList<HVTAccountInfoType>();
-        }
-        return this.accountInfo;
-    }
-
-    /**
-     * Gets the value of the executionDate property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVTOrderInfoType.ExecutionDate }
-     *     
-     */
-    public HVTOrderInfoType.ExecutionDate getExecutionDate() {
-        return executionDate;
-    }
-
-    /**
-     * Sets the value of the executionDate property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVTOrderInfoType.ExecutionDate }
-     *     
-     */
-    public void setExecutionDate(HVTOrderInfoType.ExecutionDate value) {
-        this.executionDate = value;
-    }
-
-    /**
-     * Gets the value of the amount property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVTOrderInfoType.Amount }
-     *     
-     */
-    public HVTOrderInfoType.Amount getAmount() {
-        return amount;
-    }
-
-    /**
-     * Sets the value of the amount property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVTOrderInfoType.Amount }
-     *     
-     */
-    public void setAmount(HVTOrderInfoType.Amount value) {
-        this.amount = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the description 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getDescription().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link HVTOrderInfoType.Description }
-     * 
-     * 
-     */
-    public List<HVTOrderInfoType.Description> getDescription() {
-        if (description == null) {
-            description = new ArrayList<HVTOrderInfoType.Description>();
-        }
-        return this.description;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>AmountValueType">
-     *       &lt;attribute name="isCredit" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; />
-     *       &lt;attribute name="Currency" 
type="{urn:org:ebics:H004}CurrencyBaseType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Amount {
-
-        @XmlValue
-        protected BigDecimal value;
-        @XmlAttribute(name = "isCredit")
-        protected Boolean isCredit;
-        @XmlAttribute(name = "Currency")
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String currency;
-
-        /**
-         * Datentyp für einen Betragswert (ohne Währung).
-         * 
-         * @return
-         *     possible object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public BigDecimal getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public void setValue(BigDecimal value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the isCredit property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isIsCredit() {
-            return isCredit;
-        }
-
-        /**
-         * Sets the value of the isCredit property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setIsCredit(Boolean value) {
-            this.isCredit = value;
-        }
-
-        /**
-         * Gets the value of the currency property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getCurrency() {
-            return currency;
-        }
-
-        /**
-         * Sets the value of the currency property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setCurrency(String value) {
-            this.currency = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
-     *       &lt;attribute name="Type" use="required">
-     *         &lt;simpleType>
-     *           &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}token";>
-     *             &lt;enumeration value="Purpose"/>
-     *             &lt;enumeration value="Details"/>
-     *             &lt;enumeration value="Comment"/>
-     *           &lt;/restriction>
-     *         &lt;/simpleType>
-     *       &lt;/attribute>
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Description {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "Type", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String type;
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the type property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getType() {
-            return type;
-        }
-
-        /**
-         * Sets the value of the type property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setType(String value) {
-            this.type = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>date">
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class ExecutionDate {
-
-        @XmlValue
-        @XmlSchemaType(name = "date")
-        protected XMLGregorianCalendar value;
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public XMLGregorianCalendar getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public void setValue(XMLGregorianCalendar value) {
-            this.value = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVTOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVTOrderParamsType.java
deleted file mode 100644
index 66fa069..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVTOrderParamsType.java
+++ /dev/null
@@ -1,295 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for additional order parameters for order type HVT.
- * 
- * <p>Java class for HVTOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVTOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;group ref="{urn:org:ebics:H004}HVRequestStructure"/>
- *         &lt;element name="OrderFlags">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;extension base="{urn:org:ebics:H004}HVTOrderFlagsType">
- *                 &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *               &lt;/extension>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element ref="{urn:org:ebics:H004}Parameter" 
maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVTOrderParamsType", propOrder = {
-    "partnerID",
-    "orderType",
-    "fileFormat",
-    "orderID",
-    "orderFlags",
-    "parameter",
-    "any"
-})
-public class HVTOrderParamsType {
-
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "OrderID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderID;
-    @XmlElement(name = "OrderFlags", required = true)
-    protected HVTOrderParamsType.OrderFlags orderFlags;
-    @XmlElement(name = "Parameter")
-    protected List<Parameter> parameter;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the orderID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderID() {
-        return orderID;
-    }
-
-    /**
-     * Sets the value of the orderID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderID(String value) {
-        this.orderID = value;
-    }
-
-    /**
-     * Gets the value of the orderFlags property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVTOrderParamsType.OrderFlags }
-     *     
-     */
-    public HVTOrderParamsType.OrderFlags getOrderFlags() {
-        return orderFlags;
-    }
-
-    /**
-     * Sets the value of the orderFlags property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVTOrderParamsType.OrderFlags }
-     *     
-     */
-    public void setOrderFlags(HVTOrderParamsType.OrderFlags value) {
-        this.orderFlags = value;
-    }
-
-    /**
-     * Generic key-value parameters Gets the value of the parameter property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the parameter 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getParameter().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Parameter }
-     * 
-     * 
-     */
-    public List<Parameter> getParameter() {
-        if (parameter == null) {
-            parameter = new ArrayList<Parameter>();
-        }
-        return this.parameter;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:org:ebics:H004}HVTOrderFlagsType">
-     *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class OrderFlags
-        extends HVTOrderFlagsType
-    {
-
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVTResponseOrderData.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVTResponseOrderData.java
deleted file mode 100644
index a2312b3..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVTResponseOrderData.java
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}HVTResponseOrderDataType">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "")
-public class HVTResponseOrderData
-    extends HVTResponseOrderDataType
-{
-
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVTResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVTResponseOrderDataType.java
deleted file mode 100644
index 9f8fe73..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVTResponseOrderDataType.java
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Antwort mit Einzelauftraginfos für Auftragsart HVT (Antwort 
VEU-Transaktionsdetails abrufen mit completeOrderData="false").
- * 
- * <p>Java class for HVTResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVTResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="NumOrderInfos" 
type="{urn:org:ebics:H004}NumOrderInfosType"/>
- *         &lt;element name="OrderInfo" 
type="{urn:org:ebics:H004}HVTOrderInfoType" maxOccurs="unbounded"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVTResponseOrderDataType", propOrder = {
-    "numOrderInfos",
-    "orderInfo",
-    "any"
-})
-@XmlSeeAlso({
-    HVTResponseOrderData.class
-})
-public class HVTResponseOrderDataType {
-
-    @XmlElement(name = "NumOrderInfos", required = true)
-    @XmlSchemaType(name = "nonNegativeInteger")
-    protected BigInteger numOrderInfos;
-    @XmlElement(name = "OrderInfo", required = true)
-    protected List<HVTOrderInfoType> orderInfo;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the numOrderInfos property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getNumOrderInfos() {
-        return numOrderInfos;
-    }
-
-    /**
-     * Sets the value of the numOrderInfos property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setNumOrderInfos(BigInteger value) {
-        this.numOrderInfos = value;
-    }
-
-    /**
-     * Gets the value of the orderInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link HVTOrderInfoType }
-     * 
-     * 
-     */
-    public List<HVTOrderInfoType> getOrderInfo() {
-        if (orderInfo == null) {
-            orderInfo = new ArrayList<HVTOrderInfoType>();
-        }
-        return this.orderInfo;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVUOrderDetailsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVUOrderDetailsType.java
deleted file mode 100644
index 09d08a4..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVUOrderDetailsType.java
+++ /dev/null
@@ -1,291 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für HVU-Auftragsdetails.
- * 
- * <p>Java class for HVUOrderDetailsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVUOrderDetailsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderType" 
type="{urn:org:ebics:H004}OrderTBaseType"/>
- *         &lt;element name="FileFormat" 
type="{urn:org:ebics:H004}FileFormatType" minOccurs="0"/>
- *         &lt;element name="OrderID" type="{urn:org:ebics:H004}OrderIDType"/>
- *         &lt;element name="OrderDataSize" 
type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *         &lt;element name="SigningInfo" 
type="{urn:org:ebics:H004}HVUSigningInfoType"/>
- *         &lt;element name="SignerInfo" 
type="{urn:org:ebics:H004}SignerInfoType" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="OriginatorInfo" 
type="{urn:org:ebics:H004}HVUOriginatorInfoType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVUOrderDetailsType", propOrder = {
-    "orderType",
-    "fileFormat",
-    "orderID",
-    "orderDataSize",
-    "signingInfo",
-    "signerInfo",
-    "originatorInfo",
-    "any"
-})
-public class HVUOrderDetailsType {
-
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "OrderID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderID;
-    @XmlElement(name = "OrderDataSize", required = true)
-    @XmlSchemaType(name = "positiveInteger")
-    protected BigInteger orderDataSize;
-    @XmlElement(name = "SigningInfo", required = true)
-    protected HVUSigningInfoType signingInfo;
-    @XmlElement(name = "SignerInfo")
-    protected List<SignerInfoType> signerInfo;
-    @XmlElement(name = "OriginatorInfo", required = true)
-    protected HVUOriginatorInfoType originatorInfo;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the orderID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderID() {
-        return orderID;
-    }
-
-    /**
-     * Sets the value of the orderID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderID(String value) {
-        this.orderID = value;
-    }
-
-    /**
-     * Gets the value of the orderDataSize property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getOrderDataSize() {
-        return orderDataSize;
-    }
-
-    /**
-     * Sets the value of the orderDataSize property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setOrderDataSize(BigInteger value) {
-        this.orderDataSize = value;
-    }
-
-    /**
-     * Gets the value of the signingInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVUSigningInfoType }
-     *     
-     */
-    public HVUSigningInfoType getSigningInfo() {
-        return signingInfo;
-    }
-
-    /**
-     * Sets the value of the signingInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVUSigningInfoType }
-     *     
-     */
-    public void setSigningInfo(HVUSigningInfoType value) {
-        this.signingInfo = value;
-    }
-
-    /**
-     * Gets the value of the signerInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the signerInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSignerInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SignerInfoType }
-     * 
-     * 
-     */
-    public List<SignerInfoType> getSignerInfo() {
-        if (signerInfo == null) {
-            signerInfo = new ArrayList<SignerInfoType>();
-        }
-        return this.signerInfo;
-    }
-
-    /**
-     * Gets the value of the originatorInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVUOriginatorInfoType }
-     *     
-     */
-    public HVUOriginatorInfoType getOriginatorInfo() {
-        return originatorInfo;
-    }
-
-    /**
-     * Sets the value of the originatorInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVUOriginatorInfoType }
-     *     
-     */
-    public void setOriginatorInfo(HVUOriginatorInfoType value) {
-        this.originatorInfo = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVUOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVUOrderParamsType.java
deleted file mode 100644
index 5cca88a..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVUOrderParamsType.java
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für Auftragsart HVU.
- * 
- * <p>Java class for HVUOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVUOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderTypes" 
type="{urn:org:ebics:H004}OrderTListType" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVUOrderParamsType", propOrder = {
-    "orderTypes",
-    "any"
-})
-public class HVUOrderParamsType {
-
-    @XmlList
-    @XmlElement(name = "OrderTypes")
-    protected List<String> orderTypes;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderTypes property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderTypes 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderTypes().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getOrderTypes() {
-        if (orderTypes == null) {
-            orderTypes = new ArrayList<String>();
-        }
-        return this.orderTypes;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVUOriginatorInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVUOriginatorInfoType.java
deleted file mode 100644
index bdea099..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVUOriginatorInfoType.java
+++ /dev/null
@@ -1,203 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * Datentyp für Informationen zum Ersteller eines HVU-Auftrags.
- * 
- * <p>Java class for HVUOriginatorInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVUOriginatorInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;element name="Name" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;element name="Timestamp" 
type="{urn:org:ebics:H004}TimestampType"/>
- *         &lt;any namespace='urn:org:ebics:H004' maxOccurs="unbounded" 
minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVUOriginatorInfoType", propOrder = {
-    "partnerID",
-    "userID",
-    "name",
-    "timestamp",
-    "any"
-})
-public class HVUOriginatorInfoType {
-
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlElement(name = "Name")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String name;
-    @XmlElement(name = "Timestamp", required = true)
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar timestamp;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the timestamp property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getTimestamp() {
-        return timestamp;
-    }
-
-    /**
-     * Sets the value of the timestamp property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setTimestamp(XMLGregorianCalendar value) {
-        this.timestamp = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVUResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVUResponseOrderDataType.java
deleted file mode 100644
index a02818f..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVUResponseOrderDataType.java
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HVU (Antwort: VEU-Übersicht 
abholen).
- * 
- * <p>Java class for HVUResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVUResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderDetails" 
type="{urn:org:ebics:H004}HVUOrderDetailsType" maxOccurs="unbounded"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVUResponseOrderDataType", propOrder = {
-    "orderDetails",
-    "any"
-})
-public class HVUResponseOrderDataType {
-
-    @XmlElement(name = "OrderDetails", required = true)
-    protected List<HVUOrderDetailsType> orderDetails;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderDetails property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderDetails 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderDetails().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link HVUOrderDetailsType }
-     * 
-     * 
-     */
-    public List<HVUOrderDetailsType> getOrderDetails() {
-        if (orderDetails == null) {
-            orderDetails = new ArrayList<HVUOrderDetailsType>();
-        }
-        return this.orderDetails;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVUSigningInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVUSigningInfoType.java
deleted file mode 100644
index 171dabb..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVUSigningInfoType.java
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.math.BigInteger;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für Informationen zu den HVU-Unterschriftsmodalitäten.
- * 
- * <p>Java class for HVUSigningInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVUSigningInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;attribute name="readyToBeSigned" use="required" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; />
- *       &lt;attribute name="NumSigRequired" use="required" 
type="{http://www.w3.org/2001/XMLSchema}positiveInteger"; />
- *       &lt;attribute name="NumSigDone" use="required" 
type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVUSigningInfoType")
-public class HVUSigningInfoType {
-
-    @XmlAttribute(name = "readyToBeSigned", required = true)
-    protected boolean readyToBeSigned;
-    @XmlAttribute(name = "NumSigRequired", required = true)
-    @XmlSchemaType(name = "positiveInteger")
-    protected BigInteger numSigRequired;
-    @XmlAttribute(name = "NumSigDone", required = true)
-    @XmlSchemaType(name = "nonNegativeInteger")
-    protected BigInteger numSigDone;
-
-    /**
-     * Gets the value of the readyToBeSigned property.
-     * 
-     */
-    public boolean isReadyToBeSigned() {
-        return readyToBeSigned;
-    }
-
-    /**
-     * Sets the value of the readyToBeSigned property.
-     * 
-     */
-    public void setReadyToBeSigned(boolean value) {
-        this.readyToBeSigned = value;
-    }
-
-    /**
-     * Gets the value of the numSigRequired property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getNumSigRequired() {
-        return numSigRequired;
-    }
-
-    /**
-     * Sets the value of the numSigRequired property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setNumSigRequired(BigInteger value) {
-        this.numSigRequired = value;
-    }
-
-    /**
-     * Gets the value of the numSigDone property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getNumSigDone() {
-        return numSigDone;
-    }
-
-    /**
-     * Sets the value of the numSigDone property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setNumSigDone(BigInteger value) {
-        this.numSigDone = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVZOrderDetailsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVZOrderDetailsType.java
deleted file mode 100644
index f055352..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVZOrderDetailsType.java
+++ /dev/null
@@ -1,1190 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für HVZ-Auftragsdetails.
- * 
- * <p>Java class for HVZOrderDetailsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVZOrderDetailsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderType" 
type="{urn:org:ebics:H004}OrderTBaseType"/>
- *         &lt;element name="FileFormat" 
type="{urn:org:ebics:H004}FileFormatType" minOccurs="0"/>
- *         &lt;element name="OrderID" type="{urn:org:ebics:H004}OrderIDType"/>
- *         &lt;element name="DataDigest" 
type="{urn:org:ebics:H004}DataDigestType"/>
- *         &lt;element name="OrderDataAvailable" 
type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="OrderDataSize" 
type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *         &lt;element name="OrderDetailsAvailable" 
type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;group ref="{urn:org:ebics:H004}HVZPaymentOrderDetailsStructure" 
minOccurs="0"/>
- *         &lt;element name="SigningInfo" 
type="{urn:org:ebics:H004}HVUSigningInfoType"/>
- *         &lt;element name="SignerInfo" 
type="{urn:org:ebics:H004}SignerInfoType" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="OriginatorInfo" 
type="{urn:org:ebics:H004}HVUOriginatorInfoType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVZOrderDetailsType", propOrder = {
-    "orderType",
-    "fileFormat",
-    "orderID",
-    "dataDigest",
-    "orderDataAvailable",
-    "orderDataSize",
-    "orderDetailsAvailable",
-    "totalOrders",
-    "totalAmount",
-    "currency",
-    "firstOrderInfo",
-    "signingInfo",
-    "signerInfo",
-    "originatorInfo",
-    "any"
-})
-public class HVZOrderDetailsType {
-
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "OrderID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderID;
-    @XmlElement(name = "DataDigest", required = true)
-    protected DataDigestType dataDigest;
-    @XmlElement(name = "OrderDataAvailable")
-    protected boolean orderDataAvailable;
-    @XmlElement(name = "OrderDataSize", required = true)
-    @XmlSchemaType(name = "positiveInteger")
-    protected BigInteger orderDataSize;
-    @XmlElement(name = "OrderDetailsAvailable")
-    protected boolean orderDetailsAvailable;
-    @XmlElement(name = "TotalOrders")
-    @XmlSchemaType(name = "nonNegativeInteger")
-    protected BigInteger totalOrders;
-    @XmlElement(name = "TotalAmount")
-    protected HVZOrderDetailsType.TotalAmount totalAmount;
-    @XmlElement(name = "Currency")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String currency;
-    @XmlElement(name = "FirstOrderInfo")
-    protected HVZOrderDetailsType.FirstOrderInfo firstOrderInfo;
-    @XmlElement(name = "SigningInfo", required = true)
-    protected HVUSigningInfoType signingInfo;
-    @XmlElement(name = "SignerInfo")
-    protected List<SignerInfoType> signerInfo;
-    @XmlElement(name = "OriginatorInfo", required = true)
-    protected HVUOriginatorInfoType originatorInfo;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the orderID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderID() {
-        return orderID;
-    }
-
-    /**
-     * Sets the value of the orderID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderID(String value) {
-        this.orderID = value;
-    }
-
-    /**
-     * Gets the value of the dataDigest property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataDigestType }
-     *     
-     */
-    public DataDigestType getDataDigest() {
-        return dataDigest;
-    }
-
-    /**
-     * Sets the value of the dataDigest property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataDigestType }
-     *     
-     */
-    public void setDataDigest(DataDigestType value) {
-        this.dataDigest = value;
-    }
-
-    /**
-     * Gets the value of the orderDataAvailable property.
-     * 
-     */
-    public boolean isOrderDataAvailable() {
-        return orderDataAvailable;
-    }
-
-    /**
-     * Sets the value of the orderDataAvailable property.
-     * 
-     */
-    public void setOrderDataAvailable(boolean value) {
-        this.orderDataAvailable = value;
-    }
-
-    /**
-     * Gets the value of the orderDataSize property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getOrderDataSize() {
-        return orderDataSize;
-    }
-
-    /**
-     * Sets the value of the orderDataSize property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setOrderDataSize(BigInteger value) {
-        this.orderDataSize = value;
-    }
-
-    /**
-     * Gets the value of the orderDetailsAvailable property.
-     * 
-     */
-    public boolean isOrderDetailsAvailable() {
-        return orderDetailsAvailable;
-    }
-
-    /**
-     * Sets the value of the orderDetailsAvailable property.
-     * 
-     */
-    public void setOrderDetailsAvailable(boolean value) {
-        this.orderDetailsAvailable = value;
-    }
-
-    /**
-     * Gets the value of the totalOrders property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getTotalOrders() {
-        return totalOrders;
-    }
-
-    /**
-     * Sets the value of the totalOrders property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setTotalOrders(BigInteger value) {
-        this.totalOrders = value;
-    }
-
-    /**
-     * Gets the value of the totalAmount property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVZOrderDetailsType.TotalAmount }
-     *     
-     */
-    public HVZOrderDetailsType.TotalAmount getTotalAmount() {
-        return totalAmount;
-    }
-
-    /**
-     * Sets the value of the totalAmount property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVZOrderDetailsType.TotalAmount }
-     *     
-     */
-    public void setTotalAmount(HVZOrderDetailsType.TotalAmount value) {
-        this.totalAmount = value;
-    }
-
-    /**
-     * Gets the value of the currency property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCurrency() {
-        return currency;
-    }
-
-    /**
-     * Sets the value of the currency property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCurrency(String value) {
-        this.currency = value;
-    }
-
-    /**
-     * Gets the value of the firstOrderInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVZOrderDetailsType.FirstOrderInfo }
-     *     
-     */
-    public HVZOrderDetailsType.FirstOrderInfo getFirstOrderInfo() {
-        return firstOrderInfo;
-    }
-
-    /**
-     * Sets the value of the firstOrderInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVZOrderDetailsType.FirstOrderInfo }
-     *     
-     */
-    public void setFirstOrderInfo(HVZOrderDetailsType.FirstOrderInfo value) {
-        this.firstOrderInfo = value;
-    }
-
-    /**
-     * Gets the value of the signingInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVUSigningInfoType }
-     *     
-     */
-    public HVUSigningInfoType getSigningInfo() {
-        return signingInfo;
-    }
-
-    /**
-     * Sets the value of the signingInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVUSigningInfoType }
-     *     
-     */
-    public void setSigningInfo(HVUSigningInfoType value) {
-        this.signingInfo = value;
-    }
-
-    /**
-     * Gets the value of the signerInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the signerInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSignerInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SignerInfoType }
-     * 
-     * 
-     */
-    public List<SignerInfoType> getSignerInfo() {
-        if (signerInfo == null) {
-            signerInfo = new ArrayList<SignerInfoType>();
-        }
-        return this.signerInfo;
-    }
-
-    /**
-     * Gets the value of the originatorInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVUOriginatorInfoType }
-     *     
-     */
-    public HVUOriginatorInfoType getOriginatorInfo() {
-        return originatorInfo;
-    }
-
-    /**
-     * Sets the value of the originatorInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVUOriginatorInfoType }
-     *     
-     */
-    public void setOriginatorInfo(HVUOriginatorInfoType value) {
-        this.originatorInfo = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;sequence>
-     *         &lt;element name="OrderPartyInfo" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; minOccurs="0"/>
-     *         &lt;element name="AccountInfo" minOccurs="0">
-     *           &lt;complexType>
-     *             &lt;complexContent>
-     *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *                 &lt;sequence>
-     *                   &lt;choice maxOccurs="2">
-     *                     &lt;element name="AccountNumber">
-     *                       &lt;complexType>
-     *                         &lt;simpleContent>
-     *                           &lt;extension 
base="&lt;urn:org:ebics:H004>AccountNumberType">
-     *                             &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-     *                           &lt;/extension>
-     *                         &lt;/simpleContent>
-     *                       &lt;/complexType>
-     *                     &lt;/element>
-     *                     &lt;element name="NationalAccountNumber">
-     *                       &lt;complexType>
-     *                         &lt;simpleContent>
-     *                           &lt;extension 
base="&lt;urn:org:ebics:H004>NationalAccountNumberType">
-     *                             &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-     *                           &lt;/extension>
-     *                         &lt;/simpleContent>
-     *                       &lt;/complexType>
-     *                     &lt;/element>
-     *                   &lt;/choice>
-     *                   &lt;choice maxOccurs="2">
-     *                     &lt;element name="BankCode">
-     *                       &lt;complexType>
-     *                         &lt;simpleContent>
-     *                           &lt;extension 
base="&lt;urn:org:ebics:H004>BankCodeType">
-     *                             &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-     *                             &lt;attribute name="Prefix" 
type="{urn:org:ebics:H004}BankCodePrefixType" />
-     *                           &lt;/extension>
-     *                         &lt;/simpleContent>
-     *                       &lt;/complexType>
-     *                     &lt;/element>
-     *                     &lt;element name="NationalBankCode">
-     *                       &lt;complexType>
-     *                         &lt;simpleContent>
-     *                           &lt;extension 
base="&lt;urn:org:ebics:H004>NationalBankCodeType">
-     *                             &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-     *                           &lt;/extension>
-     *                         &lt;/simpleContent>
-     *                       &lt;/complexType>
-     *                     &lt;/element>
-     *                   &lt;/choice>
-     *                 &lt;/sequence>
-     *               &lt;/restriction>
-     *             &lt;/complexContent>
-     *           &lt;/complexType>
-     *         &lt;/element>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "orderPartyInfo",
-        "accountInfo"
-    })
-    public static class FirstOrderInfo {
-
-        @XmlElement(name = "OrderPartyInfo")
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        @XmlSchemaType(name = "normalizedString")
-        protected String orderPartyInfo;
-        @XmlElement(name = "AccountInfo")
-        protected HVZOrderDetailsType.FirstOrderInfo.AccountInfo accountInfo;
-
-        /**
-         * Gets the value of the orderPartyInfo property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getOrderPartyInfo() {
-            return orderPartyInfo;
-        }
-
-        /**
-         * Sets the value of the orderPartyInfo property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setOrderPartyInfo(String value) {
-            this.orderPartyInfo = value;
-        }
-
-        /**
-         * Gets the value of the accountInfo property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link HVZOrderDetailsType.FirstOrderInfo.AccountInfo }
-         *     
-         */
-        public HVZOrderDetailsType.FirstOrderInfo.AccountInfo getAccountInfo() 
{
-            return accountInfo;
-        }
-
-        /**
-         * Sets the value of the accountInfo property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link HVZOrderDetailsType.FirstOrderInfo.AccountInfo }
-         *     
-         */
-        public void 
setAccountInfo(HVZOrderDetailsType.FirstOrderInfo.AccountInfo value) {
-            this.accountInfo = value;
-        }
-
-
-        /**
-         * <p>Java class for anonymous complex type.
-         * 
-         * <p>The following schema fragment specifies the expected content 
contained within this class.
-         * 
-         * <pre>
-         * &lt;complexType>
-         *   &lt;complexContent>
-         *     &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
-         *       &lt;sequence>
-         *         &lt;choice maxOccurs="2">
-         *           &lt;element name="AccountNumber">
-         *             &lt;complexType>
-         *               &lt;simpleContent>
-         *                 &lt;extension 
base="&lt;urn:org:ebics:H004>AccountNumberType">
-         *                   &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-         *                 &lt;/extension>
-         *               &lt;/simpleContent>
-         *             &lt;/complexType>
-         *           &lt;/element>
-         *           &lt;element name="NationalAccountNumber">
-         *             &lt;complexType>
-         *               &lt;simpleContent>
-         *                 &lt;extension 
base="&lt;urn:org:ebics:H004>NationalAccountNumberType">
-         *                   &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-         *                 &lt;/extension>
-         *               &lt;/simpleContent>
-         *             &lt;/complexType>
-         *           &lt;/element>
-         *         &lt;/choice>
-         *         &lt;choice maxOccurs="2">
-         *           &lt;element name="BankCode">
-         *             &lt;complexType>
-         *               &lt;simpleContent>
-         *                 &lt;extension 
base="&lt;urn:org:ebics:H004>BankCodeType">
-         *                   &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-         *                   &lt;attribute name="Prefix" 
type="{urn:org:ebics:H004}BankCodePrefixType" />
-         *                 &lt;/extension>
-         *               &lt;/simpleContent>
-         *             &lt;/complexType>
-         *           &lt;/element>
-         *           &lt;element name="NationalBankCode">
-         *             &lt;complexType>
-         *               &lt;simpleContent>
-         *                 &lt;extension 
base="&lt;urn:org:ebics:H004>NationalBankCodeType">
-         *                   &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-         *                 &lt;/extension>
-         *               &lt;/simpleContent>
-         *             &lt;/complexType>
-         *           &lt;/element>
-         *         &lt;/choice>
-         *       &lt;/sequence>
-         *     &lt;/restriction>
-         *   &lt;/complexContent>
-         * &lt;/complexType>
-         * </pre>
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "accountNumberOrNationalAccountNumber",
-            "bankCodeOrNationalBankCode"
-        })
-        public static class AccountInfo {
-
-            @XmlElements({
-                @XmlElement(name = "AccountNumber", type = 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.AccountNumber.class),
-                @XmlElement(name = "NationalAccountNumber", type = 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalAccountNumber.class)
-            })
-            protected List<Object> accountNumberOrNationalAccountNumber;
-            @XmlElements({
-                @XmlElement(name = "BankCode", type = 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.BankCode.class),
-                @XmlElement(name = "NationalBankCode", type = 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalBankCode.class)
-            })
-            protected List<Object> bankCodeOrNationalBankCode;
-
-            /**
-             * Gets the value of the accountNumberOrNationalAccountNumber 
property.
-             * 
-             * <p>
-             * This accessor method returns a reference to the live list,
-             * not a snapshot. Therefore any modification you make to the
-             * returned list will be present inside the JAXB object.
-             * This is why there is not a <CODE>set</CODE> method for the 
accountNumberOrNationalAccountNumber property.
-             * 
-             * <p>
-             * For example, to add a new item, do as follows:
-             * <pre>
-             *    getAccountNumberOrNationalAccountNumber().add(newItem);
-             * </pre>
-             * 
-             * 
-             * <p>
-             * Objects of the following type(s) are allowed in the list
-             * {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.AccountNumber }
-             * {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalAccountNumber }
-             * 
-             * 
-             */
-            public List<Object> getAccountNumberOrNationalAccountNumber() {
-                if (accountNumberOrNationalAccountNumber == null) {
-                    accountNumberOrNationalAccountNumber = new 
ArrayList<Object>();
-                }
-                return this.accountNumberOrNationalAccountNumber;
-            }
-
-            /**
-             * Gets the value of the bankCodeOrNationalBankCode property.
-             * 
-             * <p>
-             * This accessor method returns a reference to the live list,
-             * not a snapshot. Therefore any modification you make to the
-             * returned list will be present inside the JAXB object.
-             * This is why there is not a <CODE>set</CODE> method for the 
bankCodeOrNationalBankCode property.
-             * 
-             * <p>
-             * For example, to add a new item, do as follows:
-             * <pre>
-             *    getBankCodeOrNationalBankCode().add(newItem);
-             * </pre>
-             * 
-             * 
-             * <p>
-             * Objects of the following type(s) are allowed in the list
-             * {@link HVZOrderDetailsType.FirstOrderInfo.AccountInfo.BankCode }
-             * {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalBankCode }
-             * 
-             * 
-             */
-            public List<Object> getBankCodeOrNationalBankCode() {
-                if (bankCodeOrNationalBankCode == null) {
-                    bankCodeOrNationalBankCode = new ArrayList<Object>();
-                }
-                return this.bankCodeOrNationalBankCode;
-            }
-
-
-            /**
-             * <p>Java class for anonymous complex type.
-             * 
-             * <p>The following schema fragment specifies the expected content 
contained within this class.
-             * 
-             * <pre>
-             * &lt;complexType>
-             *   &lt;simpleContent>
-             *     &lt;extension 
base="&lt;urn:org:ebics:H004>AccountNumberType">
-             *       &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-             *     &lt;/extension>
-             *   &lt;/simpleContent>
-             * &lt;/complexType>
-             * </pre>
-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "", propOrder = {
-                "value"
-            })
-            public static class AccountNumber {
-
-                @XmlValue
-                @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-                protected String value;
-                @XmlAttribute(name = "international")
-                protected Boolean international;
-
-                /**
-                 * Datentyp für eine Kontonummer (national/international).
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getValue() {
-                    return value;
-                }
-
-                /**
-                 * Sets the value of the value property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setValue(String value) {
-                    this.value = value;
-                }
-
-                /**
-                 * Gets the value of the international property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public boolean isInternational() {
-                    if (international == null) {
-                        return false;
-                    } else {
-                        return international;
-                    }
-                }
-
-                /**
-                 * Sets the value of the international property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public void setInternational(Boolean value) {
-                    this.international = value;
-                }
-
-            }
-
-
-            /**
-             * <p>Java class for anonymous complex type.
-             * 
-             * <p>The following schema fragment specifies the expected content 
contained within this class.
-             * 
-             * <pre>
-             * &lt;complexType>
-             *   &lt;simpleContent>
-             *     &lt;extension base="&lt;urn:org:ebics:H004>BankCodeType">
-             *       &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-             *       &lt;attribute name="Prefix" 
type="{urn:org:ebics:H004}BankCodePrefixType" />
-             *     &lt;/extension>
-             *   &lt;/simpleContent>
-             * &lt;/complexType>
-             * </pre>
-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "", propOrder = {
-                "value"
-            })
-            public static class BankCode {
-
-                @XmlValue
-                @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-                protected String value;
-                @XmlAttribute(name = "international")
-                protected Boolean international;
-                @XmlAttribute(name = "Prefix")
-                @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-                protected String prefix;
-
-                /**
-                 * Datentyp für eine Bankleitzahl (national/international).
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getValue() {
-                    return value;
-                }
-
-                /**
-                 * Sets the value of the value property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setValue(String value) {
-                    this.value = value;
-                }
-
-                /**
-                 * Gets the value of the international property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public boolean isInternational() {
-                    if (international == null) {
-                        return false;
-                    } else {
-                        return international;
-                    }
-                }
-
-                /**
-                 * Sets the value of the international property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public void setInternational(Boolean value) {
-                    this.international = value;
-                }
-
-                /**
-                 * Gets the value of the prefix property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getPrefix() {
-                    return prefix;
-                }
-
-                /**
-                 * Sets the value of the prefix property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setPrefix(String value) {
-                    this.prefix = value;
-                }
-
-            }
-
-
-            /**
-             * <p>Java class for anonymous complex type.
-             * 
-             * <p>The following schema fragment specifies the expected content 
contained within this class.
-             * 
-             * <pre>
-             * &lt;complexType>
-             *   &lt;simpleContent>
-             *     &lt;extension 
base="&lt;urn:org:ebics:H004>NationalAccountNumberType">
-             *       &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-             *     &lt;/extension>
-             *   &lt;/simpleContent>
-             * &lt;/complexType>
-             * </pre>
-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "", propOrder = {
-                "value"
-            })
-            public static class NationalAccountNumber {
-
-                @XmlValue
-                @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-                protected String value;
-                @XmlAttribute(name = "format", required = true)
-                @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-                @XmlSchemaType(name = "token")
-                protected String format;
-
-                /**
-                 * Datentyp für eine Kontonummer (freies Format).
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getValue() {
-                    return value;
-                }
-
-                /**
-                 * Sets the value of the value property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setValue(String value) {
-                    this.value = value;
-                }
-
-                /**
-                 * Gets the value of the format property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getFormat() {
-                    return format;
-                }
-
-                /**
-                 * Sets the value of the format property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setFormat(String value) {
-                    this.format = value;
-                }
-
-            }
-
-
-            /**
-             * <p>Java class for anonymous complex type.
-             * 
-             * <p>The following schema fragment specifies the expected content 
contained within this class.
-             * 
-             * <pre>
-             * &lt;complexType>
-             *   &lt;simpleContent>
-             *     &lt;extension 
base="&lt;urn:org:ebics:H004>NationalBankCodeType">
-             *       &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-             *     &lt;/extension>
-             *   &lt;/simpleContent>
-             * &lt;/complexType>
-             * </pre>
-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "", propOrder = {
-                "value"
-            })
-            public static class NationalBankCode {
-
-                @XmlValue
-                @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-                protected String value;
-                @XmlAttribute(name = "format", required = true)
-                @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-                @XmlSchemaType(name = "token")
-                protected String format;
-
-                /**
-                 * Datentyp für eine Bankleitzahl (freies Format).
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getValue() {
-                    return value;
-                }
-
-                /**
-                 * Sets the value of the value property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setValue(String value) {
-                    this.value = value;
-                }
-
-                /**
-                 * Gets the value of the format property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getFormat() {
-                    return format;
-                }
-
-                /**
-                 * Sets the value of the format property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setFormat(String value) {
-                    this.format = value;
-                }
-
-            }
-
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>AmountValueType">
-     *       &lt;attribute name="isCredit" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class TotalAmount {
-
-        @XmlValue
-        protected BigDecimal value;
-        @XmlAttribute(name = "isCredit")
-        protected Boolean isCredit;
-
-        /**
-         * Datentyp für einen Betragswert (ohne Währung).
-         * 
-         * @return
-         *     possible object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public BigDecimal getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public void setValue(BigDecimal value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the isCredit property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isIsCredit() {
-            return isCredit;
-        }
-
-        /**
-         * Sets the value of the isCredit property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setIsCredit(Boolean value) {
-            this.isCredit = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVZOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVZOrderParamsType.java
deleted file mode 100644
index aa30b29..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVZOrderParamsType.java
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für Auftragsart HVZ.
- * 
- * <p>Java class for HVZOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVZOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderTypes" 
type="{urn:org:ebics:H004}OrderTListType" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVZOrderParamsType", propOrder = {
-    "orderTypes",
-    "any"
-})
-public class HVZOrderParamsType {
-
-    @XmlList
-    @XmlElement(name = "OrderTypes")
-    protected List<String> orderTypes;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderTypes property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderTypes 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderTypes().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getOrderTypes() {
-        if (orderTypes == null) {
-            orderTypes = new ArrayList<String>();
-        }
-        return this.orderTypes;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVZResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVZResponseOrderDataType.java
deleted file mode 100644
index d95ba64..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/HVZResponseOrderDataType.java
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Order data for order type HVZ (response: receive summary of orders 
currently stored in the distributed signature processing unit with additional 
informations).
- * 
- * <p>Java class for HVZResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVZResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderDetails" 
type="{urn:org:ebics:H004}HVZOrderDetailsType" maxOccurs="unbounded"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVZResponseOrderDataType", propOrder = {
-    "orderDetails",
-    "any"
-})
-public class HVZResponseOrderDataType {
-
-    @XmlElement(name = "OrderDetails", required = true)
-    protected List<HVZOrderDetailsType> orderDetails;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderDetails property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderDetails 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderDetails().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link HVZOrderDetailsType }
-     * 
-     * 
-     */
-    public List<HVZOrderDetailsType> getOrderDetails() {
-        if (orderDetails == null) {
-            orderDetails = new ArrayList<HVZOrderDetailsType>();
-        }
-        return this.orderDetails;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/KeyInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/KeyInfoType.java
deleted file mode 100644
index 9ec05a0..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/KeyInfoType.java
+++ /dev/null
@@ -1,142 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for KeyInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="KeyInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;choice maxOccurs="unbounded">
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}KeyName"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}KeyValue"/>
- *         &lt;element 
ref="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethod"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}PGPData"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SPKIData"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}MgmtData"/>
- *         &lt;any processContents='lax' namespace='##other'/>
- *       &lt;/choice>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "KeyInfoType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class KeyInfoType {
-
-    @XmlElementRefs({
-        @XmlElementRef(name = "RetrievalMethod", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "MgmtData", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "KeyName", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "KeyValue", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "X509Data", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "SPKIData", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "PGPData", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false)
-    })
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link Element }
-     * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
-     * {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
-     * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
-     * {@link String }
-     * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/KeyValueType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/KeyValueType.java
deleted file mode 100644
index f12aa1f..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/KeyValueType.java
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for KeyValueType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="KeyValueType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;choice>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValue"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
- *         &lt;any processContents='lax' namespace='##other'/>
- *       &lt;/choice>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "KeyValueType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class KeyValueType {
-
-    @XmlElementRefs({
-        @XmlElementRef(name = "RSAKeyValue", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "DSAKeyValue", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false)
-    })
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
-     * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/ManifestType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/ManifestType.java
deleted file mode 100644
index c5547d0..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/ManifestType.java
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for ManifestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="ManifestType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Reference"; 
maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ManifestType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "reference"
-})
-public class ManifestType {
-
-    @XmlElement(name = "Reference", required = true)
-    protected List<ReferenceType> reference;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the reference property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the reference 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getReference().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ReferenceType }
-     * 
-     * 
-     */
-    public List<ReferenceType> getReference() {
-        if (reference == null) {
-            reference = new ArrayList<ReferenceType>();
-        }
-        return this.reference;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/NoPubKeyDigestsReqOrderDetailsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/NoPubKeyDigestsReqOrderDetailsType.java
deleted file mode 100644
index e7024ca..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/NoPubKeyDigestsReqOrderDetailsType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für OrderDetails im statischen EBICS-Header von 
ebicsNoPubKeyDigestsRequest.
- * 
- * <p>Java class for NoPubKeyDigestsReqOrderDetailsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="NoPubKeyDigestsReqOrderDetailsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{urn:org:ebics:H004}OrderDetailsType">
- *       &lt;sequence>
- *         &lt;element name="OrderType" 
type="{urn:org:ebics:H004}OrderTBaseType"/>
- *         &lt;element name="OrderAttribute" 
type="{urn:org:ebics:H004}OrderAttributeBaseType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "NoPubKeyDigestsReqOrderDetailsType")
-public class NoPubKeyDigestsReqOrderDetailsType
-    extends OrderDetailsType
-{
-
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/NoPubKeyDigestsRequestStaticHeaderType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/NoPubKeyDigestsRequestStaticHeaderType.java
deleted file mode 100644
index 51711cc..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/NoPubKeyDigestsRequestStaticHeaderType.java
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für den statischen EBICS-Header bei Aufträgen ohne Übertragung der 
Digests der Bankschlüssel (Auftrag HBP): keine Digests der öffentlichen 
Bankschlüssel, keine EU-Datei, keine Nutzdaten, OrderId optional!, Nonce, 
Timestamp, X001 Authentifizierung, Auftragsattribut DZHNN
- * 
- * <p>Java class for NoPubKeyDigestsRequestStaticHeaderType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="NoPubKeyDigestsRequestStaticHeaderType">
- *   &lt;complexContent>
- *     &lt;restriction base="{urn:org:ebics:H004}StaticHeaderBaseType">
- *       &lt;sequence>
- *         &lt;element name="HostID" type="{urn:org:ebics:H004}HostIDType"/>
- *         &lt;element name="Nonce" type="{urn:org:ebics:H004}NonceType"/>
- *         &lt;element name="Timestamp" 
type="{urn:org:ebics:H004}TimestampType"/>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;element name="SystemID" type="{urn:org:ebics:H004}UserIDType" 
minOccurs="0"/>
- *         &lt;element name="Product" 
type="{urn:org:ebics:H004}ProductElementType" minOccurs="0"/>
- *         &lt;element name="OrderDetails" 
type="{urn:org:ebics:H004}NoPubKeyDigestsReqOrderDetailsType"/>
- *         &lt;element name="SecurityMedium" 
type="{urn:org:ebics:H004}SecurityMediumType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "NoPubKeyDigestsRequestStaticHeaderType")
-public class NoPubKeyDigestsRequestStaticHeaderType
-    extends StaticHeaderBaseType
-{
-
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/ObjectFactory.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/ObjectFactory.java
deleted file mode 100644
index d29569f..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/ObjectFactory.java
+++ /dev/null
@@ -1,1999 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.math.BigInteger;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the tech.libeufin.messages.ebics.keyrequest package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _HVTResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HVTResponseOrderData");
-    private final static QName _KeyInfo_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "KeyInfo");
-    private final static QName _HPBResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HPBResponseOrderData");
-    private final static QName _GenericOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "GenericOrderParams");
-    private final static QName _HSARequestOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HSARequestOrderData");
-    private final static QName _ebicsSignatureDataAtEbicsOrders_QNAME = new 
QName("urn:org:ebics:H004", "EBICSSignatureData");
-    private final static QName _HVDResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HVDResponseOrderData");
-    private final static QName _HCARequestOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HCARequestOrderData");
-    private final static QName _SignatureProperty_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "SignatureProperty");
-    private final static QName _HVEOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "HVEOrderParams");
-    private final static QName _EBICSOrderData_QNAME = new 
QName("urn:org:ebics:H004", "EBICSOrderData");
-    private final static QName _RSAKeyValue_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "RSAKeyValue");
-    private final static QName _HCSRequestOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HCSRequestOrderData");
-    private final static QName _HVSOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "HVSOrderParams");
-    private final static QName _SignatureMethod_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "SignatureMethod");
-    private final static QName _Object_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "Object");
-    private final static QName _BankSignatureData_QNAME = new 
QName("urn:org:ebics:H004", "BankSignatureData");
-    private final static QName _FDLOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "FDLOrderParams");
-    private final static QName _PGPData_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "PGPData");
-    private final static QName _RetrievalMethod_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "RetrievalMethod");
-    private final static QName _SignaturePubKeyOrderData_QNAME = new 
QName("http://www.ebics.org/S001";, "SignaturePubKeyOrderData");
-    private final static QName _DSAKeyValue_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "DSAKeyValue");
-    private final static QName _HVSRequestOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HVSRequestOrderData");
-    private final static QName _OrderSignatureData_QNAME = new 
QName("http://www.ebics.org/S001";, "OrderSignatureData");
-    private final static QName _H3KRequestOrderData_QNAME = new 
QName("urn:org:ebics:H004", "H3KRequestOrderData");
-    private final static QName _HTDResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HTDResponseOrderData");
-    private final static QName _SPKIData_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "SPKIData");
-    private final static QName _HIARequestOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HIARequestOrderData");
-    private final static QName _HVZResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HVZResponseOrderData");
-    private final static QName _SignatureValue_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "SignatureValue");
-    private final static QName _UserSignatureData_QNAME = new 
QName("http://www.ebics.org/S001";, "UserSignatureData");
-    private final static QName _OrderParams_QNAME = new 
QName("urn:org:ebics:H004", "OrderParams");
-    private final static QName _KeyValue_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "KeyValue");
-    private final static QName _Transforms_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "Transforms");
-    private final static QName _HVUResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HVUResponseOrderData");
-    private final static QName _SignaturePubKeyInfo_QNAME = new 
QName("http://www.ebics.org/S001";, "SignaturePubKeyInfo");
-    private final static QName _HVUOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "HVUOrderParams");
-    private final static QName _DigestMethod_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "DigestMethod");
-    private final static QName _X509Data_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "X509Data");
-    private final static QName _AuthSignature_QNAME = new 
QName("urn:org:ebics:H004", "AuthSignature");
-    private final static QName _KeyName_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "KeyName");
-    private final static QName _Signature_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "Signature");
-    private final static QName _MgmtData_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "MgmtData");
-    private final static QName _HAAResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HAAResponseOrderData");
-    private final static QName _HVZOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "HVZOrderParams");
-    private final static QName _SignatureProperties_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "SignatureProperties");
-    private final static QName _HPDResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HPDResponseOrderData");
-    private final static QName _FULOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "FULOrderParams");
-    private final static QName _Transform_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "Transform");
-    private final static QName _HKDResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HKDResponseOrderData");
-    private final static QName _HVDOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "HVDOrderParams");
-    private final static QName _StandardOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "StandardOrderParams");
-    private final static QName _Reference_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "Reference");
-    private final static QName _DigestValue_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "DigestValue");
-    private final static QName _HVTOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "HVTOrderParams");
-    private final static QName _CanonicalizationMethod_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "CanonicalizationMethod");
-    private final static QName _SignedInfo_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "SignedInfo");
-    private final static QName _ebicsSignatureDataAtEbicsSignatures_QNAME = 
new QName("http://www.ebics.org/S001";, "EBICSSignatureData");
-    private final static QName _Manifest_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "Manifest");
-    private final static QName _X509DataTypeX509IssuerSerial_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "X509IssuerSerial");
-    private final static QName _X509DataTypeX509CRL_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "X509CRL");
-    private final static QName _X509DataTypeX509SubjectName_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "X509SubjectName");
-    private final static QName _X509DataTypeX509SKI_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "X509SKI");
-    private final static QName _X509DataTypeX509Certificate_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "X509Certificate");
-    private final static QName _SPKIDataTypeSPKISexp_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "SPKISexp");
-    private final static QName _PGPDataTypePGPKeyID_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "PGPKeyID");
-    private final static QName _PGPDataTypePGPKeyPacket_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "PGPKeyPacket");
-    private final static QName _StaticHeaderBaseTypeProduct_QNAME = new 
QName("urn:org:ebics:H004", "Product");
-    private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = 
new QName("http://www.w3.org/2000/09/xmldsig#";, "HMACOutputLength");
-    private final static QName _TransformTypeXPath_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "XPath");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of 
schema derived classes for package: tech.libeufin.messages.ebics.keyrequest
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link EbicsUnsecuredRequest }
-     * 
-     */
-    public EbicsUnsecuredRequest createEbicsUnsecuredRequest() {
-        return new EbicsUnsecuredRequest();
-    }
-
-    /**
-     * Create an instance of {@link EbicsUnsignedRequest }
-     * 
-     */
-    public EbicsUnsignedRequest createEbicsUnsignedRequest() {
-        return new EbicsUnsignedRequest();
-    }
-
-    /**
-     * Create an instance of {@link EbicsNoPubKeyDigestsRequest }
-     * 
-     */
-    public EbicsNoPubKeyDigestsRequest createEbicsNoPubKeyDigestsRequest() {
-        return new EbicsNoPubKeyDigestsRequest();
-    }
-
-    /**
-     * Create an instance of {@link Parameter }
-     * 
-     */
-    public Parameter createParameter() {
-        return new Parameter();
-    }
-
-    /**
-     * Create an instance of {@link UserSignatureDataSigBookType }
-     * 
-     */
-    public UserSignatureDataSigBookType createUserSignatureDataSigBookType() {
-        return new UserSignatureDataSigBookType();
-    }
-
-    /**
-     * Create an instance of {@link AccountType }
-     * 
-     */
-    public AccountType createAccountType() {
-        return new AccountType();
-    }
-
-    /**
-     * Create an instance of {@link DataTransferResponseType }
-     * 
-     */
-    public DataTransferResponseType createDataTransferResponseType() {
-        return new DataTransferResponseType();
-    }
-
-    /**
-     * Create an instance of {@link DataEncryptionInfoType }
-     * 
-     */
-    public DataEncryptionInfoType createDataEncryptionInfoType() {
-        return new DataEncryptionInfoType();
-    }
-
-    /**
-     * Create an instance of {@link AttributedAccountType }
-     * 
-     */
-    public AttributedAccountType createAttributedAccountType() {
-        return new AttributedAccountType();
-    }
-
-    /**
-     * Create an instance of {@link UserInfoType }
-     * 
-     */
-    public UserInfoType createUserInfoType() {
-        return new UserInfoType();
-    }
-
-    /**
-     * Create an instance of {@link HPDAccessParamsType }
-     * 
-     */
-    public HPDAccessParamsType createHPDAccessParamsType() {
-        return new HPDAccessParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HVZOrderDetailsType }
-     * 
-     */
-    public HVZOrderDetailsType createHVZOrderDetailsType() {
-        return new HVZOrderDetailsType();
-    }
-
-    /**
-     * Create an instance of {@link HVZOrderDetailsType.FirstOrderInfo }
-     * 
-     */
-    public HVZOrderDetailsType.FirstOrderInfo 
createHVZOrderDetailsTypeFirstOrderInfo() {
-        return new HVZOrderDetailsType.FirstOrderInfo();
-    }
-
-    /**
-     * Create an instance of {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo }
-     * 
-     */
-    public HVZOrderDetailsType.FirstOrderInfo.AccountInfo 
createHVZOrderDetailsTypeFirstOrderInfoAccountInfo() {
-        return new HVZOrderDetailsType.FirstOrderInfo.AccountInfo();
-    }
-
-    /**
-     * Create an instance of {@link PartnerInfoType }
-     * 
-     */
-    public PartnerInfoType createPartnerInfoType() {
-        return new PartnerInfoType();
-    }
-
-    /**
-     * Create an instance of {@link HVTOrderInfoType }
-     * 
-     */
-    public HVTOrderInfoType createHVTOrderInfoType() {
-        return new HVTOrderInfoType();
-    }
-
-    /**
-     * Create an instance of {@link DataTransferRequestType }
-     * 
-     */
-    public DataTransferRequestType createDataTransferRequestType() {
-        return new DataTransferRequestType();
-    }
-
-    /**
-     * Create an instance of {@link SignerInfoType }
-     * 
-     */
-    public SignerInfoType createSignerInfoType() {
-        return new SignerInfoType();
-    }
-
-    /**
-     * Create an instance of {@link HPDProtocolParamsType }
-     * 
-     */
-    public HPDProtocolParamsType createHPDProtocolParamsType() {
-        return new HPDProtocolParamsType();
-    }
-
-    /**
-     * Create an instance of {@link BankSignatureDataSigBookType }
-     * 
-     */
-    public BankSignatureDataSigBookType createBankSignatureDataSigBookType() {
-        return new BankSignatureDataSigBookType();
-    }
-
-    /**
-     * Create an instance of {@link StandardOrderParamsType }
-     * 
-     */
-    public StandardOrderParamsType createStandardOrderParamsType() {
-        return new StandardOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link FDLOrderParamsType }
-     * 
-     */
-    public FDLOrderParamsType createFDLOrderParamsType() {
-        return new FDLOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link EbicsUnsignedRequest.Body }
-     * 
-     */
-    public EbicsUnsignedRequest.Body createEbicsUnsignedRequestBody() {
-        return new EbicsUnsignedRequest.Body();
-    }
-
-    /**
-     * Create an instance of {@link EbicsUnsignedRequest.Body.DataTransfer }
-     * 
-     */
-    public EbicsUnsignedRequest.Body.DataTransfer 
createEbicsUnsignedRequestBodyDataTransfer() {
-        return new EbicsUnsignedRequest.Body.DataTransfer();
-    }
-
-    /**
-     * Create an instance of {@link HVTOrderParamsType }
-     * 
-     */
-    public HVTOrderParamsType createHVTOrderParamsType() {
-        return new HVTOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link EbicsUnsecuredRequest.Body }
-     * 
-     */
-    public EbicsUnsecuredRequest.Body createEbicsUnsecuredRequestBody() {
-        return new EbicsUnsecuredRequest.Body();
-    }
-
-    /**
-     * Create an instance of {@link EbicsUnsecuredRequest.Body.DataTransfer }
-     * 
-     */
-    public EbicsUnsecuredRequest.Body.DataTransfer 
createEbicsUnsecuredRequestBodyDataTransfer() {
-        return new EbicsUnsecuredRequest.Body.DataTransfer();
-    }
-
-    /**
-     * Create an instance of {@link HVZOrderParamsType }
-     * 
-     */
-    public HVZOrderParamsType createHVZOrderParamsType() {
-        return new HVZOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HAAResponseOrderDataType }
-     * 
-     */
-    public HAAResponseOrderDataType createHAAResponseOrderDataType() {
-        return new HAAResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HVSOrderParamsType }
-     * 
-     */
-    public HVSOrderParamsType createHVSOrderParamsType() {
-        return new HVSOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HPDResponseOrderDataType }
-     * 
-     */
-    public HPDResponseOrderDataType createHPDResponseOrderDataType() {
-        return new HPDResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link FULOrderParamsType }
-     * 
-     */
-    public FULOrderParamsType createFULOrderParamsType() {
-        return new FULOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link SignatureType }
-     * 
-     */
-    public SignatureType createSignatureType() {
-        return new SignatureType();
-    }
-
-    /**
-     * Create an instance of {@link HVEOrderParamsType }
-     * 
-     */
-    public HVEOrderParamsType createHVEOrderParamsType() {
-        return new HVEOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link EbicsUnsecuredRequest.Header }
-     * 
-     */
-    public EbicsUnsecuredRequest.Header createEbicsUnsecuredRequestHeader() {
-        return new EbicsUnsecuredRequest.Header();
-    }
-
-    /**
-     * Create an instance of {@link HCSRequestOrderDataType }
-     * 
-     */
-    public HCSRequestOrderDataType createHCSRequestOrderDataType() {
-        return new HCSRequestOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HVSRequestOrderDataType }
-     * 
-     */
-    public HVSRequestOrderDataType createHVSRequestOrderDataType() {
-        return new HVSRequestOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link EbicsUnsignedRequest.Header }
-     * 
-     */
-    public EbicsUnsignedRequest.Header createEbicsUnsignedRequestHeader() {
-        return new EbicsUnsignedRequest.Header();
-    }
-
-    /**
-     * Create an instance of {@link H3KRequestOrderDataType }
-     * 
-     */
-    public H3KRequestOrderDataType createH3KRequestOrderDataType() {
-        return new H3KRequestOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HTDReponseOrderDataType }
-     * 
-     */
-    public HTDReponseOrderDataType createHTDReponseOrderDataType() {
-        return new HTDReponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HKDResponseOrderDataType }
-     * 
-     */
-    public HKDResponseOrderDataType createHKDResponseOrderDataType() {
-        return new HKDResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HVDOrderParamsType }
-     * 
-     */
-    public HVDOrderParamsType createHVDOrderParamsType() {
-        return new HVDOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HPBResponseOrderDataType }
-     * 
-     */
-    public HPBResponseOrderDataType createHPBResponseOrderDataType() {
-        return new HPBResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link GenericOrderParamsType }
-     * 
-     */
-    public GenericOrderParamsType createGenericOrderParamsType() {
-        return new GenericOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HSARequestOrderDataType }
-     * 
-     */
-    public HSARequestOrderDataType createHSARequestOrderDataType() {
-        return new HSARequestOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HIARequestOrderDataType }
-     * 
-     */
-    public HIARequestOrderDataType createHIARequestOrderDataType() {
-        return new HIARequestOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HVZResponseOrderDataType }
-     * 
-     */
-    public HVZResponseOrderDataType createHVZResponseOrderDataType() {
-        return new HVZResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HVTResponseOrderData }
-     * 
-     */
-    public HVTResponseOrderData createHVTResponseOrderData() {
-        return new HVTResponseOrderData();
-    }
-
-    /**
-     * Create an instance of {@link HCARequestOrderDataType }
-     * 
-     */
-    public HCARequestOrderDataType createHCARequestOrderDataType() {
-        return new HCARequestOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link EbicsNoPubKeyDigestsRequest.Header }
-     * 
-     */
-    public EbicsNoPubKeyDigestsRequest.Header 
createEbicsNoPubKeyDigestsRequestHeader() {
-        return new EbicsNoPubKeyDigestsRequest.Header();
-    }
-
-    /**
-     * Create an instance of {@link EbicsNoPubKeyDigestsRequest.Body }
-     * 
-     */
-    public EbicsNoPubKeyDigestsRequest.Body 
createEbicsNoPubKeyDigestsRequestBody() {
-        return new EbicsNoPubKeyDigestsRequest.Body();
-    }
-
-    /**
-     * Create an instance of {@link Parameter.Value }
-     * 
-     */
-    public Parameter.Value createParameterValue() {
-        return new Parameter.Value();
-    }
-
-    /**
-     * Create an instance of {@link HVUOrderParamsType }
-     * 
-     */
-    public HVUOrderParamsType createHVUOrderParamsType() {
-        return new HVUOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HVUResponseOrderDataType }
-     * 
-     */
-    public HVUResponseOrderDataType createHVUResponseOrderDataType() {
-        return new HVUResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HVDResponseOrderDataType }
-     * 
-     */
-    public HVDResponseOrderDataType createHVDResponseOrderDataType() {
-        return new HVDResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link NoPubKeyDigestsReqOrderDetailsType }
-     * 
-     */
-    public NoPubKeyDigestsReqOrderDetailsType 
createNoPubKeyDigestsReqOrderDetailsType() {
-        return new NoPubKeyDigestsReqOrderDetailsType();
-    }
-
-    /**
-     * Create an instance of {@link PubKeyDigestType }
-     * 
-     */
-    public PubKeyDigestType createPubKeyDigestType() {
-        return new PubKeyDigestType();
-    }
-
-    /**
-     * Create an instance of {@link FileFormatType }
-     * 
-     */
-    public FileFormatType createFileFormatType() {
-        return new FileFormatType();
-    }
-
-    /**
-     * Create an instance of {@link EncryptionPubKeyInfoType }
-     * 
-     */
-    public EncryptionPubKeyInfoType createEncryptionPubKeyInfoType() {
-        return new EncryptionPubKeyInfoType();
-    }
-
-    /**
-     * Create an instance of {@link HVTResponseOrderDataType }
-     * 
-     */
-    public HVTResponseOrderDataType createHVTResponseOrderDataType() {
-        return new HVTResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link NoPubKeyDigestsRequestStaticHeaderType }
-     * 
-     */
-    public NoPubKeyDigestsRequestStaticHeaderType 
createNoPubKeyDigestsRequestStaticHeaderType() {
-        return new NoPubKeyDigestsRequestStaticHeaderType();
-    }
-
-    /**
-     * Create an instance of {@link HVUSigningInfoType }
-     * 
-     */
-    public HVUSigningInfoType createHVUSigningInfoType() {
-        return new HVUSigningInfoType();
-    }
-
-    /**
-     * Create an instance of {@link AuthenticationCertificateInfoType }
-     * 
-     */
-    public AuthenticationCertificateInfoType 
createAuthenticationCertificateInfoType() {
-        return new AuthenticationCertificateInfoType();
-    }
-
-    /**
-     * Create an instance of {@link AmountType }
-     * 
-     */
-    public AmountType createAmountType() {
-        return new AmountType();
-    }
-
-    /**
-     * Create an instance of {@link ProductElementType }
-     * 
-     */
-    public ProductElementType createProductElementType() {
-        return new ProductElementType();
-    }
-
-    /**
-     * Create an instance of {@link HVTOrderFlagsType }
-     * 
-     */
-    public HVTOrderFlagsType createHVTOrderFlagsType() {
-        return new HVTOrderFlagsType();
-    }
-
-    /**
-     * Create an instance of {@link UnsecuredReqOrderDetailsType }
-     * 
-     */
-    public UnsecuredReqOrderDetailsType createUnsecuredReqOrderDetailsType() {
-        return new UnsecuredReqOrderDetailsType();
-    }
-
-    /**
-     * Create an instance of {@link HVUOrderDetailsType }
-     * 
-     */
-    public HVUOrderDetailsType createHVUOrderDetailsType() {
-        return new HVUOrderDetailsType();
-    }
-
-    /**
-     * Create an instance of {@link EncryptionCertificateInfoType }
-     * 
-     */
-    public EncryptionCertificateInfoType createEncryptionCertificateInfoType() 
{
-        return new EncryptionCertificateInfoType();
-    }
-
-    /**
-     * Create an instance of {@link SignatureCertificateInfoType }
-     * 
-     */
-    public SignatureCertificateInfoType createSignatureCertificateInfoType() {
-        return new SignatureCertificateInfoType();
-    }
-
-    /**
-     * Create an instance of {@link CertificateInfoType }
-     * 
-     */
-    public CertificateInfoType createCertificateInfoType() {
-        return new CertificateInfoType();
-    }
-
-    /**
-     * Create an instance of {@link PreValidationRequestType }
-     * 
-     */
-    public PreValidationRequestType createPreValidationRequestType() {
-        return new PreValidationRequestType();
-    }
-
-    /**
-     * Create an instance of {@link PubKeyInfoTypeAtEbicsTypes }
-     * 
-     */
-    public PubKeyInfoTypeAtEbicsTypes createPubKeyInfoTypeAtEbicsTypes() {
-        return new PubKeyInfoTypeAtEbicsTypes();
-    }
-
-    /**
-     * Create an instance of {@link TransferReceiptRequestType }
-     * 
-     */
-    public TransferReceiptRequestType createTransferReceiptRequestType() {
-        return new TransferReceiptRequestType();
-    }
-
-    /**
-     * Create an instance of {@link AuthOrderInfoType }
-     * 
-     */
-    public AuthOrderInfoType createAuthOrderInfoType() {
-        return new AuthOrderInfoType();
-    }
-
-    /**
-     * Create an instance of {@link BankInfoType }
-     * 
-     */
-    public BankInfoType createBankInfoType() {
-        return new BankInfoType();
-    }
-
-    /**
-     * Create an instance of {@link HPDVersionType }
-     * 
-     */
-    public HPDVersionType createHPDVersionType() {
-        return new HPDVersionType();
-    }
-
-    /**
-     * Create an instance of {@link HVUOriginatorInfoType }
-     * 
-     */
-    public HVUOriginatorInfoType createHVUOriginatorInfoType() {
-        return new HVUOriginatorInfoType();
-    }
-
-    /**
-     * Create an instance of {@link HVTAccountInfoType }
-     * 
-     */
-    public HVTAccountInfoType createHVTAccountInfoType() {
-        return new HVTAccountInfoType();
-    }
-
-    /**
-     * Create an instance of {@link TransferReceiptResponseType }
-     * 
-     */
-    public TransferReceiptResponseType createTransferReceiptResponseType() {
-        return new TransferReceiptResponseType();
-    }
-
-    /**
-     * Create an instance of {@link PubKeyValueTypeAtEbicsTypes }
-     * 
-     */
-    public PubKeyValueTypeAtEbicsTypes createPubKeyValueTypeAtEbicsTypes() {
-        return new PubKeyValueTypeAtEbicsTypes();
-    }
-
-    /**
-     * Create an instance of {@link EmptyMutableHeaderType }
-     * 
-     */
-    public EmptyMutableHeaderType createEmptyMutableHeaderType() {
-        return new EmptyMutableHeaderType();
-    }
-
-    /**
-     * Create an instance of {@link AuthenticationPubKeyInfoType }
-     * 
-     */
-    public AuthenticationPubKeyInfoType createAuthenticationPubKeyInfoType() {
-        return new AuthenticationPubKeyInfoType();
-    }
-
-    /**
-     * Create an instance of {@link UnsignedRequestStaticHeaderType }
-     * 
-     */
-    public UnsignedRequestStaticHeaderType 
createUnsignedRequestStaticHeaderType() {
-        return new UnsignedRequestStaticHeaderType();
-    }
-
-    /**
-     * Create an instance of {@link UnsignedReqOrderDetailsType }
-     * 
-     */
-    public UnsignedReqOrderDetailsType createUnsignedReqOrderDetailsType() {
-        return new UnsignedReqOrderDetailsType();
-    }
-
-    /**
-     * Create an instance of {@link AddressInfoType }
-     * 
-     */
-    public AddressInfoType createAddressInfoType() {
-        return new AddressInfoType();
-    }
-
-    /**
-     * Create an instance of {@link DataDigestType }
-     * 
-     */
-    public DataDigestType createDataDigestType() {
-        return new DataDigestType();
-    }
-
-    /**
-     * Create an instance of {@link UserPermissionType }
-     * 
-     */
-    public UserPermissionType createUserPermissionType() {
-        return new UserPermissionType();
-    }
-
-    /**
-     * Create an instance of {@link PreValidationAccountAuthType }
-     * 
-     */
-    public PreValidationAccountAuthType createPreValidationAccountAuthType() {
-        return new PreValidationAccountAuthType();
-    }
-
-    /**
-     * Create an instance of {@link UnsecuredRequestStaticHeaderType }
-     * 
-     */
-    public UnsecuredRequestStaticHeaderType 
createUnsecuredRequestStaticHeaderType() {
-        return new UnsecuredRequestStaticHeaderType();
-    }
-
-    /**
-     * Create an instance of {@link PGPDataType }
-     * 
-     */
-    public PGPDataType createPGPDataType() {
-        return new PGPDataType();
-    }
-
-    /**
-     * Create an instance of {@link KeyValueType }
-     * 
-     */
-    public KeyValueType createKeyValueType() {
-        return new KeyValueType();
-    }
-
-    /**
-     * Create an instance of {@link DSAKeyValueType }
-     * 
-     */
-    public DSAKeyValueType createDSAKeyValueType() {
-        return new DSAKeyValueType();
-    }
-
-    /**
-     * Create an instance of {@link ReferenceType }
-     * 
-     */
-    public ReferenceType createReferenceType() {
-        return new ReferenceType();
-    }
-
-    /**
-     * Create an instance of {@link RetrievalMethodType }
-     * 
-     */
-    public RetrievalMethodType createRetrievalMethodType() {
-        return new RetrievalMethodType();
-    }
-
-    /**
-     * Create an instance of {@link TransformsType }
-     * 
-     */
-    public TransformsType createTransformsType() {
-        return new TransformsType();
-    }
-
-    /**
-     * Create an instance of {@link CanonicalizationMethodType }
-     * 
-     */
-    public CanonicalizationMethodType createCanonicalizationMethodType() {
-        return new CanonicalizationMethodType();
-    }
-
-    /**
-     * Create an instance of {@link DigestMethodType }
-     * 
-     */
-    public DigestMethodType createDigestMethodType() {
-        return new DigestMethodType();
-    }
-
-    /**
-     * Create an instance of {@link ManifestType }
-     * 
-     */
-    public ManifestType createManifestType() {
-        return new ManifestType();
-    }
-
-    /**
-     * Create an instance of {@link SignaturePropertyType }
-     * 
-     */
-    public SignaturePropertyType createSignaturePropertyType() {
-        return new SignaturePropertyType();
-    }
-
-    /**
-     * Create an instance of {@link X509DataType }
-     * 
-     */
-    public X509DataType createX509DataType() {
-        return new X509DataType();
-    }
-
-    /**
-     * Create an instance of {@link SignedInfoType }
-     * 
-     */
-    public SignedInfoType createSignedInfoType() {
-        return new SignedInfoType();
-    }
-
-    /**
-     * Create an instance of {@link RSAKeyValueType }
-     * 
-     */
-    public RSAKeyValueType createRSAKeyValueType() {
-        return new RSAKeyValueType();
-    }
-
-    /**
-     * Create an instance of {@link SPKIDataType }
-     * 
-     */
-    public SPKIDataType createSPKIDataType() {
-        return new SPKIDataType();
-    }
-
-    /**
-     * Create an instance of {@link SignatureValueType }
-     * 
-     */
-    public SignatureValueType createSignatureValueType() {
-        return new SignatureValueType();
-    }
-
-    /**
-     * Create an instance of {@link KeyInfoType }
-     * 
-     */
-    public KeyInfoType createKeyInfoType() {
-        return new KeyInfoType();
-    }
-
-    /**
-     * Create an instance of {@link SignaturePropertiesType }
-     * 
-     */
-    public SignaturePropertiesType createSignaturePropertiesType() {
-        return new SignaturePropertiesType();
-    }
-
-    /**
-     * Create an instance of {@link SignatureMethodType }
-     * 
-     */
-    public SignatureMethodType createSignatureMethodType() {
-        return new SignatureMethodType();
-    }
-
-    /**
-     * Create an instance of {@link ObjectType }
-     * 
-     */
-    public ObjectType createObjectType() {
-        return new ObjectType();
-    }
-
-    /**
-     * Create an instance of {@link TransformType }
-     * 
-     */
-    public TransformType createTransformType() {
-        return new TransformType();
-    }
-
-    /**
-     * Create an instance of {@link X509IssuerSerialType }
-     * 
-     */
-    public X509IssuerSerialType createX509IssuerSerialType() {
-        return new X509IssuerSerialType();
-    }
-
-    /**
-     * Create an instance of {@link SignaturePubKeyInfoType }
-     * 
-     */
-    public SignaturePubKeyInfoType createSignaturePubKeyInfoType() {
-        return new SignaturePubKeyInfoType();
-    }
-
-    /**
-     * Create an instance of {@link SignaturePubKeyOrderDataType }
-     * 
-     */
-    public SignaturePubKeyOrderDataType createSignaturePubKeyOrderDataType() {
-        return new SignaturePubKeyOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link OrderSignatureDataType }
-     * 
-     */
-    public OrderSignatureDataType createOrderSignatureDataType() {
-        return new OrderSignatureDataType();
-    }
-
-    /**
-     * Create an instance of {@link PubKeyInfoTypeAtEbicsSignatures }
-     * 
-     */
-    public PubKeyInfoTypeAtEbicsSignatures 
createPubKeyInfoTypeAtEbicsSignatures() {
-        return new PubKeyInfoTypeAtEbicsSignatures();
-    }
-
-    /**
-     * Create an instance of {@link PubKeyValueTypeAtEbicsSignatures }
-     * 
-     */
-    public PubKeyValueTypeAtEbicsSignatures 
createPubKeyValueTypeAtEbicsSignatures() {
-        return new PubKeyValueTypeAtEbicsSignatures();
-    }
-
-    /**
-     * Create an instance of {@link 
UserSignatureDataSigBookType.OrderSignature }
-     * 
-     */
-    public UserSignatureDataSigBookType.OrderSignature 
createUserSignatureDataSigBookTypeOrderSignature() {
-        return new UserSignatureDataSigBookType.OrderSignature();
-    }
-
-    /**
-     * Create an instance of {@link AccountType.AccountNumber }
-     * 
-     */
-    public AccountType.AccountNumber createAccountTypeAccountNumber() {
-        return new AccountType.AccountNumber();
-    }
-
-    /**
-     * Create an instance of {@link AccountType.NationalAccountNumber }
-     * 
-     */
-    public AccountType.NationalAccountNumber 
createAccountTypeNationalAccountNumber() {
-        return new AccountType.NationalAccountNumber();
-    }
-
-    /**
-     * Create an instance of {@link AccountType.BankCode }
-     * 
-     */
-    public AccountType.BankCode createAccountTypeBankCode() {
-        return new AccountType.BankCode();
-    }
-
-    /**
-     * Create an instance of {@link AccountType.NationalBankCode }
-     * 
-     */
-    public AccountType.NationalBankCode createAccountTypeNationalBankCode() {
-        return new AccountType.NationalBankCode();
-    }
-
-    /**
-     * Create an instance of {@link 
DataTransferResponseType.DataEncryptionInfo }
-     * 
-     */
-    public DataTransferResponseType.DataEncryptionInfo 
createDataTransferResponseTypeDataEncryptionInfo() {
-        return new DataTransferResponseType.DataEncryptionInfo();
-    }
-
-    /**
-     * Create an instance of {@link DataTransferResponseType.SignatureData }
-     * 
-     */
-    public DataTransferResponseType.SignatureData 
createDataTransferResponseTypeSignatureData() {
-        return new DataTransferResponseType.SignatureData();
-    }
-
-    /**
-     * Create an instance of {@link DataTransferResponseType.OrderData }
-     * 
-     */
-    public DataTransferResponseType.OrderData 
createDataTransferResponseTypeOrderData() {
-        return new DataTransferResponseType.OrderData();
-    }
-
-    /**
-     * Create an instance of {@link 
DataEncryptionInfoType.EncryptionPubKeyDigest }
-     * 
-     */
-    public DataEncryptionInfoType.EncryptionPubKeyDigest 
createDataEncryptionInfoTypeEncryptionPubKeyDigest() {
-        return new DataEncryptionInfoType.EncryptionPubKeyDigest();
-    }
-
-    /**
-     * Create an instance of {@link AttributedAccountType.AccountNumber }
-     * 
-     */
-    public AttributedAccountType.AccountNumber 
createAttributedAccountTypeAccountNumber() {
-        return new AttributedAccountType.AccountNumber();
-    }
-
-    /**
-     * Create an instance of {@link 
AttributedAccountType.NationalAccountNumber }
-     * 
-     */
-    public AttributedAccountType.NationalAccountNumber 
createAttributedAccountTypeNationalAccountNumber() {
-        return new AttributedAccountType.NationalAccountNumber();
-    }
-
-    /**
-     * Create an instance of {@link AttributedAccountType.BankCode }
-     * 
-     */
-    public AttributedAccountType.BankCode 
createAttributedAccountTypeBankCode() {
-        return new AttributedAccountType.BankCode();
-    }
-
-    /**
-     * Create an instance of {@link AttributedAccountType.NationalBankCode }
-     * 
-     */
-    public AttributedAccountType.NationalBankCode 
createAttributedAccountTypeNationalBankCode() {
-        return new AttributedAccountType.NationalBankCode();
-    }
-
-    /**
-     * Create an instance of {@link AttributedAccountType.AccountHolder }
-     * 
-     */
-    public AttributedAccountType.AccountHolder 
createAttributedAccountTypeAccountHolder() {
-        return new AttributedAccountType.AccountHolder();
-    }
-
-    /**
-     * Create an instance of {@link UserInfoType.UserID }
-     * 
-     */
-    public UserInfoType.UserID createUserInfoTypeUserID() {
-        return new UserInfoType.UserID();
-    }
-
-    /**
-     * Create an instance of {@link HPDAccessParamsType.URL }
-     * 
-     */
-    public HPDAccessParamsType.URL createHPDAccessParamsTypeURL() {
-        return new HPDAccessParamsType.URL();
-    }
-
-    /**
-     * Create an instance of {@link HVZOrderDetailsType.TotalAmount }
-     * 
-     */
-    public HVZOrderDetailsType.TotalAmount 
createHVZOrderDetailsTypeTotalAmount() {
-        return new HVZOrderDetailsType.TotalAmount();
-    }
-
-    /**
-     * Create an instance of {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.AccountNumber }
-     * 
-     */
-    public HVZOrderDetailsType.FirstOrderInfo.AccountInfo.AccountNumber 
createHVZOrderDetailsTypeFirstOrderInfoAccountInfoAccountNumber() {
-        return new 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.AccountNumber();
-    }
-
-    /**
-     * Create an instance of {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalAccountNumber }
-     * 
-     */
-    public 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalAccountNumber 
createHVZOrderDetailsTypeFirstOrderInfoAccountInfoNationalAccountNumber() {
-        return new 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalAccountNumber();
-    }
-
-    /**
-     * Create an instance of {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.BankCode }
-     * 
-     */
-    public HVZOrderDetailsType.FirstOrderInfo.AccountInfo.BankCode 
createHVZOrderDetailsTypeFirstOrderInfoAccountInfoBankCode() {
-        return new HVZOrderDetailsType.FirstOrderInfo.AccountInfo.BankCode();
-    }
-
-    /**
-     * Create an instance of {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalBankCode }
-     * 
-     */
-    public HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalBankCode 
createHVZOrderDetailsTypeFirstOrderInfoAccountInfoNationalBankCode() {
-        return new 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalBankCode();
-    }
-
-    /**
-     * Create an instance of {@link PartnerInfoType.AccountInfo }
-     * 
-     */
-    public PartnerInfoType.AccountInfo createPartnerInfoTypeAccountInfo() {
-        return new PartnerInfoType.AccountInfo();
-    }
-
-    /**
-     * Create an instance of {@link HVTOrderInfoType.ExecutionDate }
-     * 
-     */
-    public HVTOrderInfoType.ExecutionDate 
createHVTOrderInfoTypeExecutionDate() {
-        return new HVTOrderInfoType.ExecutionDate();
-    }
-
-    /**
-     * Create an instance of {@link HVTOrderInfoType.Amount }
-     * 
-     */
-    public HVTOrderInfoType.Amount createHVTOrderInfoTypeAmount() {
-        return new HVTOrderInfoType.Amount();
-    }
-
-    /**
-     * Create an instance of {@link HVTOrderInfoType.Description }
-     * 
-     */
-    public HVTOrderInfoType.Description createHVTOrderInfoTypeDescription() {
-        return new HVTOrderInfoType.Description();
-    }
-
-    /**
-     * Create an instance of {@link DataTransferRequestType.DataEncryptionInfo 
}
-     * 
-     */
-    public DataTransferRequestType.DataEncryptionInfo 
createDataTransferRequestTypeDataEncryptionInfo() {
-        return new DataTransferRequestType.DataEncryptionInfo();
-    }
-
-    /**
-     * Create an instance of {@link DataTransferRequestType.SignatureData }
-     * 
-     */
-    public DataTransferRequestType.SignatureData 
createDataTransferRequestTypeSignatureData() {
-        return new DataTransferRequestType.SignatureData();
-    }
-
-    /**
-     * Create an instance of {@link DataTransferRequestType.OrderData }
-     * 
-     */
-    public DataTransferRequestType.OrderData 
createDataTransferRequestTypeOrderData() {
-        return new DataTransferRequestType.OrderData();
-    }
-
-    /**
-     * Create an instance of {@link SignerInfoType.Permission }
-     * 
-     */
-    public SignerInfoType.Permission createSignerInfoTypePermission() {
-        return new SignerInfoType.Permission();
-    }
-
-    /**
-     * Create an instance of {@link HPDProtocolParamsType.Recovery }
-     * 
-     */
-    public HPDProtocolParamsType.Recovery 
createHPDProtocolParamsTypeRecovery() {
-        return new HPDProtocolParamsType.Recovery();
-    }
-
-    /**
-     * Create an instance of {@link HPDProtocolParamsType.PreValidation }
-     * 
-     */
-    public HPDProtocolParamsType.PreValidation 
createHPDProtocolParamsTypePreValidation() {
-        return new HPDProtocolParamsType.PreValidation();
-    }
-
-    /**
-     * Create an instance of {@link HPDProtocolParamsType.X509Data }
-     * 
-     */
-    public HPDProtocolParamsType.X509Data 
createHPDProtocolParamsTypeX509Data() {
-        return new HPDProtocolParamsType.X509Data();
-    }
-
-    /**
-     * Create an instance of {@link HPDProtocolParamsType.ClientDataDownload }
-     * 
-     */
-    public HPDProtocolParamsType.ClientDataDownload 
createHPDProtocolParamsTypeClientDataDownload() {
-        return new HPDProtocolParamsType.ClientDataDownload();
-    }
-
-    /**
-     * Create an instance of {@link 
HPDProtocolParamsType.DownloadableOrderData }
-     * 
-     */
-    public HPDProtocolParamsType.DownloadableOrderData 
createHPDProtocolParamsTypeDownloadableOrderData() {
-        return new HPDProtocolParamsType.DownloadableOrderData();
-    }
-
-    /**
-     * Create an instance of {@link 
BankSignatureDataSigBookType.OrderSignature }
-     * 
-     */
-    public BankSignatureDataSigBookType.OrderSignature 
createBankSignatureDataSigBookTypeOrderSignature() {
-        return new BankSignatureDataSigBookType.OrderSignature();
-    }
-
-    /**
-     * Create an instance of {@link StandardOrderParamsType.DateRange }
-     * 
-     */
-    public StandardOrderParamsType.DateRange 
createStandardOrderParamsTypeDateRange() {
-        return new StandardOrderParamsType.DateRange();
-    }
-
-    /**
-     * Create an instance of {@link FDLOrderParamsType.DateRange }
-     * 
-     */
-    public FDLOrderParamsType.DateRange createFDLOrderParamsTypeDateRange() {
-        return new FDLOrderParamsType.DateRange();
-    }
-
-    /**
-     * Create an instance of {@link 
EbicsUnsignedRequest.Body.DataTransfer.SignatureData }
-     * 
-     */
-    public EbicsUnsignedRequest.Body.DataTransfer.SignatureData 
createEbicsUnsignedRequestBodyDataTransferSignatureData() {
-        return new EbicsUnsignedRequest.Body.DataTransfer.SignatureData();
-    }
-
-    /**
-     * Create an instance of {@link 
EbicsUnsignedRequest.Body.DataTransfer.OrderData }
-     * 
-     */
-    public EbicsUnsignedRequest.Body.DataTransfer.OrderData 
createEbicsUnsignedRequestBodyDataTransferOrderData() {
-        return new EbicsUnsignedRequest.Body.DataTransfer.OrderData();
-    }
-
-    /**
-     * Create an instance of {@link HVTOrderParamsType.OrderFlags }
-     * 
-     */
-    public HVTOrderParamsType.OrderFlags createHVTOrderParamsTypeOrderFlags() {
-        return new HVTOrderParamsType.OrderFlags();
-    }
-
-    /**
-     * Create an instance of {@link 
EbicsUnsecuredRequest.Body.DataTransfer.OrderData }
-     * 
-     */
-    public EbicsUnsecuredRequest.Body.DataTransfer.OrderData 
createEbicsUnsecuredRequestBodyDataTransferOrderData() {
-        return new EbicsUnsecuredRequest.Body.DataTransfer.OrderData();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVTResponseOrderData }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HVTResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HVTResponseOrderData> 
createHVTResponseOrderData(HVTResponseOrderData value) {
-        return new 
JAXBElement<HVTResponseOrderData>(_HVTResponseOrderData_QNAME, 
HVTResponseOrderData.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"KeyInfo")
-    public JAXBElement<KeyInfoType> createKeyInfo(KeyInfoType value) {
-        return new JAXBElement<KeyInfoType>(_KeyInfo_QNAME, KeyInfoType.class, 
null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HPBResponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HPBResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HPBResponseOrderDataType> 
createHPBResponseOrderData(HPBResponseOrderDataType value) {
-        return new 
JAXBElement<HPBResponseOrderDataType>(_HPBResponseOrderData_QNAME, 
HPBResponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
GenericOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"GenericOrderParams", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "OrderParams")
-    public JAXBElement<GenericOrderParamsType> 
createGenericOrderParams(GenericOrderParamsType value) {
-        return new 
JAXBElement<GenericOrderParamsType>(_GenericOrderParams_QNAME, 
GenericOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HSARequestOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HSARequestOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HSARequestOrderDataType> 
createHSARequestOrderData(HSARequestOrderDataType value) {
-        return new 
JAXBElement<HSARequestOrderDataType>(_HSARequestOrderData_QNAME, 
HSARequestOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Object 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"EBICSSignatureData")
-    public JAXBElement<Object> createebicsSignatureDataAtEbicsOrders(Object 
value) {
-        return new JAXBElement<Object>(_ebicsSignatureDataAtEbicsOrders_QNAME, 
Object.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVDResponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HVDResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HVDResponseOrderDataType> 
createHVDResponseOrderData(HVDResponseOrderDataType value) {
-        return new 
JAXBElement<HVDResponseOrderDataType>(_HVDResponseOrderData_QNAME, 
HVDResponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HCARequestOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HCARequestOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HCARequestOrderDataType> 
createHCARequestOrderData(HCARequestOrderDataType value) {
-        return new 
JAXBElement<HCARequestOrderDataType>(_HCARequestOrderData_QNAME, 
HCARequestOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
SignaturePropertyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"SignatureProperty")
-    public JAXBElement<SignaturePropertyType> 
createSignatureProperty(SignaturePropertyType value) {
-        return new 
JAXBElement<SignaturePropertyType>(_SignatureProperty_QNAME, 
SignaturePropertyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVEOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "HVEOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<HVEOrderParamsType> 
createHVEOrderParams(HVEOrderParamsType value) {
-        return new JAXBElement<HVEOrderParamsType>(_HVEOrderParams_QNAME, 
HVEOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Object 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "EBICSOrderData")
-    public JAXBElement<Object> createEBICSOrderData(Object value) {
-        return new JAXBElement<Object>(_EBICSOrderData_QNAME, Object.class, 
null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
RSAKeyValueType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"RSAKeyValue")
-    public JAXBElement<RSAKeyValueType> createRSAKeyValue(RSAKeyValueType 
value) {
-        return new JAXBElement<RSAKeyValueType>(_RSAKeyValue_QNAME, 
RSAKeyValueType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HCSRequestOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HCSRequestOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HCSRequestOrderDataType> 
createHCSRequestOrderData(HCSRequestOrderDataType value) {
-        return new 
JAXBElement<HCSRequestOrderDataType>(_HCSRequestOrderData_QNAME, 
HCSRequestOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVSOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "HVSOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<HVSOrderParamsType> 
createHVSOrderParams(HVSOrderParamsType value) {
-        return new JAXBElement<HVSOrderParamsType>(_HVSOrderParams_QNAME, 
HVSOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
SignatureMethodType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"SignatureMethod")
-    public JAXBElement<SignatureMethodType> 
createSignatureMethod(SignatureMethodType value) {
-        return new JAXBElement<SignatureMethodType>(_SignatureMethod_QNAME, 
SignatureMethodType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"Object")
-    public JAXBElement<ObjectType> createObject(ObjectType value) {
-        return new JAXBElement<ObjectType>(_Object_QNAME, ObjectType.class, 
null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
BankSignatureDataSigBookType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"BankSignatureData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSSignatureData")
-    public JAXBElement<BankSignatureDataSigBookType> 
createBankSignatureData(BankSignatureDataSigBookType value) {
-        return new 
JAXBElement<BankSignatureDataSigBookType>(_BankSignatureData_QNAME, 
BankSignatureDataSigBookType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
FDLOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "FDLOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<FDLOrderParamsType> 
createFDLOrderParams(FDLOrderParamsType value) {
-        return new JAXBElement<FDLOrderParamsType>(_FDLOrderParams_QNAME, 
FDLOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"PGPData")
-    public JAXBElement<PGPDataType> createPGPData(PGPDataType value) {
-        return new JAXBElement<PGPDataType>(_PGPData_QNAME, PGPDataType.class, 
null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
RetrievalMethodType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"RetrievalMethod")
-    public JAXBElement<RetrievalMethodType> 
createRetrievalMethod(RetrievalMethodType value) {
-        return new JAXBElement<RetrievalMethodType>(_RetrievalMethod_QNAME, 
RetrievalMethodType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
SignaturePubKeyOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.ebics.org/S001";, name = 
"SignaturePubKeyOrderData")
-    public JAXBElement<SignaturePubKeyOrderDataType> 
createSignaturePubKeyOrderData(SignaturePubKeyOrderDataType value) {
-        return new 
JAXBElement<SignaturePubKeyOrderDataType>(_SignaturePubKeyOrderData_QNAME, 
SignaturePubKeyOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
DSAKeyValueType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"DSAKeyValue")
-    public JAXBElement<DSAKeyValueType> createDSAKeyValue(DSAKeyValueType 
value) {
-        return new JAXBElement<DSAKeyValueType>(_DSAKeyValue_QNAME, 
DSAKeyValueType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVSRequestOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HVSRequestOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HVSRequestOrderDataType> 
createHVSRequestOrderData(HVSRequestOrderDataType value) {
-        return new 
JAXBElement<HVSRequestOrderDataType>(_HVSRequestOrderData_QNAME, 
HVSRequestOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
OrderSignatureDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.ebics.org/S001";, name = 
"OrderSignatureData")
-    public JAXBElement<OrderSignatureDataType> 
createOrderSignatureData(OrderSignatureDataType value) {
-        return new 
JAXBElement<OrderSignatureDataType>(_OrderSignatureData_QNAME, 
OrderSignatureDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
H3KRequestOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"H3KRequestOrderData")
-    public JAXBElement<H3KRequestOrderDataType> 
createH3KRequestOrderData(H3KRequestOrderDataType value) {
-        return new 
JAXBElement<H3KRequestOrderDataType>(_H3KRequestOrderData_QNAME, 
H3KRequestOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HTDReponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HTDResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HTDReponseOrderDataType> 
createHTDResponseOrderData(HTDReponseOrderDataType value) {
-        return new 
JAXBElement<HTDReponseOrderDataType>(_HTDResponseOrderData_QNAME, 
HTDReponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SPKIDataType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"SPKIData")
-    public JAXBElement<SPKIDataType> createSPKIData(SPKIDataType value) {
-        return new JAXBElement<SPKIDataType>(_SPKIData_QNAME, 
SPKIDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HIARequestOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HIARequestOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HIARequestOrderDataType> 
createHIARequestOrderData(HIARequestOrderDataType value) {
-        return new 
JAXBElement<HIARequestOrderDataType>(_HIARequestOrderData_QNAME, 
HIARequestOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVZResponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HVZResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HVZResponseOrderDataType> 
createHVZResponseOrderData(HVZResponseOrderDataType value) {
-        return new 
JAXBElement<HVZResponseOrderDataType>(_HVZResponseOrderData_QNAME, 
HVZResponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
SignatureValueType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"SignatureValue")
-    public JAXBElement<SignatureValueType> 
createSignatureValue(SignatureValueType value) {
-        return new JAXBElement<SignatureValueType>(_SignatureValue_QNAME, 
SignatureValueType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
UserSignatureDataSigBookType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.ebics.org/S001";, name = 
"UserSignatureData", substitutionHeadNamespace = "http://www.ebics.org/S001";, 
substitutionHeadName = "EBICSSignatureData")
-    public JAXBElement<UserSignatureDataSigBookType> 
createUserSignatureData(UserSignatureDataSigBookType value) {
-        return new 
JAXBElement<UserSignatureDataSigBookType>(_UserSignatureData_QNAME, 
UserSignatureDataSigBookType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Object 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "OrderParams")
-    public JAXBElement<Object> createOrderParams(Object value) {
-        return new JAXBElement<Object>(_OrderParams_QNAME, Object.class, null, 
value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"KeyValue")
-    public JAXBElement<KeyValueType> createKeyValue(KeyValueType value) {
-        return new JAXBElement<KeyValueType>(_KeyValue_QNAME, 
KeyValueType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
TransformsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"Transforms")
-    public JAXBElement<TransformsType> createTransforms(TransformsType value) {
-        return new JAXBElement<TransformsType>(_Transforms_QNAME, 
TransformsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVUResponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HVUResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HVUResponseOrderDataType> 
createHVUResponseOrderData(HVUResponseOrderDataType value) {
-        return new 
JAXBElement<HVUResponseOrderDataType>(_HVUResponseOrderData_QNAME, 
HVUResponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
SignaturePubKeyInfoType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.ebics.org/S001";, name = 
"SignaturePubKeyInfo")
-    public JAXBElement<SignaturePubKeyInfoType> 
createSignaturePubKeyInfo(SignaturePubKeyInfoType value) {
-        return new 
JAXBElement<SignaturePubKeyInfoType>(_SignaturePubKeyInfo_QNAME, 
SignaturePubKeyInfoType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVUOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "HVUOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<HVUOrderParamsType> 
createHVUOrderParams(HVUOrderParamsType value) {
-        return new JAXBElement<HVUOrderParamsType>(_HVUOrderParams_QNAME, 
HVUOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
DigestMethodType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"DigestMethod")
-    public JAXBElement<DigestMethodType> createDigestMethod(DigestMethodType 
value) {
-        return new JAXBElement<DigestMethodType>(_DigestMethod_QNAME, 
DigestMethodType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"X509Data")
-    public JAXBElement<X509DataType> createX509Data(X509DataType value) {
-        return new JAXBElement<X509DataType>(_X509Data_QNAME, 
X509DataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "AuthSignature")
-    public JAXBElement<SignatureType> createAuthSignature(SignatureType value) 
{
-        return new JAXBElement<SignatureType>(_AuthSignature_QNAME, 
SignatureType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"KeyName")
-    public JAXBElement<String> createKeyName(String value) {
-        return new JAXBElement<String>(_KeyName_QNAME, String.class, null, 
value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"Signature")
-    public JAXBElement<SignatureType> createSignature(SignatureType value) {
-        return new JAXBElement<SignatureType>(_Signature_QNAME, 
SignatureType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"MgmtData")
-    public JAXBElement<String> createMgmtData(String value) {
-        return new JAXBElement<String>(_MgmtData_QNAME, String.class, null, 
value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HAAResponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HAAResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HAAResponseOrderDataType> 
createHAAResponseOrderData(HAAResponseOrderDataType value) {
-        return new 
JAXBElement<HAAResponseOrderDataType>(_HAAResponseOrderData_QNAME, 
HAAResponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVZOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "HVZOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<HVZOrderParamsType> 
createHVZOrderParams(HVZOrderParamsType value) {
-        return new JAXBElement<HVZOrderParamsType>(_HVZOrderParams_QNAME, 
HVZOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
SignaturePropertiesType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"SignatureProperties")
-    public JAXBElement<SignaturePropertiesType> 
createSignatureProperties(SignaturePropertiesType value) {
-        return new 
JAXBElement<SignaturePropertiesType>(_SignatureProperties_QNAME, 
SignaturePropertiesType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HPDResponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HPDResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HPDResponseOrderDataType> 
createHPDResponseOrderData(HPDResponseOrderDataType value) {
-        return new 
JAXBElement<HPDResponseOrderDataType>(_HPDResponseOrderData_QNAME, 
HPDResponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
FULOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "FULOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<FULOrderParamsType> 
createFULOrderParams(FULOrderParamsType value) {
-        return new JAXBElement<FULOrderParamsType>(_FULOrderParams_QNAME, 
FULOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TransformType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"Transform")
-    public JAXBElement<TransformType> createTransform(TransformType value) {
-        return new JAXBElement<TransformType>(_Transform_QNAME, 
TransformType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HKDResponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HKDResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HKDResponseOrderDataType> 
createHKDResponseOrderData(HKDResponseOrderDataType value) {
-        return new 
JAXBElement<HKDResponseOrderDataType>(_HKDResponseOrderData_QNAME, 
HKDResponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVDOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "HVDOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<HVDOrderParamsType> 
createHVDOrderParams(HVDOrderParamsType value) {
-        return new JAXBElement<HVDOrderParamsType>(_HVDOrderParams_QNAME, 
HVDOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
StandardOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"StandardOrderParams", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "OrderParams")
-    public JAXBElement<StandardOrderParamsType> 
createStandardOrderParams(StandardOrderParamsType value) {
-        return new 
JAXBElement<StandardOrderParamsType>(_StandardOrderParams_QNAME, 
StandardOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"Reference")
-    public JAXBElement<ReferenceType> createReference(ReferenceType value) {
-        return new JAXBElement<ReferenceType>(_Reference_QNAME, 
ReferenceType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code 
>}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"DigestValue")
-    public JAXBElement<byte[]> createDigestValue(byte[] value) {
-        return new JAXBElement<byte[]>(_DigestValue_QNAME, byte[].class, null, 
((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVTOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "HVTOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<HVTOrderParamsType> 
createHVTOrderParams(HVTOrderParamsType value) {
-        return new JAXBElement<HVTOrderParamsType>(_HVTOrderParams_QNAME, 
HVTOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
CanonicalizationMethodType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"CanonicalizationMethod")
-    public JAXBElement<CanonicalizationMethodType> 
createCanonicalizationMethod(CanonicalizationMethodType value) {
-        return new 
JAXBElement<CanonicalizationMethodType>(_CanonicalizationMethod_QNAME, 
CanonicalizationMethodType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
SignedInfoType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"SignedInfo")
-    public JAXBElement<SignedInfoType> createSignedInfo(SignedInfoType value) {
-        return new JAXBElement<SignedInfoType>(_SignedInfo_QNAME, 
SignedInfoType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Object 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.ebics.org/S001";, name = 
"EBICSSignatureData")
-    public JAXBElement<Object> 
createebicsSignatureDataAtEbicsSignatures(Object value) {
-        return new 
JAXBElement<Object>(_ebicsSignatureDataAtEbicsSignatures_QNAME, Object.class, 
null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"Manifest")
-    public JAXBElement<ManifestType> createManifest(ManifestType value) {
-        return new JAXBElement<ManifestType>(_Manifest_QNAME, 
ManifestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
X509IssuerSerialType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"X509IssuerSerial", scope = X509DataType.class)
-    public JAXBElement<X509IssuerSerialType> 
createX509DataTypeX509IssuerSerial(X509IssuerSerialType value) {
-        return new 
JAXBElement<X509IssuerSerialType>(_X509DataTypeX509IssuerSerial_QNAME, 
X509IssuerSerialType.class, X509DataType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code 
>}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"X509CRL", scope = X509DataType.class)
-    public JAXBElement<byte[]> createX509DataTypeX509CRL(byte[] value) {
-        return new JAXBElement<byte[]>(_X509DataTypeX509CRL_QNAME, 
byte[].class, X509DataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"X509SubjectName", scope = X509DataType.class)
-    public JAXBElement<String> createX509DataTypeX509SubjectName(String value) 
{
-        return new JAXBElement<String>(_X509DataTypeX509SubjectName_QNAME, 
String.class, X509DataType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code 
>}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"X509SKI", scope = X509DataType.class)
-    public JAXBElement<byte[]> createX509DataTypeX509SKI(byte[] value) {
-        return new JAXBElement<byte[]>(_X509DataTypeX509SKI_QNAME, 
byte[].class, X509DataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code 
>}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"X509Certificate", scope = X509DataType.class)
-    public JAXBElement<byte[]> createX509DataTypeX509Certificate(byte[] value) 
{
-        return new JAXBElement<byte[]>(_X509DataTypeX509Certificate_QNAME, 
byte[].class, X509DataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code 
>}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"SPKISexp", scope = SPKIDataType.class)
-    public JAXBElement<byte[]> createSPKIDataTypeSPKISexp(byte[] value) {
-        return new JAXBElement<byte[]>(_SPKIDataTypeSPKISexp_QNAME, 
byte[].class, SPKIDataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code 
>}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"PGPKeyID", scope = PGPDataType.class)
-    public JAXBElement<byte[]> createPGPDataTypePGPKeyID(byte[] value) {
-        return new JAXBElement<byte[]>(_PGPDataTypePGPKeyID_QNAME, 
byte[].class, PGPDataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code 
>}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"PGPKeyPacket", scope = PGPDataType.class)
-    public JAXBElement<byte[]> createPGPDataTypePGPKeyPacket(byte[] value) {
-        return new JAXBElement<byte[]>(_PGPDataTypePGPKeyPacket_QNAME, 
byte[].class, PGPDataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
ProductElementType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "Product", scope 
= StaticHeaderBaseType.class)
-    public JAXBElement<ProductElementType> 
createStaticHeaderBaseTypeProduct(ProductElementType value) {
-        return new 
JAXBElement<ProductElementType>(_StaticHeaderBaseTypeProduct_QNAME, 
ProductElementType.class, StaticHeaderBaseType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"HMACOutputLength", scope = SignatureMethodType.class)
-    public JAXBElement<BigInteger> 
createSignatureMethodTypeHMACOutputLength(BigInteger value) {
-        return new 
JAXBElement<BigInteger>(_SignatureMethodTypeHMACOutputLength_QNAME, 
BigInteger.class, SignatureMethodType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"XPath", scope = TransformType.class)
-    public JAXBElement<String> createTransformTypeXPath(String value) {
-        return new JAXBElement<String>(_TransformTypeXPath_QNAME, 
String.class, TransformType.class, value);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/ObjectType.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/ObjectType.java
deleted file mode 100644
index a29e2ac..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/ObjectType.java
+++ /dev/null
@@ -1,171 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for ObjectType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="ObjectType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence maxOccurs="unbounded" minOccurs="0">
- *         &lt;any processContents='lax'/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *       &lt;attribute name="MimeType" 
type="{http://www.w3.org/2001/XMLSchema}string"; />
- *       &lt;attribute name="Encoding" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ObjectType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class ObjectType {
-
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-    @XmlAttribute(name = "MimeType")
-    protected String mimeType;
-    @XmlAttribute(name = "Encoding")
-    @XmlSchemaType(name = "anyURI")
-    protected String encoding;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * {@link String }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the mimeType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMimeType() {
-        return mimeType;
-    }
-
-    /**
-     * Sets the value of the mimeType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMimeType(String value) {
-        this.mimeType = value;
-    }
-
-    /**
-     * Gets the value of the encoding property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getEncoding() {
-        return encoding;
-    }
-
-    /**
-     * Sets the value of the encoding property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setEncoding(String value) {
-        this.encoding = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/OrderAttributeType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/OrderAttributeType.java
deleted file mode 100644
index 94dcdf9..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/OrderAttributeType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for OrderAttributeType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="OrderAttributeType">
- *   &lt;restriction base="{urn:org:ebics:H004}OrderAttributeBaseType">
- *     &lt;enumeration value="OZHNN"/>
- *     &lt;enumeration value="UZHNN"/>
- *     &lt;enumeration value="DZHNN"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "OrderAttributeType")
-@XmlEnum
-public enum OrderAttributeType {
-
-
-    /**
-     * Auftragsdaten mit Unterschrift, ZIP-komprimiert, hybrid verschlüsselt
-     * 
-     */
-    OZHNN,
-
-    /**
-     * Unterschrift, ZIP-komprimiert, hybrid verschlüsselt
-     * 
-     */
-    UZHNN,
-
-    /**
-     * Auftragsdaten ohne Unterschrift, ZIP-komprimiert, hybrid verschlüsselt
-     * 
-     */
-    DZHNN;
-
-    public String value() {
-        return name();
-    }
-
-    public static OrderAttributeType fromValue(String v) {
-        return valueOf(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/OrderDetailsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/OrderDetailsType.java
deleted file mode 100644
index 95ec4f0..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/OrderDetailsType.java
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für OrderDetails im statischen EBICS-Header (allgemein).
- * 
- * <p>Java class for OrderDetailsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="OrderDetailsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderType" 
type="{urn:org:ebics:H004}OrderTBaseType"/>
- *         &lt;element name="OrderAttribute" 
type="{urn:org:ebics:H004}OrderAttributeBaseType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OrderDetailsType", propOrder = {
-    "orderType",
-    "orderAttribute"
-})
-@XmlSeeAlso({
-    NoPubKeyDigestsReqOrderDetailsType.class,
-    UnsecuredReqOrderDetailsType.class,
-    UnsignedReqOrderDetailsType.class
-})
-public abstract class OrderDetailsType {
-
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "OrderAttribute", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderAttribute;
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the orderAttribute property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderAttribute() {
-        return orderAttribute;
-    }
-
-    /**
-     * Sets the value of the orderAttribute property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderAttribute(String value) {
-        this.orderAttribute = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/OrderSignatureDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/OrderSignatureDataType.java
deleted file mode 100644
index 38bc78f..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/OrderSignatureDataType.java
+++ /dev/null
@@ -1,190 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Data type according for a digital signature (either autorising an order or 
applied for transportation), structured format.
- * 
- * <p>Java class for OrderSignatureDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="OrderSignatureDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="SignatureVersion" 
type="{http://www.ebics.org/S001}SignatureVersionType"/>
- *         &lt;element name="SignatureValue" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         &lt;element name="PartnerID" 
type="{http://www.ebics.org/S001}PartnerIDType"/>
- *         &lt;element name="UserID" 
type="{http://www.ebics.org/S001}UserIDType"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"; 
minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OrderSignatureDataType", namespace = 
"http://www.ebics.org/S001";, propOrder = {
-    "signatureVersion",
-    "signatureValue",
-    "partnerID",
-    "userID",
-    "x509Data"
-})
-public class OrderSignatureDataType {
-
-    @XmlElement(name = "SignatureVersion", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String signatureVersion;
-    @XmlElement(name = "SignatureValue", required = true)
-    protected byte[] signatureValue;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlElement(name = "X509Data", namespace = 
"http://www.w3.org/2000/09/xmldsig#";)
-    protected X509DataType x509Data;
-
-    /**
-     * Gets the value of the signatureVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSignatureVersion() {
-        return signatureVersion;
-    }
-
-    /**
-     * Sets the value of the signatureVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSignatureVersion(String value) {
-        this.signatureVersion = value;
-    }
-
-    /**
-     * Gets the value of the signatureValue property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getSignatureValue() {
-        return signatureValue;
-    }
-
-    /**
-     * Sets the value of the signatureValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setSignatureValue(byte[] value) {
-        this.signatureValue = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Parameter for X509Data
-     * 
-     * @return
-     *     possible object is
-     *     {@link X509DataType }
-     *     
-     */
-    public X509DataType getX509Data() {
-        return x509Data;
-    }
-
-    /**
-     * Sets the value of the x509Data property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link X509DataType }
-     *     
-     */
-    public void setX509Data(X509DataType value) {
-        this.x509Data = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/OrderTType.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/OrderTType.java
deleted file mode 100644
index 69dff61..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/OrderTType.java
+++ /dev/null
@@ -1,723 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for OrderTType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="OrderTType">
- *   &lt;restriction base="{urn:org:ebics:H004}OrderTBaseType">
- *     &lt;length value="3"/>
- *     &lt;enumeration value="HSA"/>
- *     &lt;enumeration value="HIA"/>
- *     &lt;enumeration value="HPB"/>
- *     &lt;enumeration value="HCA"/>
- *     &lt;enumeration value="HPD"/>
- *     &lt;enumeration value="HVU"/>
- *     &lt;enumeration value="HVD"/>
- *     &lt;enumeration value="HVT"/>
- *     &lt;enumeration value="HVE"/>
- *     &lt;enumeration value="HVS"/>
- *     &lt;enumeration value="HKD"/>
- *     &lt;enumeration value="HAA"/>
- *     &lt;enumeration value="HVU"/>
- *     &lt;enumeration value="HVD"/>
- *     &lt;enumeration value="HVT"/>
- *     &lt;enumeration value="HVE"/>
- *     &lt;enumeration value="HVS"/>
- *     &lt;enumeration value="AAE"/>
- *     &lt;enumeration value="AEA"/>
- *     &lt;enumeration value="AIA"/>
- *     &lt;enumeration value="AKA"/>
- *     &lt;enumeration value="AWV"/>
- *     &lt;enumeration value="AZM"/>
- *     &lt;enumeration value="AZV"/>
- *     &lt;enumeration value="AZ2"/>
- *     &lt;enumeration value="AZ4"/>
- *     &lt;enumeration value="DDG"/>
- *     &lt;enumeration value="DHB"/>
- *     &lt;enumeration value="DTE"/>
- *     &lt;enumeration value="DTI"/>
- *     &lt;enumeration value="DTM"/>
- *     &lt;enumeration value="DTV"/>
- *     &lt;enumeration value="DT2"/>
- *     &lt;enumeration value="DT4"/>
- *     &lt;enumeration value="EAB"/>
- *     &lt;enumeration value="ECS"/>
- *     &lt;enumeration value="EDC"/>
- *     &lt;enumeration value="EEA"/>
- *     &lt;enumeration value="EEZ"/>
- *     &lt;enumeration value="EIB"/>
- *     &lt;enumeration value="EIK"/>
- *     &lt;enumeration value="ESA"/>
- *     &lt;enumeration value="ESM"/>
- *     &lt;enumeration value="ESR"/>
- *     &lt;enumeration value="ESZ"/>
- *     &lt;enumeration value="ESU"/>
- *     &lt;enumeration value="EUE"/>
- *     &lt;enumeration value="GAB"/>
- *     &lt;enumeration value="GAK"/>
- *     &lt;enumeration value="GKT"/>
- *     &lt;enumeration value="IDD"/>
- *     &lt;enumeration value="IIB"/>
- *     &lt;enumeration value="IIK"/>
- *     &lt;enumeration value="INT"/>
- *     &lt;enumeration value="IZG"/>
- *     &lt;enumeration value="IZL"/>
- *     &lt;enumeration value="IZV"/>
- *     &lt;enumeration value="MAO"/>
- *     &lt;enumeration value="MCV"/>
- *     &lt;enumeration value="MC2"/>
- *     &lt;enumeration value="MC4"/>
- *     &lt;enumeration value="POZ"/>
- *     &lt;enumeration value="RDT"/>
- *     &lt;enumeration value="RFT"/>
- *     &lt;enumeration value="STA"/>
- *     &lt;enumeration value="VMK"/>
- *     &lt;enumeration value="WPA"/>
- *     &lt;enumeration value="WPB"/>
- *     &lt;enumeration value="WPC"/>
- *     &lt;enumeration value="WPD"/>
- *     &lt;enumeration value="INI"/>
- *     &lt;enumeration value="PTK"/>
- *     &lt;enumeration value="PUB"/>
- *     &lt;enumeration value="HCA"/>
- *     &lt;enumeration value="SPR"/>
- *     &lt;enumeration value="VPB"/>
- *     &lt;enumeration value="FIN"/>
- *     &lt;enumeration value="IZS"/>
- *     &lt;enumeration value="SSP"/>
- *     &lt;enumeration value="ATA"/>
- *     &lt;enumeration value="BKA"/>
- *     &lt;enumeration value="BZK"/>
- *     &lt;enumeration value="DKI"/>
- *     &lt;enumeration value="DMI"/>
- *     &lt;enumeration value="DSW"/>
- *     &lt;enumeration value="ESG"/>
- *     &lt;enumeration value="ESP"/>
- *     &lt;enumeration value="FTB"/>
- *     &lt;enumeration value="FTD"/>
- *     &lt;enumeration value="IBK"/>
- *     &lt;enumeration value="IBW"/>
- *     &lt;enumeration value="IBU"/>
- *     &lt;enumeration value="IKK"/>
- *     &lt;enumeration value="IKU"/>
- *     &lt;enumeration value="IKW"/>
- *     &lt;enumeration value="KTH"/>
- *     &lt;enumeration value="KTR"/>
- *     &lt;enumeration value="KKZ"/>
- *     &lt;enumeration value="TST"/>
- *     &lt;enumeration value="UPD"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "OrderTType")
-@XmlEnum
-public enum OrderTType {
-
-
-    /**
-     * Senden der Public Keys für Authentifikation und Verschlüsselung, 
bankfachlich signiert mit FTAM-Signaturschlüssel
-     * 
-     */
-    HSA("HSA"),
-
-    /**
-     * Senden der Public Keys zur Authentifikation und zur Verschlüsselung
-     * 
-     */
-    HIA("HIA"),
-
-    /**
-     * Abholen der Public Keys der Bank
-     * 
-     */
-    HPB("HPB"),
-
-    /**
-     * Ändern der Public Keys zur Authentifikation und zur Verschlüsselung
-     * 
-     */
-    HCA("HCA"),
-
-    /**
-     * Abholen Bankparameter für internetbasierten Standard
-     * 
-     */
-    HPD("HPD"),
-
-    /**
-     * Abholen VEU Übersicht
-     * 
-     */
-    HVU("HVU"),
-
-    /**
-     * Abholen VEU Auftragsdaten (Daten-trägerbegleitzettel)
-     * 
-     */
-    HVD("HVD"),
-
-    /**
-     * Abholen VEU Auftragsdaten ( Transakti-onsdetails gemäß Parametervorgabe)
-     * 
-     */
-    HVT("HVT"),
-
-    /**
-     * Senden EU zu bestehendem VEU-Auftrag
-     * 
-     */
-    HVE("HVE"),
-
-    /**
-     * Senden Stornierung für bestehenden VEU-Auftrag
-     * 
-     */
-    HVS("HVS"),
-
-    /**
-     * Abholen Konfigurationsdaten des Teilnehmers
-     * 
-     */
-    HKD("HKD"),
-
-    /**
-     * Abholen Übersicht zu abrufbaren Aufträgen
-     * 
-     */
-    HAA("HAA"),
-
-    /**
-     * Senden Importakkreditiv Änderung
-     * 
-     */
-    AAE("AAE"),
-
-    /**
-     * Senden Exportakkreditive
-     * 
-     */
-    AEA("AEA"),
-
-    /**
-     * Senden Import-Akkreditive Avisierung
-     * 
-     */
-    AIA("AIA"),
-
-    /**
-     * Abholen Import-Akkreditive
-     * 
-     */
-    AKA("AKA"),
-
-    /**
-     * AWV-Meldung senden
-     * 
-     */
-    AWV("AWV"),
-
-    /**
-     * AZV im Magnetbandformat senden (Satzlänge variabel)
-     * 
-     */
-    AZM("AZM"),
-
-    /**
-     * AZV im Diskettenformat senden
-     * 
-     */
-    AZV("AZV"),
-
-    /**
-     * AZV im Magnetbandformat senden (Satzlängenfeld 2 Bytes)
-     * 
-     */
-    @XmlEnumValue("AZ2")
-    AZ_2("AZ2"),
-
-    /**
-     * AZV im Magnetbandformat senden (Satzlängenfeld 4 Bytes)
-     * 
-     */
-    @XmlEnumValue("AZ4")
-    AZ_4("AZ4"),
-
-    /**
-     * Abholen Devisenhandelsbestätigung
-     * 
-     */
-    DDG("DDG"),
-
-    /**
-     * Senden Devisenhandelsbestätigung
-     * 
-     */
-    DHB("DHB"),
-
-    /**
-     * Eilauftrag (IZV im DTAUS0-Format) senden
-     * 
-     */
-    DTE("DTE"),
-
-    /**
-     * IZV-Datei abholen
-     * 
-     */
-    DTI("DTI"),
-
-    /**
-     * MCV-Datei abholen (Format analog MCV)
-     * 
-     */
-    DTM("DTM"),
-
-    /**
-     * Zahlungsverkehrsdateien von Service-Rechenzentren senden
-     * 
-     */
-    DTV("DTV"),
-
-    /**
-     * MC2-Datei abholen (Format analog MC2)
-     * 
-     */
-    @XmlEnumValue("DT2")
-    DT_2("DT2"),
-
-    /**
-     * MC4-Datei abholen (Format analog MC4)
-     * 
-     */
-    @XmlEnumValue("DT4")
-    DT_4("DT4"),
-
-    /**
-     * Exportakkreditive abholen
-     * 
-     */
-    EAB("EAB"),
-
-    /**
-     * Senden electronic-cash Lastschriftdatei
-     * 
-     */
-    ECS("ECS"),
-
-    /**
-     * Senden Maestro-Lastschriftdatei
-     * 
-     */
-    EDC("EDC"),
-
-    /**
-     * EDIFACT abholen ASCII
-     * 
-     */
-    EEA("EEA"),
-
-    /**
-     * EDIFACT abholen EBCDIC
-     * 
-     */
-    EEZ("EEZ"),
-
-    /**
-     * Ausführungsanzeige (Exportinkasso) Bank an Kunde abholen
-     * 
-     */
-    EIB("EIB"),
-
-    /**
-     * Senden Exportinkassi
-     * 
-     */
-    EIK("EIK"),
-
-    /**
-     * EDIFACT senden ASCII
-     * 
-     */
-    ESA("ESA"),
-
-    /**
-     * EU-Standardüberweisung (Zahlungsart 13) im Magnetbandformat 
(Satzlängenfeld 4 Bytes)
-     * 
-     */
-    ESM("ESM"),
-
-    /**
-     * Einreichung von EDIFACT-Lastschriften
-     * 
-     */
-    ESR("ESR"),
-
-    /**
-     * EDIFACT senden EBCDIC
-     * 
-     */
-    ESZ("ESZ"),
-
-    /**
-     * EU-Standardüberweisung (Zahlungsart 13)
-     * 
-     */
-    ESU("ESU"),
-
-    /**
-     * Taggleiche grenzüberschreitende Euro-Eilzahlung
-     * 
-     */
-    EUE("EUE"),
-
-    /**
-     * Abholen Garantien
-     * 
-     */
-    GAB("GAB"),
-
-    /**
-     * Senden Garantien
-     * 
-     */
-    GAK("GAK"),
-
-    /**
-     * GeldKarte-Umsatz senden (Datenaufbau gemäß GeldKarte-Spezifikation)
-     * 
-     */
-    GKT("GKT"),
-
-    /**
-     * Internationale Lastschriften
-     * 
-     */
-    IDD("IDD"),
-
-    /**
-     * Abholen Importinkassi
-     * 
-     */
-    IIB("IIB"),
-
-    /**
-     * Senden Importinkassi
-     * 
-     */
-    IIK("IIK"),
-
-    /**
-     * Internationaler Zahlungsverkehr
-     * 
-     */
-    INT("INT"),
-
-    /**
-     * Inlandszahlungsverkehrsauftrag senden (nur Gutschriften)
-     * 
-     */
-    IZG("IZG"),
-
-    /**
-     * Inlandszahlungsverkehrsauftrag senden (nur Lastschriften)
-     * 
-     */
-    IZL("IZL"),
-
-    /**
-     * Inlandszahlungsverkehrsauftrag senden
-     * 
-     */
-    IZV("IZV"),
-
-    /**
-     * Abholen Magnetband-Datei aus optischer Beleglesung
-     * 
-     */
-    MAO("MAO"),
-
-    /**
-     * Senden IZV-Magnetbandformat (Satzlängenfeld 4 Bytes)
-     * 
-     */
-    MCV("MCV"),
-
-    /**
-     * Senden IZV-Magnetbandformat (Satzlängenfeld 2 Bytes)
-     * 
-     */
-    @XmlEnumValue("MC2")
-    MC_2("MC2"),
-
-    /**
-     * Senden IZV-Magnetbandformat (Satzlänge variabel)
-     * 
-     */
-    @XmlEnumValue("MC4")
-    MC_4("MC4"),
-
-    /**
-     * Senden POZ-Datei
-     * 
-     */
-    POZ("POZ"),
-
-    /**
-     * Rücklastschrift an Kunde
-     * 
-     */
-    RDT("RDT"),
-
-    /**
-     * Request for Transfer
-     * 
-     */
-    RFT("RFT"),
-
-    /**
-     * Abholen Swift-Tagesauszüge
-     * 
-     */
-    STA("STA"),
-
-    /**
-     * Abholen kurzfristige Vormerkposten
-     * 
-     */
-    VMK("VMK"),
-
-    /**
-     * Abholen Wertpapierabrechnung
-     * 
-     */
-    WPA("WPA"),
-
-    /**
-     * Abholen Wertpapierausführungsanzeige
-     * 
-     */
-    WPB("WPB"),
-
-    /**
-     * Abholen Depotaufstellung
-     * 
-     */
-    WPC("WPC"),
-
-    /**
-     * Abholen sonstige WP-Umsätze
-     * 
-     */
-    WPD("WPD"),
-
-    /**
-     * Initialisierung der bankfachlichen EU des Teilnehmers.
-     * 
-     */
-    INI("INI"),
-
-    /**
-     * Abholen Kundenprotokoll
-     * 
-     */
-    PTK("PTK"),
-
-    /**
-     * Senden Public Key zur Unterschriftenverifizierung
-     * 
-     */
-    PUB("PUB"),
-
-    /**
-     * Sperren der Zugangsberechtigung
-     * 
-     */
-    SPR("SPR"),
-
-    /**
-     * Abholen Public Key der Bank zur Verschlüsselung
-     * 
-     */
-    VPB("VPB"),
-
-    /**
-     * EDIFACT-FINPAY senden
-     * 
-     */
-    FIN("FIN"),
-
-    /**
-     * Informationen von Zentralstellen
-     * 
-     */
-    IZS("IZS"),
-
-    /**
-     * ec-Karten-Sperrdatei
-     * 
-     */
-    SSP("SSP"),
-
-    /**
-     * Teilausnutzung Importakkreditiv (Kreditinstitut an Kunde)
-     * 
-     */
-    ATA("ATA"),
-
-    /**
-     * Auftragsart für elektronische Kontoauszüge
-     * 
-     */
-    BKA("BKA"),
-
-    /**
-     * Barzahlungskarte
-     * 
-     */
-    BZK("BZK"),
-
-    /**
-     * Devisenkursinformationen abholen (Euro)
-     * 
-     */
-    DKI("DKI"),
-
-    /**
-     * Abholen Devisenmarktinformationen
-     * 
-     */
-    DMI("DMI"),
-
-    /**
-     * Abholen Devisenswapinformationen
-     * 
-     */
-    DSW("DSW"),
-
-    /**
-     * ESG-Datei für Elektronische Zweitunterschrift abholen
-     * 
-     */
-    ESG("ESG"),
-
-    /**
-     * ESP-Datei für Elektronische Zweitunterschrift senden
-     * 
-     */
-    ESP("ESP"),
-
-    /**
-     * Abholen/Senden beliebige Datei
-     * 
-     */
-    FTB("FTB"),
-
-    /**
-     * Freie Textdatei senden/abholen
-     * 
-     */
-    FTD("FTD"),
-
-    /**
-     * Abholen Institutsbestätigungsdatei (Komplettbestand)
-     * 
-     */
-    IBK("IBK"),
-
-    /**
-     * Abholen Institutsbestätigungsdatei (Komplettbestand weitere Datei)
-     * 
-     */
-    IBW("IBW"),
-
-    /**
-     * Abholen Institutsbestätigungsdatei (tägliches Update)
-     * 
-     */
-    IBU("IBU"),
-
-    /**
-     * Senden Institutskonten (Komplettbestand begrenzt auf 170 MB)
-     * 
-     */
-    IKK("IKK"),
-
-    /**
-     * Senden Institutskonten (tägliches Update)
-     * 
-     */
-    IKU("IKU"),
-
-    /**
-     * Senden Institutskonten (Komplettbestand weitere Datei)
-     * 
-     */
-    IKW("IKW"),
-
-    /**
-     * KTOHIN: Automatisiertes Verfahren für die Änderung von Kontonummern und 
Bankleitzahlen
-     * 
-     */
-    KTH("KTH"),
-
-    /**
-     * KTORUECK: Automatisiertes Verfahren für die Änderung von Kontonummern 
und Bankleitzahlen 
-     * 
-     */
-    KTR("KTR"),
-
-    /**
-     * Kontenkonzentration und Saldenausgleich
-     * 
-     */
-    KKZ("KKZ"),
-
-    /**
-     * Senden/Abholen Testdatei (ASCII)
-     * 
-     */
-    TST("TST"),
-
-    /**
-     * Updates abholen
-     * 
-     */
-    UPD("UPD");
-    private final String value;
-
-    OrderTType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static OrderTType fromValue(String v) {
-        for (OrderTType c: OrderTType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PGPDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PGPDataType.java
deleted file mode 100644
index 9dead3d..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PGPDataType.java
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for PGPDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PGPDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;choice>
- *         &lt;sequence>
- *           &lt;element name="PGPKeyID" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           &lt;element name="PGPKeyPacket" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"; minOccurs="0"/>
- *           &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;/sequence>
- *         &lt;sequence>
- *           &lt;element name="PGPKeyPacket" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;/sequence>
- *       &lt;/choice>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PGPDataType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class PGPDataType {
-
-    @XmlElementRefs({
-        @XmlElementRef(name = "PGPKeyID", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "PGPKeyPacket", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false)
-    })
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-
-    /**
-     * Gets the rest of the content model. 
-     * 
-     * <p>
-     * You are getting this "catch-all" property because of the following 
reason: 
-     * The field name "PGPKeyPacket" is used by two different parts of a 
schema. See: 
-     * line 218 of 
file:/home/marcello/prog/libeufin/libeufin/sandbox/src/main/resources/xmldsig-core-schema.xsd
-     * line 213 of 
file:/home/marcello/prog/libeufin/libeufin/sandbox/src/main/resources/xmldsig-core-schema.xsd
-     * <p>
-     * To get rid of this property, apply a property customization to one 
-     * of both of the following declarations to change their names: 
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link Element }
-     * {@link Object }
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/Parameter.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/Parameter.java
deleted file mode 100644
index 1879ea7..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/Parameter.java
+++ /dev/null
@@ -1,196 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="Name" 
type="{http://www.w3.org/2001/XMLSchema}token"/>
- *         &lt;element name="Value">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension 
base="&lt;http://www.w3.org/2001/XMLSchema>anySimpleType">
- *                 &lt;attribute name="Type" use="required" 
type="{http://www.w3.org/2001/XMLSchema}NCName"; />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "name",
-    "value"
-})
-@XmlRootElement(name = "Parameter")
-public class Parameter {
-
-    @XmlElement(name = "Name", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String name;
-    @XmlElement(name = "Value", required = true)
-    protected Parameter.Value value;
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Parameter.Value }
-     *     
-     */
-    public Parameter.Value getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Parameter.Value }
-     *     
-     */
-    public void setValue(Parameter.Value value) {
-        this.value = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension 
base="&lt;http://www.w3.org/2001/XMLSchema>anySimpleType">
-     *       &lt;attribute name="Type" use="required" 
type="{http://www.w3.org/2001/XMLSchema}NCName"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Value {
-
-        @XmlValue
-        @XmlSchemaType(name = "anySimpleType")
-        protected Object value;
-        @XmlAttribute(name = "Type", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        @XmlSchemaType(name = "NCName")
-        protected String type;
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Object }
-         *     
-         */
-        public Object getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Object }
-         *     
-         */
-        public void setValue(Object value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the type property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getType() {
-            return type;
-        }
-
-        /**
-         * Sets the value of the type property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setType(String value) {
-            this.type = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PartnerInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PartnerInfoType.java
deleted file mode 100644
index af7d8c2..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PartnerInfoType.java
+++ /dev/null
@@ -1,310 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for customer data with regard to distributed signatures (order 
types HKD, HTD).
- * 
- * <p>Java class for PartnerInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PartnerInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="AddressInfo" 
type="{urn:org:ebics:H004}AddressInfoType"/>
- *         &lt;element name="BankInfo" 
type="{urn:org:ebics:H004}BankInfoType"/>
- *         &lt;element name="AccountInfo" maxOccurs="unbounded" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;extension base="{urn:org:ebics:H004}AccountType">
- *                 &lt;sequence>
- *                   &lt;element name="UsageOrderTypes" 
type="{urn:org:ebics:H004}OrderTListType" minOccurs="0"/>
- *                   &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *                 &lt;/sequence>
- *                 &lt;attribute name="ID" use="required" 
type="{urn:org:ebics:H004}AccountIDType" />
- *               &lt;/extension>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="OrderInfo" 
type="{urn:org:ebics:H004}AuthOrderInfoType" maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PartnerInfoType", propOrder = {
-    "addressInfo",
-    "bankInfo",
-    "accountInfo",
-    "orderInfo"
-})
-public class PartnerInfoType {
-
-    @XmlElement(name = "AddressInfo", required = true)
-    protected AddressInfoType addressInfo;
-    @XmlElement(name = "BankInfo", required = true)
-    protected BankInfoType bankInfo;
-    @XmlElement(name = "AccountInfo")
-    protected List<PartnerInfoType.AccountInfo> accountInfo;
-    @XmlElement(name = "OrderInfo", required = true)
-    protected List<AuthOrderInfoType> orderInfo;
-
-    /**
-     * Gets the value of the addressInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AddressInfoType }
-     *     
-     */
-    public AddressInfoType getAddressInfo() {
-        return addressInfo;
-    }
-
-    /**
-     * Sets the value of the addressInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AddressInfoType }
-     *     
-     */
-    public void setAddressInfo(AddressInfoType value) {
-        this.addressInfo = value;
-    }
-
-    /**
-     * Gets the value of the bankInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BankInfoType }
-     *     
-     */
-    public BankInfoType getBankInfo() {
-        return bankInfo;
-    }
-
-    /**
-     * Sets the value of the bankInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BankInfoType }
-     *     
-     */
-    public void setBankInfo(BankInfoType value) {
-        this.bankInfo = value;
-    }
-
-    /**
-     * Gets the value of the accountInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the accountInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAccountInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link PartnerInfoType.AccountInfo }
-     * 
-     * 
-     */
-    public List<PartnerInfoType.AccountInfo> getAccountInfo() {
-        if (accountInfo == null) {
-            accountInfo = new ArrayList<PartnerInfoType.AccountInfo>();
-        }
-        return this.accountInfo;
-    }
-
-    /**
-     * Gets the value of the orderInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AuthOrderInfoType }
-     * 
-     * 
-     */
-    public List<AuthOrderInfoType> getOrderInfo() {
-        if (orderInfo == null) {
-            orderInfo = new ArrayList<AuthOrderInfoType>();
-        }
-        return this.orderInfo;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:org:ebics:H004}AccountType">
-     *       &lt;sequence>
-     *         &lt;element name="UsageOrderTypes" 
type="{urn:org:ebics:H004}OrderTListType" minOccurs="0"/>
-     *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
-     *       &lt;/sequence>
-     *       &lt;attribute name="ID" use="required" 
type="{urn:org:ebics:H004}AccountIDType" />
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "usageOrderTypes",
-        "any"
-    })
-    public static class AccountInfo
-        extends AccountType
-    {
-
-        @XmlList
-        @XmlElement(name = "UsageOrderTypes")
-        protected List<String> usageOrderTypes;
-        @XmlAnyElement(lax = true)
-        protected List<Object> any;
-        @XmlAttribute(name = "ID", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String id;
-
-        /**
-         * Gets the value of the usageOrderTypes property.
-         * 
-         * <p>
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a <CODE>set</CODE> method for the 
usageOrderTypes property.
-         * 
-         * <p>
-         * For example, to add a new item, do as follows:
-         * <pre>
-         *    getUsageOrderTypes().add(newItem);
-         * </pre>
-         * 
-         * 
-         * <p>
-         * Objects of the following type(s) are allowed in the list
-         * {@link String }
-         * 
-         * 
-         */
-        public List<String> getUsageOrderTypes() {
-            if (usageOrderTypes == null) {
-                usageOrderTypes = new ArrayList<String>();
-            }
-            return this.usageOrderTypes;
-        }
-
-        /**
-         * Gets the value of the any property.
-         * 
-         * <p>
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a <CODE>set</CODE> method for the any 
property.
-         * 
-         * <p>
-         * For example, to add a new item, do as follows:
-         * <pre>
-         *    getAny().add(newItem);
-         * </pre>
-         * 
-         * 
-         * <p>
-         * Objects of the following type(s) are allowed in the list
-         * {@link Element }
-         * {@link Object }
-         * 
-         * 
-         */
-        public List<Object> getAny() {
-            if (any == null) {
-                any = new ArrayList<Object>();
-            }
-            return this.any;
-        }
-
-        /**
-         * Gets the value of the id property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getID() {
-            return id;
-        }
-
-        /**
-         * Sets the value of the id property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setID(String value) {
-            this.id = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PreValidationAccountAuthType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PreValidationAccountAuthType.java
deleted file mode 100644
index a90eacb..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PreValidationAccountAuthType.java
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für Kontenberechtigungsdaten zur Vorabprüfung.
- * 
- * <p>Java class for PreValidationAccountAuthType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PreValidationAccountAuthType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}AccountType">
- *       &lt;sequence>
- *         &lt;element name="Amount" type="{urn:org:ebics:H004}AmountType" 
minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PreValidationAccountAuthType", propOrder = {
-    "amount"
-})
-public class PreValidationAccountAuthType
-    extends AccountType
-{
-
-    @XmlElement(name = "Amount")
-    protected AmountType amount;
-
-    /**
-     * Gets the value of the amount property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AmountType }
-     *     
-     */
-    public AmountType getAmount() {
-        return amount;
-    }
-
-    /**
-     * Sets the value of the amount property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AmountType }
-     *     
-     */
-    public void setAmount(AmountType value) {
-        this.amount = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PreValidationRequestType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PreValidationRequestType.java
deleted file mode 100644
index d309895..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PreValidationRequestType.java
+++ /dev/null
@@ -1,147 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for pre-validation (request).
- * 
- * <p>Java class for PreValidationRequestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PreValidationRequestType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="DataDigest" 
type="{urn:org:ebics:H004}DataDigestType" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="AccountAuthorisation" 
type="{urn:org:ebics:H004}PreValidationAccountAuthType" maxOccurs="unbounded" 
minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PreValidationRequestType", propOrder = {
-    "dataDigest",
-    "accountAuthorisation",
-    "any"
-})
-public class PreValidationRequestType {
-
-    @XmlElement(name = "DataDigest")
-    protected List<DataDigestType> dataDigest;
-    @XmlElement(name = "AccountAuthorisation")
-    protected List<PreValidationAccountAuthType> accountAuthorisation;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the dataDigest property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the dataDigest 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getDataDigest().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link DataDigestType }
-     * 
-     * 
-     */
-    public List<DataDigestType> getDataDigest() {
-        if (dataDigest == null) {
-            dataDigest = new ArrayList<DataDigestType>();
-        }
-        return this.dataDigest;
-    }
-
-    /**
-     * Gets the value of the accountAuthorisation property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
accountAuthorisation property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAccountAuthorisation().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link PreValidationAccountAuthType }
-     * 
-     * 
-     */
-    public List<PreValidationAccountAuthType> getAccountAuthorisation() {
-        if (accountAuthorisation == null) {
-            accountAuthorisation = new 
ArrayList<PreValidationAccountAuthType>();
-        }
-        return this.accountAuthorisation;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/ProductElementType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/ProductElementType.java
deleted file mode 100644
index 7e75371..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/ProductElementType.java
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für Element mit Kennung des Kundenprodukts bzw. Herstellerkennung 
oder Name.
- * 
- * <p>Java class for ProductElementType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="ProductElementType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;urn:org:ebics:H004>ProductType">
- *       &lt;attribute name="Language" use="required" 
type="{urn:org:ebics:H004}LanguageType" />
- *       &lt;attribute name="InstituteID" 
type="{urn:org:ebics:H004}InstituteIDType" />
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProductElementType", propOrder = {
-    "value"
-})
-public class ProductElementType {
-
-    @XmlValue
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    protected String value;
-    @XmlAttribute(name = "Language", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String language;
-    @XmlAttribute(name = "InstituteID")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    protected String instituteID;
-
-    /**
-     * Datentyp für die Kundenprodukt-ID.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the language property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getLanguage() {
-        return language;
-    }
-
-    /**
-     * Sets the value of the language property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setLanguage(String value) {
-        this.language = value;
-    }
-
-    /**
-     * Gets the value of the instituteID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getInstituteID() {
-        return instituteID;
-    }
-
-    /**
-     * Sets the value of the instituteID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setInstituteID(String value) {
-        this.instituteID = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PubKeyDigestType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PubKeyDigestType.java
deleted file mode 100644
index b00d8bf..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PubKeyDigestType.java
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-
-
-/**
- * Datentyp für Hashwerte und Attribute von öffentlichen Schlüsseln.
- * 
- * <p>Java class for PubKeyDigestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PubKeyDigestType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;urn:org:ebics:H004>DigestType">
- *       &lt;attribute name="Algorithm" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PubKeyDigestType", propOrder = {
-    "value"
-})
-@XmlSeeAlso({
-    
tech.libeufin.messages.ebics.keyrequest.DataEncryptionInfoType.EncryptionPubKeyDigest.class
-})
-public class PubKeyDigestType {
-
-    @XmlValue
-    protected byte[] value;
-    @XmlAttribute(name = "Algorithm", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String algorithm;
-
-    /**
-     * Datentyp für Hashwerte.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setValue(byte[] value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the algorithm property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAlgorithm() {
-        return algorithm;
-    }
-
-    /**
-     * Sets the value of the algorithm property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAlgorithm(String value) {
-        this.algorithm = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PubKeyInfoTypeAtEbicsSignatures.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PubKeyInfoTypeAtEbicsSignatures.java
deleted file mode 100644
index 318fdf3..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PubKeyInfoTypeAtEbicsSignatures.java
+++ /dev/null
@@ -1,143 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für die Darstellung eines öffentlichen RSA-Schlüssels als 
Exponent-Modulus-Kombination oder als X509-Zertifikat.
- * 
- * <p>Java class for PubKeyInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PubKeyInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;sequence>
- *           &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"; 
minOccurs="0"/>
- *           &lt;element name="PubKeyValue" 
type="{http://www.ebics.org/S001}PubKeyValueType"/>
- *         &lt;/sequence>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PubKeyInfoType", namespace = "http://www.ebics.org/S001";, 
propOrder = {
-    "x509Data",
-    "pubKeyValue",
-    "any"
-})
-@XmlSeeAlso({
-    SignaturePubKeyInfoType.class
-})
-public class PubKeyInfoTypeAtEbicsSignatures {
-
-    @XmlElement(name = "X509Data", namespace = 
"http://www.w3.org/2000/09/xmldsig#";)
-    protected X509DataType x509Data;
-    @XmlElement(name = "PubKeyValue", required = true)
-    protected PubKeyValueTypeAtEbicsSignatures pubKeyValue;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the x509Data property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link X509DataType }
-     *     
-     */
-    public X509DataType getX509Data() {
-        return x509Data;
-    }
-
-    /**
-     * Sets the value of the x509Data property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link X509DataType }
-     *     
-     */
-    public void setX509Data(X509DataType value) {
-        this.x509Data = value;
-    }
-
-    /**
-     * Gets the value of the pubKeyValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PubKeyValueTypeAtEbicsSignatures }
-     *     
-     */
-    public PubKeyValueTypeAtEbicsSignatures getPubKeyValue() {
-        return pubKeyValue;
-    }
-
-    /**
-     * Sets the value of the pubKeyValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PubKeyValueTypeAtEbicsSignatures }
-     *     
-     */
-    public void setPubKeyValue(PubKeyValueTypeAtEbicsSignatures value) {
-        this.pubKeyValue = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PubKeyInfoTypeAtEbicsTypes.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PubKeyInfoTypeAtEbicsTypes.java
deleted file mode 100644
index e2719b9..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PubKeyInfoTypeAtEbicsTypes.java
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für die Darstellung eines öffentlichen RSA-Schlüssels als 
Exponent-Modulus-Kombination oder als X509-Zertifikat.
- * 
- * <p>Java class for PubKeyInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PubKeyInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;sequence>
- *           &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"; 
minOccurs="0"/>
- *           &lt;element name="PubKeyValue" 
type="{urn:org:ebics:H004}PubKeyValueType"/>
- *         &lt;/sequence>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PubKeyInfoType", propOrder = {
-    "x509Data",
-    "pubKeyValue",
-    "any"
-})
-@XmlSeeAlso({
-    EncryptionPubKeyInfoType.class,
-    AuthenticationPubKeyInfoType.class
-})
-public class PubKeyInfoTypeAtEbicsTypes {
-
-    @XmlElement(name = "X509Data", namespace = 
"http://www.w3.org/2000/09/xmldsig#";)
-    protected X509DataType x509Data;
-    @XmlElement(name = "PubKeyValue", required = true)
-    protected PubKeyValueTypeAtEbicsTypes pubKeyValue;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the x509Data property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link X509DataType }
-     *     
-     */
-    public X509DataType getX509Data() {
-        return x509Data;
-    }
-
-    /**
-     * Sets the value of the x509Data property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link X509DataType }
-     *     
-     */
-    public void setX509Data(X509DataType value) {
-        this.x509Data = value;
-    }
-
-    /**
-     * Gets the value of the pubKeyValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PubKeyValueTypeAtEbicsTypes }
-     *     
-     */
-    public PubKeyValueTypeAtEbicsTypes getPubKeyValue() {
-        return pubKeyValue;
-    }
-
-    /**
-     * Sets the value of the pubKeyValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PubKeyValueTypeAtEbicsTypes }
-     *     
-     */
-    public void setPubKeyValue(PubKeyValueTypeAtEbicsTypes value) {
-        this.pubKeyValue = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PubKeyValueTypeAtEbicsSignatures.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PubKeyValueTypeAtEbicsSignatures.java
deleted file mode 100644
index cd40c27..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PubKeyValueTypeAtEbicsSignatures.java
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für die Exponent-Modulus-Darstellung eines öffentlichen 
RSA-Schlüssels.
- * 
- * <p>Java class for PubKeyValueType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PubKeyValueType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
- *         &lt;element name="TimeStamp" 
type="{http://www.ebics.org/S001}TimestampType"; minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PubKeyValueType", namespace = "http://www.ebics.org/S001";, 
propOrder = {
-    "rsaKeyValue",
-    "timeStamp",
-    "any"
-})
-public class PubKeyValueTypeAtEbicsSignatures {
-
-    @XmlElement(name = "RSAKeyValue", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, required = true)
-    protected RSAKeyValueType rsaKeyValue;
-    @XmlElement(name = "TimeStamp")
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar timeStamp;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the rsaKeyValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RSAKeyValueType }
-     *     
-     */
-    public RSAKeyValueType getRSAKeyValue() {
-        return rsaKeyValue;
-    }
-
-    /**
-     * Sets the value of the rsaKeyValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RSAKeyValueType }
-     *     
-     */
-    public void setRSAKeyValue(RSAKeyValueType value) {
-        this.rsaKeyValue = value;
-    }
-
-    /**
-     * Gets the value of the timeStamp property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getTimeStamp() {
-        return timeStamp;
-    }
-
-    /**
-     * Sets the value of the timeStamp property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setTimeStamp(XMLGregorianCalendar value) {
-        this.timeStamp = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PubKeyValueTypeAtEbicsTypes.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PubKeyValueTypeAtEbicsTypes.java
deleted file mode 100644
index c01ea6a..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/PubKeyValueTypeAtEbicsTypes.java
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für die Exponent-Modulus-Darstellung eines öffentlichen 
RSA-Schlüssels.
- * 
- * <p>Java class for PubKeyValueType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PubKeyValueType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
- *         &lt;element name="TimeStamp" 
type="{urn:org:ebics:H004}TimestampType" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PubKeyValueType", propOrder = {
-    "rsaKeyValue",
-    "timeStamp",
-    "any"
-})
-public class PubKeyValueTypeAtEbicsTypes {
-
-    @XmlElement(name = "RSAKeyValue", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, required = true)
-    protected RSAKeyValueType rsaKeyValue;
-    @XmlElement(name = "TimeStamp")
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar timeStamp;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the rsaKeyValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RSAKeyValueType }
-     *     
-     */
-    public RSAKeyValueType getRSAKeyValue() {
-        return rsaKeyValue;
-    }
-
-    /**
-     * Sets the value of the rsaKeyValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RSAKeyValueType }
-     *     
-     */
-    public void setRSAKeyValue(RSAKeyValueType value) {
-        this.rsaKeyValue = value;
-    }
-
-    /**
-     * Gets the value of the timeStamp property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getTimeStamp() {
-        return timeStamp;
-    }
-
-    /**
-     * Sets the value of the timeStamp property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setTimeStamp(XMLGregorianCalendar value) {
-        this.timeStamp = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/RSAKeyValueType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/RSAKeyValueType.java
deleted file mode 100644
index da95156..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/RSAKeyValueType.java
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for RSAKeyValueType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="RSAKeyValueType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="Modulus" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         &lt;element name="Exponent" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RSAKeyValueType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "modulus",
-    "exponent"
-})
-public class RSAKeyValueType {
-
-    @XmlElement(name = "Modulus", required = true)
-    protected byte[] modulus;
-    @XmlElement(name = "Exponent", required = true)
-    protected byte[] exponent;
-
-    /**
-     * Gets the value of the modulus property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getModulus() {
-        return modulus;
-    }
-
-    /**
-     * Sets the value of the modulus property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setModulus(byte[] value) {
-        this.modulus = value;
-    }
-
-    /**
-     * Gets the value of the exponent property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getExponent() {
-        return exponent;
-    }
-
-    /**
-     * Sets the value of the exponent property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setExponent(byte[] value) {
-        this.exponent = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/ReferenceType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/ReferenceType.java
deleted file mode 100644
index 605cb43..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/ReferenceType.java
+++ /dev/null
@@ -1,214 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for ReferenceType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="ReferenceType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms"; 
minOccurs="0"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *       &lt;attribute name="URI" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *       &lt;attribute name="Type" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ReferenceType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "transforms",
-    "digestMethod",
-    "digestValue"
-})
-public class ReferenceType {
-
-    @XmlElement(name = "Transforms")
-    protected TransformsType transforms;
-    @XmlElement(name = "DigestMethod", required = true)
-    protected DigestMethodType digestMethod;
-    @XmlElement(name = "DigestValue", required = true)
-    protected byte[] digestValue;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-    @XmlAttribute(name = "URI")
-    @XmlSchemaType(name = "anyURI")
-    protected String uri;
-    @XmlAttribute(name = "Type")
-    @XmlSchemaType(name = "anyURI")
-    protected String type;
-
-    /**
-     * Gets the value of the transforms property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TransformsType }
-     *     
-     */
-    public TransformsType getTransforms() {
-        return transforms;
-    }
-
-    /**
-     * Sets the value of the transforms property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TransformsType }
-     *     
-     */
-    public void setTransforms(TransformsType value) {
-        this.transforms = value;
-    }
-
-    /**
-     * Gets the value of the digestMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DigestMethodType }
-     *     
-     */
-    public DigestMethodType getDigestMethod() {
-        return digestMethod;
-    }
-
-    /**
-     * Sets the value of the digestMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DigestMethodType }
-     *     
-     */
-    public void setDigestMethod(DigestMethodType value) {
-        this.digestMethod = value;
-    }
-
-    /**
-     * Gets the value of the digestValue property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getDigestValue() {
-        return digestValue;
-    }
-
-    /**
-     * Sets the value of the digestValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setDigestValue(byte[] value) {
-        this.digestValue = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the uri property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getURI() {
-        return uri;
-    }
-
-    /**
-     * Sets the value of the uri property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setURI(String value) {
-        this.uri = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/RetrievalMethodType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/RetrievalMethodType.java
deleted file mode 100644
index c5aae4c..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/RetrievalMethodType.java
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for RetrievalMethodType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="RetrievalMethodType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms"; 
minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="URI" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *       &lt;attribute name="Type" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RetrievalMethodType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "transforms"
-})
-public class RetrievalMethodType {
-
-    @XmlElement(name = "Transforms")
-    protected TransformsType transforms;
-    @XmlAttribute(name = "URI")
-    @XmlSchemaType(name = "anyURI")
-    protected String uri;
-    @XmlAttribute(name = "Type")
-    @XmlSchemaType(name = "anyURI")
-    protected String type;
-
-    /**
-     * Gets the value of the transforms property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TransformsType }
-     *     
-     */
-    public TransformsType getTransforms() {
-        return transforms;
-    }
-
-    /**
-     * Sets the value of the transforms property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TransformsType }
-     *     
-     */
-    public void setTransforms(TransformsType value) {
-        this.transforms = value;
-    }
-
-    /**
-     * Gets the value of the uri property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getURI() {
-        return uri;
-    }
-
-    /**
-     * Sets the value of the uri property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setURI(String value) {
-        this.uri = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SPKIDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SPKIDataType.java
deleted file mode 100644
index bbe7721..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SPKIDataType.java
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for SPKIDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SPKIDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence maxOccurs="unbounded">
- *         &lt;element name="SPKISexp" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         &lt;any processContents='lax' namespace='##other' minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SPKIDataType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "spkiSexpAndAny"
-})
-public class SPKIDataType {
-
-    @XmlElementRef(name = "SPKISexp", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class)
-    @XmlAnyElement(lax = true)
-    protected List<Object> spkiSexpAndAny;
-
-    /**
-     * Gets the value of the spkiSexpAndAny property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
spkiSexpAndAny property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSPKISexpAndAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getSPKISexpAndAny() {
-        if (spkiSexpAndAny == null) {
-            spkiSexpAndAny = new ArrayList<Object>();
-        }
-        return this.spkiSexpAndAny;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignatureCertificateInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignatureCertificateInfoType.java
deleted file mode 100644
index 4fc8caa..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignatureCertificateInfoType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Data type for public authorisation (ES) key.
- * 
- * <p>Java class for SignatureCertificateInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignatureCertificateInfoType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}CertificateInfoType">
- *       &lt;sequence>
- *         &lt;element name="SignatureVersion" 
type="{urn:org:ebics:H004}SignatureVersionType"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignatureCertificateInfoType", propOrder = {
-    "signatureVersion"
-})
-public class SignatureCertificateInfoType
-    extends CertificateInfoType
-{
-
-    @XmlElement(name = "SignatureVersion", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String signatureVersion;
-
-    /**
-     * Gets the value of the signatureVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSignatureVersion() {
-        return signatureVersion;
-    }
-
-    /**
-     * Sets the value of the signatureVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSignatureVersion(String value) {
-        this.signatureVersion = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignatureMethodType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignatureMethodType.java
deleted file mode 100644
index a5b64d2..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignatureMethodType.java
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for SignatureMethodType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignatureMethodType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="HMACOutputLength" 
type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType"; minOccurs="0"/>
- *         &lt;any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Algorithm" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignatureMethodType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class SignatureMethodType {
-
-    @XmlElementRef(name = "HMACOutputLength", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false)
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Algorithm", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String algorithm;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
-     * {@link Object }
-     * {@link String }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-    /**
-     * Gets the value of the algorithm property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAlgorithm() {
-        return algorithm;
-    }
-
-    /**
-     * Sets the value of the algorithm property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAlgorithm(String value) {
-        this.algorithm = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignaturePropertiesType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignaturePropertiesType.java
deleted file mode 100644
index fe4252e..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignaturePropertiesType.java
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for SignaturePropertiesType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignaturePropertiesType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element 
ref="{http://www.w3.org/2000/09/xmldsig#}SignatureProperty"; 
maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignaturePropertiesType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "signatureProperty"
-})
-public class SignaturePropertiesType {
-
-    @XmlElement(name = "SignatureProperty", required = true)
-    protected List<SignaturePropertyType> signatureProperty;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the signatureProperty property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
signatureProperty property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSignatureProperty().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SignaturePropertyType }
-     * 
-     * 
-     */
-    public List<SignaturePropertyType> getSignatureProperty() {
-        if (signatureProperty == null) {
-            signatureProperty = new ArrayList<SignaturePropertyType>();
-        }
-        return this.signatureProperty;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignaturePropertyType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignaturePropertyType.java
deleted file mode 100644
index e8376bf..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignaturePropertyType.java
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for SignaturePropertyType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignaturePropertyType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;choice maxOccurs="unbounded">
- *         &lt;any processContents='lax' namespace='##other'/>
- *       &lt;/choice>
- *       &lt;attribute name="Target" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignaturePropertyType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class SignaturePropertyType {
-
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Target", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String target;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * {@link String }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-    /**
-     * Gets the value of the target property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTarget() {
-        return target;
-    }
-
-    /**
-     * Sets the value of the target property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTarget(String value) {
-        this.target = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignaturePubKeyInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignaturePubKeyInfoType.java
deleted file mode 100644
index 4343d5b..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignaturePubKeyInfoType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für öffentliche bankfachliche Schlüssel.
- * 
- * <p>Java class for SignaturePubKeyInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignaturePubKeyInfoType">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.ebics.org/S001}PubKeyInfoType";>
- *       &lt;sequence>
- *         &lt;element name="SignatureVersion" 
type="{http://www.ebics.org/S001}SignatureVersionType"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignaturePubKeyInfoType", namespace = 
"http://www.ebics.org/S001";, propOrder = {
-    "signatureVersion"
-})
-public class SignaturePubKeyInfoType
-    extends PubKeyInfoTypeAtEbicsSignatures
-{
-
-    @XmlElement(name = "SignatureVersion", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String signatureVersion;
-
-    /**
-     * Gets the value of the signatureVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSignatureVersion() {
-        return signatureVersion;
-    }
-
-    /**
-     * Sets the value of the signatureVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSignatureVersion(String value) {
-        this.signatureVersion = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignaturePubKeyOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignaturePubKeyOrderDataType.java
deleted file mode 100644
index bc22238..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignaturePubKeyOrderDataType.java
+++ /dev/null
@@ -1,172 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Public Key Dateien unabhängig von der Auftragsart / 
Geschäftsvorfall.
- * 
- * <p>Java class for SignaturePubKeyOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignaturePubKeyOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="SignaturePubKeyInfo" 
type="{http://www.ebics.org/S001}SignaturePubKeyInfoType"/>
- *         &lt;element name="PartnerID" 
type="{http://www.ebics.org/S001}PartnerIDType"/>
- *         &lt;element name="UserID" 
type="{http://www.ebics.org/S001}UserIDType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignaturePubKeyOrderDataType", namespace = 
"http://www.ebics.org/S001";, propOrder = {
-    "signaturePubKeyInfo",
-    "partnerID",
-    "userID",
-    "any"
-})
-public class SignaturePubKeyOrderDataType {
-
-    @XmlElement(name = "SignaturePubKeyInfo", required = true)
-    protected SignaturePubKeyInfoType signaturePubKeyInfo;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the signaturePubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignaturePubKeyInfoType }
-     *     
-     */
-    public SignaturePubKeyInfoType getSignaturePubKeyInfo() {
-        return signaturePubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the signaturePubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignaturePubKeyInfoType }
-     *     
-     */
-    public void setSignaturePubKeyInfo(SignaturePubKeyInfoType value) {
-        this.signaturePubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignatureType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignatureType.java
deleted file mode 100644
index 7b3ce88..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignatureType.java
+++ /dev/null
@@ -1,195 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for SignatureType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignatureType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SignedInfo"/>
- *         &lt;element 
ref="{http://www.w3.org/2000/09/xmldsig#}SignatureValue"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo"; 
minOccurs="0"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Object"; 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignatureType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "signedInfo",
-    "signatureValue",
-    "keyInfo",
-    "object"
-})
-public class SignatureType {
-
-    @XmlElement(name = "SignedInfo", required = true)
-    protected SignedInfoType signedInfo;
-    @XmlElement(name = "SignatureValue", required = true)
-    protected SignatureValueType signatureValue;
-    @XmlElement(name = "KeyInfo")
-    protected KeyInfoType keyInfo;
-    @XmlElement(name = "Object")
-    protected List<ObjectType> object;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the signedInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignedInfoType }
-     *     
-     */
-    public SignedInfoType getSignedInfo() {
-        return signedInfo;
-    }
-
-    /**
-     * Sets the value of the signedInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignedInfoType }
-     *     
-     */
-    public void setSignedInfo(SignedInfoType value) {
-        this.signedInfo = value;
-    }
-
-    /**
-     * Gets the value of the signatureValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignatureValueType }
-     *     
-     */
-    public SignatureValueType getSignatureValue() {
-        return signatureValue;
-    }
-
-    /**
-     * Sets the value of the signatureValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignatureValueType }
-     *     
-     */
-    public void setSignatureValue(SignatureValueType value) {
-        this.signatureValue = value;
-    }
-
-    /**
-     * Gets the value of the keyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link KeyInfoType }
-     *     
-     */
-    public KeyInfoType getKeyInfo() {
-        return keyInfo;
-    }
-
-    /**
-     * Sets the value of the keyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link KeyInfoType }
-     *     
-     */
-    public void setKeyInfo(KeyInfoType value) {
-        this.keyInfo = value;
-    }
-
-    /**
-     * Gets the value of the object property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the object 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getObject().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ObjectType }
-     * 
-     * 
-     */
-    public List<ObjectType> getObject() {
-        if (object == null) {
-            object = new ArrayList<ObjectType>();
-        }
-        return this.object;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignatureValueType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignatureValueType.java
deleted file mode 100644
index 1e12d65..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignatureValueType.java
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for SignatureValueType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignatureValueType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>base64Binary">
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignatureValueType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "value"
-})
-public class SignatureValueType {
-
-    @XmlValue
-    protected byte[] value;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setValue(byte[] value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignedInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignedInfoType.java
deleted file mode 100644
index 7395323..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignedInfoType.java
+++ /dev/null
@@ -1,167 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for SignedInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignedInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element 
ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod"/>
- *         &lt;element 
ref="{http://www.w3.org/2000/09/xmldsig#}SignatureMethod"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Reference"; 
maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignedInfoType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "canonicalizationMethod",
-    "signatureMethod",
-    "reference"
-})
-public class SignedInfoType {
-
-    @XmlElement(name = "CanonicalizationMethod", required = true)
-    protected CanonicalizationMethodType canonicalizationMethod;
-    @XmlElement(name = "SignatureMethod", required = true)
-    protected SignatureMethodType signatureMethod;
-    @XmlElement(name = "Reference", required = true)
-    protected List<ReferenceType> reference;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the canonicalizationMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CanonicalizationMethodType }
-     *     
-     */
-    public CanonicalizationMethodType getCanonicalizationMethod() {
-        return canonicalizationMethod;
-    }
-
-    /**
-     * Sets the value of the canonicalizationMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CanonicalizationMethodType }
-     *     
-     */
-    public void setCanonicalizationMethod(CanonicalizationMethodType value) {
-        this.canonicalizationMethod = value;
-    }
-
-    /**
-     * Gets the value of the signatureMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignatureMethodType }
-     *     
-     */
-    public SignatureMethodType getSignatureMethod() {
-        return signatureMethod;
-    }
-
-    /**
-     * Sets the value of the signatureMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignatureMethodType }
-     *     
-     */
-    public void setSignatureMethod(SignatureMethodType value) {
-        this.signatureMethod = value;
-    }
-
-    /**
-     * Gets the value of the reference property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the reference 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getReference().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ReferenceType }
-     * 
-     * 
-     */
-    public List<ReferenceType> getReference() {
-        if (reference == null) {
-            reference = new ArrayList<ReferenceType>();
-        }
-        return this.reference;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignerInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignerInfoType.java
deleted file mode 100644
index b07491b..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/SignerInfoType.java
+++ /dev/null
@@ -1,319 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Informationen zu einem Unterzeichner eines VEU-Auftrags (HVU, 
HVD).
- * 
- * <p>Java class for SignerInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignerInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;element name="Name" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;element name="Timestamp" 
type="{urn:org:ebics:H004}TimestampType"/>
- *         &lt;element name="Permission">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;attGroup ref="{urn:org:ebics:H004}SignerPermission"/>
- *                 &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignerInfoType", propOrder = {
-    "partnerID",
-    "userID",
-    "name",
-    "timestamp",
-    "permission",
-    "any"
-})
-public class SignerInfoType {
-
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlElement(name = "Name")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String name;
-    @XmlElement(name = "Timestamp", required = true)
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar timestamp;
-    @XmlElement(name = "Permission", required = true)
-    protected SignerInfoType.Permission permission;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the timestamp property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getTimestamp() {
-        return timestamp;
-    }
-
-    /**
-     * Sets the value of the timestamp property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setTimestamp(XMLGregorianCalendar value) {
-        this.timestamp = value;
-    }
-
-    /**
-     * Gets the value of the permission property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignerInfoType.Permission }
-     *     
-     */
-    public SignerInfoType.Permission getPermission() {
-        return permission;
-    }
-
-    /**
-     * Sets the value of the permission property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignerInfoType.Permission }
-     *     
-     */
-    public void setPermission(SignerInfoType.Permission value) {
-        this.permission = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}SignerPermission"/>
-     *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Permission {
-
-        @XmlAttribute(name = "AuthorisationLevel", required = true)
-        protected AuthorisationLevelType authorisationLevel;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Gets the value of the authorisationLevel property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link AuthorisationLevelType }
-         *     
-         */
-        public AuthorisationLevelType getAuthorisationLevel() {
-            return authorisationLevel;
-        }
-
-        /**
-         * Sets the value of the authorisationLevel property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link AuthorisationLevelType }
-         *     
-         */
-        public void setAuthorisationLevel(AuthorisationLevelType value) {
-            this.authorisationLevel = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/StandardOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/StandardOrderParamsType.java
deleted file mode 100644
index 0ddf1bc..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/StandardOrderParamsType.java
+++ /dev/null
@@ -1,169 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter bei Standard-Auftragsarten.
- * 
- * <p>Java class for StandardOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="StandardOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="DateRange" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;sequence>
- *                   &lt;element name="Start" 
type="{urn:org:ebics:H004}DateType"/>
- *                   &lt;element name="End" 
type="{urn:org:ebics:H004}DateType"/>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "StandardOrderParamsType", propOrder = {
-    "dateRange"
-})
-public class StandardOrderParamsType {
-
-    @XmlElement(name = "DateRange")
-    protected StandardOrderParamsType.DateRange dateRange;
-
-    /**
-     * Gets the value of the dateRange property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link StandardOrderParamsType.DateRange }
-     *     
-     */
-    public StandardOrderParamsType.DateRange getDateRange() {
-        return dateRange;
-    }
-
-    /**
-     * Sets the value of the dateRange property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link StandardOrderParamsType.DateRange }
-     *     
-     */
-    public void setDateRange(StandardOrderParamsType.DateRange value) {
-        this.dateRange = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;sequence>
-     *         &lt;element name="Start" type="{urn:org:ebics:H004}DateType"/>
-     *         &lt;element name="End" type="{urn:org:ebics:H004}DateType"/>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "start",
-        "end"
-    })
-    public static class DateRange {
-
-        @XmlElement(name = "Start", required = true)
-        @XmlSchemaType(name = "date")
-        protected XMLGregorianCalendar start;
-        @XmlElement(name = "End", required = true)
-        @XmlSchemaType(name = "date")
-        protected XMLGregorianCalendar end;
-
-        /**
-         * Gets the value of the start property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public XMLGregorianCalendar getStart() {
-            return start;
-        }
-
-        /**
-         * Sets the value of the start property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public void setStart(XMLGregorianCalendar value) {
-            this.start = value;
-        }
-
-        /**
-         * Gets the value of the end property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public XMLGregorianCalendar getEnd() {
-            return end;
-        }
-
-        /**
-         * Sets the value of the end property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public void setEnd(XMLGregorianCalendar value) {
-            this.end = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/StaticHeaderBaseType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/StaticHeaderBaseType.java
deleted file mode 100644
index 7e166aa..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/StaticHeaderBaseType.java
+++ /dev/null
@@ -1,357 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.datatype.XMLGregorianCalendar;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für den statischen EBICS-Header (allgemein).
- * 
- * <p>Java class for StaticHeaderBaseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="StaticHeaderBaseType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="HostID" type="{urn:org:ebics:H004}HostIDType"/>
- *         &lt;element name="Nonce" type="{urn:org:ebics:H004}NonceType" 
minOccurs="0"/>
- *         &lt;element name="Timestamp" 
type="{urn:org:ebics:H004}TimestampType" minOccurs="0"/>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;element name="SystemID" type="{urn:org:ebics:H004}UserIDType" 
minOccurs="0"/>
- *         &lt;element name="Product" 
type="{urn:org:ebics:H004}ProductElementType" minOccurs="0"/>
- *         &lt;element name="OrderDetails" 
type="{urn:org:ebics:H004}OrderDetailsType"/>
- *         &lt;element name="SecurityMedium" 
type="{urn:org:ebics:H004}SecurityMediumType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "StaticHeaderBaseType", propOrder = {
-    "hostID",
-    "nonce",
-    "timestamp",
-    "partnerID",
-    "userID",
-    "systemID",
-    "product",
-    "orderDetails",
-    "securityMedium",
-    "any"
-})
-@XmlSeeAlso({
-    NoPubKeyDigestsRequestStaticHeaderType.class,
-    UnsignedRequestStaticHeaderType.class,
-    UnsecuredRequestStaticHeaderType.class
-})
-public abstract class StaticHeaderBaseType {
-
-    @XmlElement(name = "HostID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String hostID;
-    @XmlElement(name = "Nonce", type = String.class)
-    @XmlJavaTypeAdapter(HexBinaryAdapter.class)
-    @XmlSchemaType(name = "hexBinary")
-    protected byte[] nonce;
-    @XmlElement(name = "Timestamp")
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar timestamp;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlElement(name = "SystemID")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String systemID;
-    @XmlElementRef(name = "Product", namespace = "urn:org:ebics:H004", type = 
JAXBElement.class, required = false)
-    protected JAXBElement<ProductElementType> product;
-    @XmlElement(name = "OrderDetails", required = true)
-    protected OrderDetailsType orderDetails;
-    @XmlElement(name = "SecurityMedium", required = true)
-    protected String securityMedium;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the hostID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getHostID() {
-        return hostID;
-    }
-
-    /**
-     * Sets the value of the hostID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setHostID(String value) {
-        this.hostID = value;
-    }
-
-    /**
-     * Gets the value of the nonce property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public byte[] getNonce() {
-        return nonce;
-    }
-
-    /**
-     * Sets the value of the nonce property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNonce(byte[] value) {
-        this.nonce = value;
-    }
-
-    /**
-     * Gets the value of the timestamp property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getTimestamp() {
-        return timestamp;
-    }
-
-    /**
-     * Sets the value of the timestamp property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setTimestamp(XMLGregorianCalendar value) {
-        this.timestamp = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the systemID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSystemID() {
-        return systemID;
-    }
-
-    /**
-     * Sets the value of the systemID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSystemID(String value) {
-        this.systemID = value;
-    }
-
-    /**
-     * Gets the value of the product property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link JAXBElement }{@code <}{@link ProductElementType }{@code >}
-     *     
-     */
-    public JAXBElement<ProductElementType> getProduct() {
-        return product;
-    }
-
-    /**
-     * Sets the value of the product property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link JAXBElement }{@code <}{@link ProductElementType }{@code >}
-     *     
-     */
-    public void setProduct(JAXBElement<ProductElementType> value) {
-        this.product = value;
-    }
-
-    /**
-     * Gets the value of the orderDetails property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link OrderDetailsType }
-     *     
-     */
-    public OrderDetailsType getOrderDetails() {
-        return orderDetails;
-    }
-
-    /**
-     * Sets the value of the orderDetails property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link OrderDetailsType }
-     *     
-     */
-    public void setOrderDetails(OrderDetailsType value) {
-        this.orderDetails = value;
-    }
-
-    /**
-     * Gets the value of the securityMedium property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSecurityMedium() {
-        return securityMedium;
-    }
-
-    /**
-     * Sets the value of the securityMedium property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSecurityMedium(String value) {
-        this.securityMedium = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/TransactionPhaseType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/TransactionPhaseType.java
deleted file mode 100644
index 5aec19b..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/TransactionPhaseType.java
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for TransactionPhaseType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="TransactionPhaseType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token";>
- *     &lt;enumeration value="Initialisation"/>
- *     &lt;enumeration value="Transfer"/>
- *     &lt;enumeration value="Receipt"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "TransactionPhaseType")
-@XmlEnum
-public enum TransactionPhaseType {
-
-
-    /**
-     * Transaktionsinitialisierung
-     * 
-     */
-    @XmlEnumValue("Initialisation")
-    INITIALISATION("Initialisation"),
-
-    /**
-     * Auftragsdatentransfer
-     * 
-     */
-    @XmlEnumValue("Transfer")
-    TRANSFER("Transfer"),
-
-    /**
-     * Quittungstransfer
-     * 
-     */
-    @XmlEnumValue("Receipt")
-    RECEIPT("Receipt");
-    private final String value;
-
-    TransactionPhaseType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static TransactionPhaseType fromValue(String v) {
-        for (TransactionPhaseType c: TransactionPhaseType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/TransferReceiptRequestType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/TransferReceiptRequestType.java
deleted file mode 100644
index 5b388f9..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/TransferReceiptRequestType.java
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für den Transfer von Transferquittungen.
- * 
- * <p>Java class for TransferReceiptRequestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="TransferReceiptRequestType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="ReceiptCode" 
type="{urn:org:ebics:H004}ReceiptCodeType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TransferReceiptRequestType", propOrder = {
-    "receiptCode",
-    "any"
-})
-public class TransferReceiptRequestType {
-
-    @XmlElement(name = "ReceiptCode")
-    @XmlSchemaType(name = "nonNegativeInteger")
-    protected int receiptCode;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the receiptCode property.
-     * 
-     */
-    public int getReceiptCode() {
-        return receiptCode;
-    }
-
-    /**
-     * Sets the value of the receiptCode property.
-     * 
-     */
-    public void setReceiptCode(int value) {
-        this.receiptCode = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/TransferReceiptResponseType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/TransferReceiptResponseType.java
deleted file mode 100644
index 806037d..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/TransferReceiptResponseType.java
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.datatype.XMLGregorianCalendar;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für den Transfer von Antwortcodes.
- * 
- * <p>Java class for TransferReceiptResponseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="TransferReceiptResponseType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="ReturnCodeReceipt" 
type="{urn:org:ebics:H004}ReturnCodeType"/>
- *         &lt;element name="TimestampBankParameter" 
type="{urn:org:ebics:H004}TimestampType" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TransferReceiptResponseType", propOrder = {
-    "returnCodeReceipt",
-    "timestampBankParameter",
-    "any"
-})
-public class TransferReceiptResponseType {
-
-    @XmlElement(name = "ReturnCodeReceipt", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String returnCodeReceipt;
-    @XmlElement(name = "TimestampBankParameter")
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar timestampBankParameter;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the returnCodeReceipt property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getReturnCodeReceipt() {
-        return returnCodeReceipt;
-    }
-
-    /**
-     * Sets the value of the returnCodeReceipt property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setReturnCodeReceipt(String value) {
-        this.returnCodeReceipt = value;
-    }
-
-    /**
-     * Gets the value of the timestampBankParameter property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getTimestampBankParameter() {
-        return timestampBankParameter;
-    }
-
-    /**
-     * Sets the value of the timestampBankParameter property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setTimestampBankParameter(XMLGregorianCalendar value) {
-        this.timestampBankParameter = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/TransferType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/TransferType.java
deleted file mode 100644
index 094f387..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/TransferType.java
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for TransferType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="TransferType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token";>
- *     &lt;enumeration value="Upload"/>
- *     &lt;enumeration value="Download"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "TransferType")
-@XmlEnum
-public enum TransferType {
-
-
-    /**
-     * Auftragsdaten werden bei der Anfrage transferiert.
-     * 
-     */
-    @XmlEnumValue("Upload")
-    UPLOAD("Upload"),
-
-    /**
-     * Auftragsdaten werden bei der Antwort transferiert.
-     * 
-     */
-    @XmlEnumValue("Download")
-    DOWNLOAD("Download");
-    private final String value;
-
-    TransferType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static TransferType fromValue(String v) {
-        for (TransferType c: TransferType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/TransformType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/TransformType.java
deleted file mode 100644
index cce9692..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/TransformType.java
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for TransformType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="TransformType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;any processContents='lax' namespace='##other'/>
- *         &lt;element name="XPath" 
type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       &lt;/choice>
- *       &lt;attribute name="Algorithm" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TransformType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class TransformType {
-
-    @XmlElementRef(name = "XPath", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false)
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Algorithm", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String algorithm;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * {@link Element }
-     * {@link Object }
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-    /**
-     * Gets the value of the algorithm property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAlgorithm() {
-        return algorithm;
-    }
-
-    /**
-     * Sets the value of the algorithm property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAlgorithm(String value) {
-        this.algorithm = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/TransformsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/TransformsType.java
deleted file mode 100644
index 59c5c13..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/TransformsType.java
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for TransformsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="TransformsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Transform"; 
maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TransformsType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "transform"
-})
-public class TransformsType {
-
-    @XmlElement(name = "Transform", required = true)
-    protected List<TransformType> transform;
-
-    /**
-     * Gets the value of the transform property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the transform 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getTransform().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link TransformType }
-     * 
-     * 
-     */
-    public List<TransformType> getTransform() {
-        if (transform == null) {
-            transform = new ArrayList<TransformType>();
-        }
-        return this.transform;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/UnsecuredReqOrderDetailsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/UnsecuredReqOrderDetailsType.java
deleted file mode 100644
index cbd39e8..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/UnsecuredReqOrderDetailsType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für OrderDetails im statischen EBICS-Header von 
ebicsUnsecuredRequest.
- * 
- * <p>Java class for UnsecuredReqOrderDetailsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="UnsecuredReqOrderDetailsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{urn:org:ebics:H004}OrderDetailsType">
- *       &lt;sequence>
- *         &lt;element name="OrderType" 
type="{urn:org:ebics:H004}OrderTBaseType"/>
- *         &lt;element name="OrderAttribute" 
type="{urn:org:ebics:H004}OrderAttributeBaseType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "UnsecuredReqOrderDetailsType")
-public class UnsecuredReqOrderDetailsType
-    extends OrderDetailsType
-{
-
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/UnsecuredRequestStaticHeaderType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/UnsecuredRequestStaticHeaderType.java
deleted file mode 100644
index f3c1a6a..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/UnsecuredRequestStaticHeaderType.java
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für den statischen EBICS-Header bei ungesicherten 
Sendeauftragsarten (Aufträge HIA und INI): kein Nonce, kein Timestamp, keine 
EU-Datei, keine X001 Authentifizierung, keine Verschlüsselung, keine Digests 
der öffentlichen Bankschlüssel, Nutzdaten komprimiert, Auftragsattribut DZNNN
- * 
- * <p>Java class for UnsecuredRequestStaticHeaderType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="UnsecuredRequestStaticHeaderType">
- *   &lt;complexContent>
- *     &lt;restriction base="{urn:org:ebics:H004}StaticHeaderBaseType">
- *       &lt;sequence>
- *         &lt;element name="HostID" type="{urn:org:ebics:H004}HostIDType"/>
- *         &lt;element name="Nonce" type="{urn:org:ebics:H004}NonceType" 
maxOccurs="0" minOccurs="0"/>
- *         &lt;element name="Timestamp" 
type="{urn:org:ebics:H004}TimestampType" maxOccurs="0" minOccurs="0"/>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;element name="SystemID" type="{urn:org:ebics:H004}UserIDType" 
minOccurs="0"/>
- *         &lt;element name="Product" 
type="{urn:org:ebics:H004}ProductElementType" minOccurs="0"/>
- *         &lt;element name="OrderDetails" 
type="{urn:org:ebics:H004}UnsecuredReqOrderDetailsType"/>
- *         &lt;element name="SecurityMedium" 
type="{urn:org:ebics:H004}SecurityMediumType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "UnsecuredRequestStaticHeaderType")
-public class UnsecuredRequestStaticHeaderType
-    extends StaticHeaderBaseType
-{
-
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/UnsignedReqOrderDetailsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/UnsignedReqOrderDetailsType.java
deleted file mode 100644
index a1bbfce..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/UnsignedReqOrderDetailsType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für OrderDetails im statischen EBICS-Header von 
ebicsUnsignedRequest.
- * 
- * <p>Java class for UnsignedReqOrderDetailsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="UnsignedReqOrderDetailsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{urn:org:ebics:H004}OrderDetailsType">
- *       &lt;sequence>
- *         &lt;element name="OrderType" 
type="{urn:org:ebics:H004}OrderTBaseType"/>
- *         &lt;element name="OrderAttribute" 
type="{urn:org:ebics:H004}OrderAttributeBaseType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "UnsignedReqOrderDetailsType")
-public class UnsignedReqOrderDetailsType
-    extends OrderDetailsType
-{
-
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/UnsignedRequestStaticHeaderType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/UnsignedRequestStaticHeaderType.java
deleted file mode 100644
index 466bc83..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/UnsignedRequestStaticHeaderType.java
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für den statischen EBICS-Header für ebicsUnsignedRequest.Datentyp 
für den statischen EBICS-Header bei Aufträgen ohne Authentifizierungssignatur 
(Auftrag HSA): keine X001 Authentifizierung, keine Digests der öffentlichen 
Bankschlüssel, EU-Datei, Nutzdaten, Nonce, Timestamp, OrderId, Auftragsattribut 
OZNNN
- * 
- * <p>Java class for UnsignedRequestStaticHeaderType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="UnsignedRequestStaticHeaderType">
- *   &lt;complexContent>
- *     &lt;restriction base="{urn:org:ebics:H004}StaticHeaderBaseType">
- *       &lt;sequence>
- *         &lt;element name="HostID" type="{urn:org:ebics:H004}HostIDType"/>
- *         &lt;element name="Nonce" type="{urn:org:ebics:H004}NonceType" 
maxOccurs="0" minOccurs="0"/>
- *         &lt;element name="Timestamp" 
type="{urn:org:ebics:H004}TimestampType" maxOccurs="0" minOccurs="0"/>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;element name="SystemID" type="{urn:org:ebics:H004}UserIDType" 
minOccurs="0"/>
- *         &lt;element name="Product" 
type="{urn:org:ebics:H004}ProductElementType" minOccurs="0"/>
- *         &lt;element name="OrderDetails" 
type="{urn:org:ebics:H004}UnsignedReqOrderDetailsType"/>
- *         &lt;element name="SecurityMedium" 
type="{urn:org:ebics:H004}SecurityMediumType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "UnsignedRequestStaticHeaderType")
-public class UnsignedRequestStaticHeaderType
-    extends StaticHeaderBaseType
-{
-
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/UserInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/UserInfoType.java
deleted file mode 100644
index 3333da4..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/UserInfoType.java
+++ /dev/null
@@ -1,258 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für VEU-Teilnehmerinformationen (HKD, HTD).
- * 
- * <p>Java class for UserInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="UserInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="UserID">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension base="&lt;urn:org:ebics:H004>UserIDType">
- *                 &lt;attribute name="Status" use="required" 
type="{urn:org:ebics:H004}UserStatusType" />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="Name" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;element name="Permission" 
type="{urn:org:ebics:H004}UserPermissionType" maxOccurs="unbounded"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "UserInfoType", propOrder = {
-    "userID",
-    "name",
-    "permission",
-    "any"
-})
-public class UserInfoType {
-
-    @XmlElement(name = "UserID", required = true)
-    protected UserInfoType.UserID userID;
-    @XmlElement(name = "Name")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String name;
-    @XmlElement(name = "Permission", required = true)
-    protected List<UserPermissionType> permission;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link UserInfoType.UserID }
-     *     
-     */
-    public UserInfoType.UserID getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link UserInfoType.UserID }
-     *     
-     */
-    public void setUserID(UserInfoType.UserID value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the permission property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the permission 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getPermission().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link UserPermissionType }
-     * 
-     * 
-     */
-    public List<UserPermissionType> getPermission() {
-        if (permission == null) {
-            permission = new ArrayList<UserPermissionType>();
-        }
-        return this.permission;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>UserIDType">
-     *       &lt;attribute name="Status" use="required" 
type="{urn:org:ebics:H004}UserStatusType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class UserID {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "Status", required = true)
-        protected int status;
-
-        /**
-         * Datentyp für eine Teilnehmer-ID.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the status property.
-         * 
-         */
-        public int getStatus() {
-            return status;
-        }
-
-        /**
-         * Sets the value of the status property.
-         * 
-         */
-        public void setStatus(int value) {
-            this.status = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/UserPermissionType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/UserPermissionType.java
deleted file mode 100644
index 9c4f3c2..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/UserPermissionType.java
+++ /dev/null
@@ -1,258 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für VEU-Berechtigungsinformationen des Teilnehmers (HKD, HTD).
- * 
- * <p>Java class for UserPermissionType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="UserPermissionType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderTypes" 
type="{urn:org:ebics:H004}OrderTListType"/>
- *         &lt;element name="FileFormat" 
type="{urn:org:ebics:H004}FileFormatType" minOccurs="0"/>
- *         &lt;element name="AccountID" 
type="{urn:org:ebics:H004}AccountIDType" minOccurs="0"/>
- *         &lt;element name="MaxAmount" type="{urn:org:ebics:H004}AmountType" 
minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="AuthorisationLevel" 
type="{urn:org:ebics:H004}AuthorisationLevelType" />
- *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "UserPermissionType", propOrder = {
-    "orderTypes",
-    "fileFormat",
-    "accountID",
-    "maxAmount",
-    "any"
-})
-public class UserPermissionType {
-
-    @XmlList
-    @XmlElement(name = "OrderTypes", required = true)
-    protected List<String> orderTypes;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "AccountID")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String accountID;
-    @XmlElement(name = "MaxAmount")
-    protected AmountType maxAmount;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-    @XmlAttribute(name = "AuthorisationLevel")
-    protected AuthorisationLevelType authorisationLevel;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-    /**
-     * Gets the value of the orderTypes property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderTypes 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderTypes().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getOrderTypes() {
-        if (orderTypes == null) {
-            orderTypes = new ArrayList<String>();
-        }
-        return this.orderTypes;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the accountID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAccountID() {
-        return accountID;
-    }
-
-    /**
-     * Sets the value of the accountID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAccountID(String value) {
-        this.accountID = value;
-    }
-
-    /**
-     * Gets the value of the maxAmount property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AmountType }
-     *     
-     */
-    public AmountType getMaxAmount() {
-        return maxAmount;
-    }
-
-    /**
-     * Sets the value of the maxAmount property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AmountType }
-     *     
-     */
-    public void setMaxAmount(AmountType value) {
-        this.maxAmount = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-    /**
-     * Gets the value of the authorisationLevel property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthorisationLevelType }
-     *     
-     */
-    public AuthorisationLevelType getAuthorisationLevel() {
-        return authorisationLevel;
-    }
-
-    /**
-     * Sets the value of the authorisationLevel property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthorisationLevelType }
-     *     
-     */
-    public void setAuthorisationLevel(AuthorisationLevelType value) {
-        this.authorisationLevel = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/UserSignatureDataSigBookType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/UserSignatureDataSigBookType.java
deleted file mode 100644
index 9e640db..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/UserSignatureDataSigBookType.java
+++ /dev/null
@@ -1,211 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for digital signature data transferred using EBICS.
- * 
- * <p>Java class for UserSignatureDataSigBookType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="UserSignatureDataSigBookType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;choice maxOccurs="unbounded">
- *           &lt;element name="OrderSignature">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;http://www.ebics.org/S001>OrderSignatureType">
- *                   &lt;attribute name="PartnerID" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anySimpleType"; />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *           &lt;element name="OrderSignatureData" 
type="{http://www.ebics.org/S001}OrderSignatureDataType"/>
- *         &lt;/choice>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "UserSignatureDataSigBookType", namespace = 
"http://www.ebics.org/S001";, propOrder = {
-    "orderSignatureOrOrderSignatureData",
-    "any"
-})
-public class UserSignatureDataSigBookType {
-
-    @XmlElements({
-        @XmlElement(name = "OrderSignature", type = 
UserSignatureDataSigBookType.OrderSignature.class),
-        @XmlElement(name = "OrderSignatureData", type = 
OrderSignatureDataType.class)
-    })
-    protected List<Object> orderSignatureOrOrderSignatureData;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderSignatureOrOrderSignatureData property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
orderSignatureOrOrderSignatureData property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderSignatureOrOrderSignatureData().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link UserSignatureDataSigBookType.OrderSignature }
-     * {@link OrderSignatureDataType }
-     * 
-     * 
-     */
-    public List<Object> getOrderSignatureOrOrderSignatureData() {
-        if (orderSignatureOrOrderSignatureData == null) {
-            orderSignatureOrOrderSignatureData = new ArrayList<Object>();
-        }
-        return this.orderSignatureOrOrderSignatureData;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension 
base="&lt;http://www.ebics.org/S001>OrderSignatureType">
-     *       &lt;attribute name="PartnerID" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anySimpleType"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class OrderSignature {
-
-        @XmlValue
-        protected byte[] value;
-        @XmlAttribute(name = "PartnerID", required = true)
-        @XmlSchemaType(name = "anySimpleType")
-        protected String partnerID;
-
-        /**
-         * Datentyp für kryptographische Unterschriften.
-         * 
-         * @return
-         *     possible object is
-         *     byte[]
-         */
-        public byte[] getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     byte[]
-         */
-        public void setValue(byte[] value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the partnerID property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getPartnerID() {
-            return partnerID;
-        }
-
-        /**
-         * Sets the value of the partnerID property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setPartnerID(String value) {
-            this.partnerID = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/X509DataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/X509DataType.java
deleted file mode 100644
index 8121653..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/X509DataType.java
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for X509DataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="X509DataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence maxOccurs="unbounded">
- *         &lt;choice>
- *           &lt;element name="X509IssuerSerial" 
type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
- *           &lt;element name="X509SKI" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           &lt;element name="X509SubjectName" 
type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           &lt;element name="X509Certificate" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           &lt;element name="X509CRL" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           &lt;any processContents='lax' namespace='##other'/>
- *         &lt;/choice>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "X509DataType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "x509IssuerSerialOrX509SKIOrX509SubjectName"
-})
-public class X509DataType {
-
-    @XmlElementRefs({
-        @XmlElementRef(name = "X509IssuerSerial", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "X509SKI", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "X509CRL", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "X509Certificate", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "X509SubjectName", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false)
-    })
-    @XmlAnyElement(lax = true)
-    protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName;
-
-    /**
-     * Gets the value of the x509IssuerSerialOrX509SKIOrX509SubjectName 
property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
x509IssuerSerialOrX509SKIOrX509SubjectName property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getX509IssuerSerialOrX509SKIOrX509SubjectName().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link Element }
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getX509IssuerSerialOrX509SKIOrX509SubjectName() {
-        if (x509IssuerSerialOrX509SKIOrX509SubjectName == null) {
-            x509IssuerSerialOrX509SKIOrX509SubjectName = new 
ArrayList<Object>();
-        }
-        return this.x509IssuerSerialOrX509SKIOrX509SubjectName;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/X509IssuerSerialType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/X509IssuerSerialType.java
deleted file mode 100644
index 6f25275..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/X509IssuerSerialType.java
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyrequest;
-
-import java.math.BigInteger;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for X509IssuerSerialType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="X509IssuerSerialType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="X509IssuerName" 
type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="X509SerialNumber" 
type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "X509IssuerSerialType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "x509IssuerName",
-    "x509SerialNumber"
-})
-public class X509IssuerSerialType {
-
-    @XmlElement(name = "X509IssuerName", required = true)
-    protected String x509IssuerName;
-    @XmlElement(name = "X509SerialNumber", required = true)
-    protected BigInteger x509SerialNumber;
-
-    /**
-     * Gets the value of the x509IssuerName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getX509IssuerName() {
-        return x509IssuerName;
-    }
-
-    /**
-     * Sets the value of the x509IssuerName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setX509IssuerName(String value) {
-        this.x509IssuerName = value;
-    }
-
-    /**
-     * Gets the value of the x509SerialNumber property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getX509SerialNumber() {
-        return x509SerialNumber;
-    }
-
-    /**
-     * Sets the value of the x509SerialNumber property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setX509SerialNumber(BigInteger value) {
-        this.x509SerialNumber = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/package-info.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/package-info.java
deleted file mode 100644
index 07adc98..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyrequest/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.10 at 06:36:01 PM CEST 
-//
-
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:org:ebics:H004", 
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package tech.libeufin.messages.ebics.keyrequest;
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AccountHolderRoleType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AccountHolderRoleType.java
deleted file mode 100644
index 358dd34..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AccountHolderRoleType.java
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for AccountHolderRoleType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="AccountHolderRoleType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token";>
- *     &lt;enumeration value="Originator"/>
- *     &lt;enumeration value="Recipient"/>
- *     &lt;enumeration value="Presenter"/>
- *     &lt;enumeration value="Other"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "AccountHolderRoleType")
-@XmlEnum
-public enum AccountHolderRoleType {
-
-
-    /**
-     * Auftraggeber
-     * 
-     */
-    @XmlEnumValue("Originator")
-    ORIGINATOR("Originator"),
-
-    /**
-     * Empfänger
-     * 
-     */
-    @XmlEnumValue("Recipient")
-    RECIPIENT("Recipient"),
-
-    /**
-     * Überbringer, Einreicher
-     * 
-     */
-    @XmlEnumValue("Presenter")
-    PRESENTER("Presenter"),
-
-    /**
-     * andere Rolle
-     * 
-     */
-    @XmlEnumValue("Other")
-    OTHER("Other");
-    private final String value;
-
-    AccountHolderRoleType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static AccountHolderRoleType fromValue(String v) {
-        for (AccountHolderRoleType c: AccountHolderRoleType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AccountNumberRoleType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AccountNumberRoleType.java
deleted file mode 100644
index fa2baac..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AccountNumberRoleType.java
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for AccountNumberRoleType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="AccountNumberRoleType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token";>
- *     &lt;enumeration value="Originator"/>
- *     &lt;enumeration value="Recipient"/>
- *     &lt;enumeration value="Charges"/>
- *     &lt;enumeration value="Other"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "AccountNumberRoleType")
-@XmlEnum
-public enum AccountNumberRoleType {
-
-
-    /**
-     * Auftraggeberkonto
-     * 
-     */
-    @XmlEnumValue("Originator")
-    ORIGINATOR("Originator"),
-
-    /**
-     * Empfängerkonto
-     * 
-     */
-    @XmlEnumValue("Recipient")
-    RECIPIENT("Recipient"),
-
-    /**
-     * Gebührenkonto
-     * 
-     */
-    @XmlEnumValue("Charges")
-    CHARGES("Charges"),
-
-    /**
-     * andere Kontorolle
-     * 
-     */
-    @XmlEnumValue("Other")
-    OTHER("Other");
-    private final String value;
-
-    AccountNumberRoleType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static AccountNumberRoleType fromValue(String v) {
-        for (AccountNumberRoleType c: AccountNumberRoleType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AccountType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AccountType.java
deleted file mode 100644
index 0c5eb08..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AccountType.java
+++ /dev/null
@@ -1,620 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für Kontoinformationen.
- * 
- * <p>Java class for AccountType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="AccountType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;choice maxOccurs="2">
- *           &lt;element name="AccountNumber">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;urn:org:ebics:H004>AccountNumberType">
- *                   &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *           &lt;element name="NationalAccountNumber">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;urn:org:ebics:H004>NationalAccountNumberType">
- *                   &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="2">
- *           &lt;element name="BankCode">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension base="&lt;urn:org:ebics:H004>BankCodeType">
- *                   &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
- *                   &lt;attribute name="Prefix" 
type="{urn:org:ebics:H004}BankCodePrefixType" />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *           &lt;element name="NationalBankCode">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;urn:org:ebics:H004>NationalBankCodeType">
- *                   &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *         &lt;/choice>
- *         &lt;element name="AccountHolder" 
type="{urn:org:ebics:H004}AccountHolderType" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Currency" 
type="{urn:org:ebics:H004}CurrencyBaseType" default="EUR" />
- *       &lt;attribute name="Description" 
type="{urn:org:ebics:H004}AccountDescriptionType" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AccountType", propOrder = {
-    "accountNumberOrNationalAccountNumber",
-    "bankCodeOrNationalBankCode",
-    "accountHolder"
-})
-@XmlSeeAlso({
-    tech.libeufin.messages.ebics.keyresponse.PartnerInfoType.AccountInfo.class,
-    PreValidationAccountAuthType.class
-})
-public class AccountType {
-
-    @XmlElements({
-        @XmlElement(name = "AccountNumber", type = 
AccountType.AccountNumber.class),
-        @XmlElement(name = "NationalAccountNumber", type = 
AccountType.NationalAccountNumber.class)
-    })
-    protected List<Object> accountNumberOrNationalAccountNumber;
-    @XmlElements({
-        @XmlElement(name = "BankCode", type = AccountType.BankCode.class),
-        @XmlElement(name = "NationalBankCode", type = 
AccountType.NationalBankCode.class)
-    })
-    protected List<Object> bankCodeOrNationalBankCode;
-    @XmlElement(name = "AccountHolder")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String accountHolder;
-    @XmlAttribute(name = "Currency")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String currency;
-    @XmlAttribute(name = "Description")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    protected String description;
-
-    /**
-     * Gets the value of the accountNumberOrNationalAccountNumber property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
accountNumberOrNationalAccountNumber property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAccountNumberOrNationalAccountNumber().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AccountType.AccountNumber }
-     * {@link AccountType.NationalAccountNumber }
-     * 
-     * 
-     */
-    public List<Object> getAccountNumberOrNationalAccountNumber() {
-        if (accountNumberOrNationalAccountNumber == null) {
-            accountNumberOrNationalAccountNumber = new ArrayList<Object>();
-        }
-        return this.accountNumberOrNationalAccountNumber;
-    }
-
-    /**
-     * Gets the value of the bankCodeOrNationalBankCode property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
bankCodeOrNationalBankCode property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getBankCodeOrNationalBankCode().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AccountType.BankCode }
-     * {@link AccountType.NationalBankCode }
-     * 
-     * 
-     */
-    public List<Object> getBankCodeOrNationalBankCode() {
-        if (bankCodeOrNationalBankCode == null) {
-            bankCodeOrNationalBankCode = new ArrayList<Object>();
-        }
-        return this.bankCodeOrNationalBankCode;
-    }
-
-    /**
-     * Gets the value of the accountHolder property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAccountHolder() {
-        return accountHolder;
-    }
-
-    /**
-     * Sets the value of the accountHolder property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAccountHolder(String value) {
-        this.accountHolder = value;
-    }
-
-    /**
-     * Gets the value of the currency property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCurrency() {
-        if (currency == null) {
-            return "EUR";
-        } else {
-            return currency;
-        }
-    }
-
-    /**
-     * Sets the value of the currency property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCurrency(String value) {
-        this.currency = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>AccountNumberType">
-     *       &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class AccountNumber {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "international")
-        protected Boolean international;
-
-        /**
-         * Datentyp für eine Kontonummer (national/international).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the international property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isInternational() {
-            if (international == null) {
-                return false;
-            } else {
-                return international;
-            }
-        }
-
-        /**
-         * Sets the value of the international property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setInternational(Boolean value) {
-            this.international = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>BankCodeType">
-     *       &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-     *       &lt;attribute name="Prefix" 
type="{urn:org:ebics:H004}BankCodePrefixType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class BankCode {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "international")
-        protected Boolean international;
-        @XmlAttribute(name = "Prefix")
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String prefix;
-
-        /**
-         * Datentyp für eine Bankleitzahl (national/international).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the international property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isInternational() {
-            if (international == null) {
-                return false;
-            } else {
-                return international;
-            }
-        }
-
-        /**
-         * Sets the value of the international property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setInternational(Boolean value) {
-            this.international = value;
-        }
-
-        /**
-         * Gets the value of the prefix property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getPrefix() {
-            return prefix;
-        }
-
-        /**
-         * Sets the value of the prefix property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setPrefix(String value) {
-            this.prefix = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension 
base="&lt;urn:org:ebics:H004>NationalAccountNumberType">
-     *       &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class NationalAccountNumber {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "format", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        @XmlSchemaType(name = "token")
-        protected String format;
-
-        /**
-         * Datentyp für eine Kontonummer (freies Format).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the format property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getFormat() {
-            return format;
-        }
-
-        /**
-         * Sets the value of the format property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setFormat(String value) {
-            this.format = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>NationalBankCodeType">
-     *       &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class NationalBankCode {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "format", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        @XmlSchemaType(name = "token")
-        protected String format;
-
-        /**
-         * Datentyp für eine Bankleitzahl (freies Format).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the format property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getFormat() {
-            return format;
-        }
-
-        /**
-         * Sets the value of the format property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setFormat(String value) {
-            this.format = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AddressInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AddressInfoType.java
deleted file mode 100644
index 7bfdc26..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AddressInfoType.java
+++ /dev/null
@@ -1,265 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for address information with regard to distributed signature 
(order types HKD, HTD).
- * 
- * <p>Java class for AddressInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="AddressInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="Name" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;element name="Street" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;element name="PostCode" 
type="{http://www.w3.org/2001/XMLSchema}token"; minOccurs="0"/>
- *         &lt;element name="City" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;element name="Region" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;element name="Country" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AddressInfoType", propOrder = {
-    "name",
-    "street",
-    "postCode",
-    "city",
-    "region",
-    "country",
-    "any"
-})
-public class AddressInfoType {
-
-    @XmlElement(name = "Name")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String name;
-    @XmlElement(name = "Street")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String street;
-    @XmlElement(name = "PostCode")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String postCode;
-    @XmlElement(name = "City")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String city;
-    @XmlElement(name = "Region")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String region;
-    @XmlElement(name = "Country")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String country;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the street property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStreet() {
-        return street;
-    }
-
-    /**
-     * Sets the value of the street property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStreet(String value) {
-        this.street = value;
-    }
-
-    /**
-     * Gets the value of the postCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPostCode() {
-        return postCode;
-    }
-
-    /**
-     * Sets the value of the postCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPostCode(String value) {
-        this.postCode = value;
-    }
-
-    /**
-     * Gets the value of the city property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCity() {
-        return city;
-    }
-
-    /**
-     * Sets the value of the city property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCity(String value) {
-        this.city = value;
-    }
-
-    /**
-     * Gets the value of the region property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRegion() {
-        return region;
-    }
-
-    /**
-     * Sets the value of the region property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRegion(String value) {
-        this.region = value;
-    }
-
-    /**
-     * Gets the value of the country property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCountry() {
-        return country;
-    }
-
-    /**
-     * Sets the value of the country property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCountry(String value) {
-        this.country = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AmountType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AmountType.java
deleted file mode 100644
index 115527a..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AmountType.java
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.math.BigDecimal;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für einen Betrag inkl. Währungscode-Attribut (Default = "EUR").
- * 
- * <p>Java class for AmountType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="AmountType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;urn:org:ebics:H004>AmountValueType">
- *       &lt;attribute name="Currency" 
type="{urn:org:ebics:H004}CurrencyBaseType" default="EUR" />
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AmountType", propOrder = {
-    "value"
-})
-public class AmountType {
-
-    @XmlValue
-    protected BigDecimal value;
-    @XmlAttribute(name = "Currency")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String currency;
-
-    /**
-     * Datentyp für einen Betragswert (ohne Währung).
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setValue(BigDecimal value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the currency property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCurrency() {
-        if (currency == null) {
-            return "EUR";
-        } else {
-            return currency;
-        }
-    }
-
-    /**
-     * Sets the value of the currency property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCurrency(String value) {
-        this.currency = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AttributedAccountType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AttributedAccountType.java
deleted file mode 100644
index e8cf87b..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AttributedAccountType.java
+++ /dev/null
@@ -1,967 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für Kontoinformationen inkl. der Eigenschaftszuordnung innerhalb 
einer Zahlungstransaktion.
- * 
- * <p>Java class for AttributedAccountType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="AttributedAccountType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;choice maxOccurs="2">
- *           &lt;element name="AccountNumber">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;urn:org:ebics:H004>AccountNumberType">
- *                   &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}AccountNumberRoleType" />
- *                   &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
- *                   &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *           &lt;element name="NationalAccountNumber">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;urn:org:ebics:H004>NationalAccountNumberType">
- *                   &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}AccountNumberRoleType" />
- *                   &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
- *                   &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="2">
- *           &lt;element name="BankCode">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension base="&lt;urn:org:ebics:H004>BankCodeType">
- *                   &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}BankCodeRoleType" />
- *                   &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
- *                   &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
- *                   &lt;attribute name="Prefix" 
type="{urn:org:ebics:H004}BankCodePrefixType" />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *           &lt;element name="NationalBankCode">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;urn:org:ebics:H004>NationalBankCodeType">
- *                   &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}BankCodeRoleType" />
- *                   &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
- *                   &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *         &lt;/choice>
- *         &lt;element name="AccountHolder" minOccurs="0">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension base="&lt;urn:org:ebics:H004>AccountHolderType">
- *                 &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}AccountHolderRoleType" />
- *                 &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *       &lt;attribute name="Currency" 
type="{urn:org:ebics:H004}CurrencyBaseType" default="EUR" />
- *       &lt;attribute name="Description" 
type="{urn:org:ebics:H004}AccountDescriptionType" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttributedAccountType", propOrder = {
-    "accountNumberOrNationalAccountNumber",
-    "bankCodeOrNationalBankCode",
-    "accountHolder"
-})
-@XmlSeeAlso({
-    HVTAccountInfoType.class
-})
-public class AttributedAccountType {
-
-    @XmlElements({
-        @XmlElement(name = "AccountNumber", type = 
AttributedAccountType.AccountNumber.class),
-        @XmlElement(name = "NationalAccountNumber", type = 
AttributedAccountType.NationalAccountNumber.class)
-    })
-    protected List<Object> accountNumberOrNationalAccountNumber;
-    @XmlElements({
-        @XmlElement(name = "BankCode", type = 
AttributedAccountType.BankCode.class),
-        @XmlElement(name = "NationalBankCode", type = 
AttributedAccountType.NationalBankCode.class)
-    })
-    protected List<Object> bankCodeOrNationalBankCode;
-    @XmlElement(name = "AccountHolder")
-    protected AttributedAccountType.AccountHolder accountHolder;
-    @XmlAttribute(name = "Currency")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String currency;
-    @XmlAttribute(name = "Description")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    protected String description;
-
-    /**
-     * Gets the value of the accountNumberOrNationalAccountNumber property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
accountNumberOrNationalAccountNumber property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAccountNumberOrNationalAccountNumber().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AttributedAccountType.AccountNumber }
-     * {@link AttributedAccountType.NationalAccountNumber }
-     * 
-     * 
-     */
-    public List<Object> getAccountNumberOrNationalAccountNumber() {
-        if (accountNumberOrNationalAccountNumber == null) {
-            accountNumberOrNationalAccountNumber = new ArrayList<Object>();
-        }
-        return this.accountNumberOrNationalAccountNumber;
-    }
-
-    /**
-     * Gets the value of the bankCodeOrNationalBankCode property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
bankCodeOrNationalBankCode property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getBankCodeOrNationalBankCode().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AttributedAccountType.BankCode }
-     * {@link AttributedAccountType.NationalBankCode }
-     * 
-     * 
-     */
-    public List<Object> getBankCodeOrNationalBankCode() {
-        if (bankCodeOrNationalBankCode == null) {
-            bankCodeOrNationalBankCode = new ArrayList<Object>();
-        }
-        return this.bankCodeOrNationalBankCode;
-    }
-
-    /**
-     * Gets the value of the accountHolder property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributedAccountType.AccountHolder }
-     *     
-     */
-    public AttributedAccountType.AccountHolder getAccountHolder() {
-        return accountHolder;
-    }
-
-    /**
-     * Sets the value of the accountHolder property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributedAccountType.AccountHolder }
-     *     
-     */
-    public void setAccountHolder(AttributedAccountType.AccountHolder value) {
-        this.accountHolder = value;
-    }
-
-    /**
-     * Gets the value of the currency property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCurrency() {
-        if (currency == null) {
-            return "EUR";
-        } else {
-            return currency;
-        }
-    }
-
-    /**
-     * Sets the value of the currency property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCurrency(String value) {
-        this.currency = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>AccountHolderType">
-     *       &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}AccountHolderRoleType" />
-     *       &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class AccountHolder {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "Role", required = true)
-        protected AccountHolderRoleType role;
-        @XmlAttribute(name = "Description")
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        @XmlSchemaType(name = "normalizedString")
-        protected String description;
-
-        /**
-         * Datentyp für den Namen des Kontoinhabers.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the role property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link AccountHolderRoleType }
-         *     
-         */
-        public AccountHolderRoleType getRole() {
-            return role;
-        }
-
-        /**
-         * Sets the value of the role property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link AccountHolderRoleType }
-         *     
-         */
-        public void setRole(AccountHolderRoleType value) {
-            this.role = value;
-        }
-
-        /**
-         * Gets the value of the description property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getDescription() {
-            return description;
-        }
-
-        /**
-         * Sets the value of the description property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setDescription(String value) {
-            this.description = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>AccountNumberType">
-     *       &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}AccountNumberRoleType" />
-     *       &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
-     *       &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class AccountNumber {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "Role", required = true)
-        protected AccountNumberRoleType role;
-        @XmlAttribute(name = "Description")
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        @XmlSchemaType(name = "normalizedString")
-        protected String description;
-        @XmlAttribute(name = "international")
-        protected Boolean international;
-
-        /**
-         * Datentyp für eine Kontonummer (national/international).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the role property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link AccountNumberRoleType }
-         *     
-         */
-        public AccountNumberRoleType getRole() {
-            return role;
-        }
-
-        /**
-         * Sets the value of the role property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link AccountNumberRoleType }
-         *     
-         */
-        public void setRole(AccountNumberRoleType value) {
-            this.role = value;
-        }
-
-        /**
-         * Gets the value of the description property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getDescription() {
-            return description;
-        }
-
-        /**
-         * Sets the value of the description property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setDescription(String value) {
-            this.description = value;
-        }
-
-        /**
-         * Gets the value of the international property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isInternational() {
-            if (international == null) {
-                return false;
-            } else {
-                return international;
-            }
-        }
-
-        /**
-         * Sets the value of the international property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setInternational(Boolean value) {
-            this.international = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>BankCodeType">
-     *       &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}BankCodeRoleType" />
-     *       &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
-     *       &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-     *       &lt;attribute name="Prefix" 
type="{urn:org:ebics:H004}BankCodePrefixType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class BankCode {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "Role", required = true)
-        protected BankCodeRoleType role;
-        @XmlAttribute(name = "Description")
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        @XmlSchemaType(name = "normalizedString")
-        protected String description;
-        @XmlAttribute(name = "international")
-        protected Boolean international;
-        @XmlAttribute(name = "Prefix")
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String prefix;
-
-        /**
-         * Datentyp für eine Bankleitzahl (national/international).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the role property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link BankCodeRoleType }
-         *     
-         */
-        public BankCodeRoleType getRole() {
-            return role;
-        }
-
-        /**
-         * Sets the value of the role property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BankCodeRoleType }
-         *     
-         */
-        public void setRole(BankCodeRoleType value) {
-            this.role = value;
-        }
-
-        /**
-         * Gets the value of the description property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getDescription() {
-            return description;
-        }
-
-        /**
-         * Sets the value of the description property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setDescription(String value) {
-            this.description = value;
-        }
-
-        /**
-         * Gets the value of the international property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isInternational() {
-            if (international == null) {
-                return false;
-            } else {
-                return international;
-            }
-        }
-
-        /**
-         * Sets the value of the international property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setInternational(Boolean value) {
-            this.international = value;
-        }
-
-        /**
-         * Gets the value of the prefix property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getPrefix() {
-            return prefix;
-        }
-
-        /**
-         * Sets the value of the prefix property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setPrefix(String value) {
-            this.prefix = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension 
base="&lt;urn:org:ebics:H004>NationalAccountNumberType">
-     *       &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}AccountNumberRoleType" />
-     *       &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
-     *       &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class NationalAccountNumber {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "Role", required = true)
-        protected AccountNumberRoleType role;
-        @XmlAttribute(name = "Description")
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        @XmlSchemaType(name = "normalizedString")
-        protected String description;
-        @XmlAttribute(name = "format", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        @XmlSchemaType(name = "token")
-        protected String format;
-
-        /**
-         * Datentyp für eine Kontonummer (freies Format).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the role property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link AccountNumberRoleType }
-         *     
-         */
-        public AccountNumberRoleType getRole() {
-            return role;
-        }
-
-        /**
-         * Sets the value of the role property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link AccountNumberRoleType }
-         *     
-         */
-        public void setRole(AccountNumberRoleType value) {
-            this.role = value;
-        }
-
-        /**
-         * Gets the value of the description property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getDescription() {
-            return description;
-        }
-
-        /**
-         * Sets the value of the description property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setDescription(String value) {
-            this.description = value;
-        }
-
-        /**
-         * Gets the value of the format property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getFormat() {
-            return format;
-        }
-
-        /**
-         * Sets the value of the format property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setFormat(String value) {
-            this.format = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>NationalBankCodeType">
-     *       &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}BankCodeRoleType" />
-     *       &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
-     *       &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class NationalBankCode {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "Role", required = true)
-        protected BankCodeRoleType role;
-        @XmlAttribute(name = "Description")
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        @XmlSchemaType(name = "normalizedString")
-        protected String description;
-        @XmlAttribute(name = "format", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        @XmlSchemaType(name = "token")
-        protected String format;
-
-        /**
-         * Datentyp für eine Bankleitzahl (freies Format).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the role property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link BankCodeRoleType }
-         *     
-         */
-        public BankCodeRoleType getRole() {
-            return role;
-        }
-
-        /**
-         * Sets the value of the role property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BankCodeRoleType }
-         *     
-         */
-        public void setRole(BankCodeRoleType value) {
-            this.role = value;
-        }
-
-        /**
-         * Gets the value of the description property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getDescription() {
-            return description;
-        }
-
-        /**
-         * Sets the value of the description property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setDescription(String value) {
-            this.description = value;
-        }
-
-        /**
-         * Gets the value of the format property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getFormat() {
-            return format;
-        }
-
-        /**
-         * Sets the value of the format property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setFormat(String value) {
-            this.format = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AuthOrderInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AuthOrderInfoType.java
deleted file mode 100644
index b3f8ecb..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AuthOrderInfoType.java
+++ /dev/null
@@ -1,262 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for user permissions with regard to distributed signatures (order 
types HKD, HTD).
- * 
- * <p>Java class for AuthOrderInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="AuthOrderInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderType" 
type="{urn:org:ebics:H004}OrderTBaseType"/>
- *         &lt;element name="FileFormat" 
type="{urn:org:ebics:H004}FileFormatType" minOccurs="0"/>
- *         &lt;element name="TransferType" 
type="{urn:org:ebics:H004}TransferType"/>
- *         &lt;element name="OrderFormat" 
type="{urn:org:ebics:H004}OrderFormatType" minOccurs="0"/>
- *         &lt;element name="Description" 
type="{urn:org:ebics:H004}OrderDescriptionType"/>
- *         &lt;element name="NumSigRequired" 
type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"; minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AuthOrderInfoType", propOrder = {
-    "orderType",
-    "fileFormat",
-    "transferType",
-    "orderFormat",
-    "description",
-    "numSigRequired",
-    "any"
-})
-public class AuthOrderInfoType {
-
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "TransferType", required = true)
-    @XmlSchemaType(name = "token")
-    protected TransferType transferType;
-    @XmlElement(name = "OrderFormat")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderFormat;
-    @XmlElement(name = "Description", required = true)
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String description;
-    @XmlElement(name = "NumSigRequired", defaultValue = "0")
-    @XmlSchemaType(name = "nonNegativeInteger")
-    protected BigInteger numSigRequired;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the transferType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TransferType }
-     *     
-     */
-    public TransferType getTransferType() {
-        return transferType;
-    }
-
-    /**
-     * Sets the value of the transferType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TransferType }
-     *     
-     */
-    public void setTransferType(TransferType value) {
-        this.transferType = value;
-    }
-
-    /**
-     * Gets the value of the orderFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderFormat() {
-        return orderFormat;
-    }
-
-    /**
-     * Sets the value of the orderFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderFormat(String value) {
-        this.orderFormat = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the numSigRequired property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getNumSigRequired() {
-        return numSigRequired;
-    }
-
-    /**
-     * Sets the value of the numSigRequired property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setNumSigRequired(BigInteger value) {
-        this.numSigRequired = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AuthenticationCertificateInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AuthenticationCertificateInfoType.java
deleted file mode 100644
index 418b339..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AuthenticationCertificateInfoType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Data type for public for identification and authentication.
- * 
- * <p>Java class for AuthenticationCertificateInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="AuthenticationCertificateInfoType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}CertificateInfoType">
- *       &lt;sequence>
- *         &lt;element name="AuthenticationVersion" 
type="{urn:org:ebics:H004}AuthenticationVersionType"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AuthenticationCertificateInfoType", propOrder = {
-    "authenticationVersion"
-})
-public class AuthenticationCertificateInfoType
-    extends CertificateInfoType
-{
-
-    @XmlElement(name = "AuthenticationVersion", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String authenticationVersion;
-
-    /**
-     * Gets the value of the authenticationVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAuthenticationVersion() {
-        return authenticationVersion;
-    }
-
-    /**
-     * Sets the value of the authenticationVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAuthenticationVersion(String value) {
-        this.authenticationVersion = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AuthenticationPubKeyInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AuthenticationPubKeyInfoType.java
deleted file mode 100644
index 90eeebb..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AuthenticationPubKeyInfoType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für öffentlichen Authentfikationsschlüssel.
- * 
- * <p>Java class for AuthenticationPubKeyInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="AuthenticationPubKeyInfoType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}PubKeyInfoType">
- *       &lt;sequence>
- *         &lt;element name="AuthenticationVersion" 
type="{urn:org:ebics:H004}AuthenticationVersionType"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AuthenticationPubKeyInfoType", propOrder = {
-    "authenticationVersion"
-})
-public class AuthenticationPubKeyInfoType
-    extends PubKeyInfoTypeAtEbicsTypes
-{
-
-    @XmlElement(name = "AuthenticationVersion", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String authenticationVersion;
-
-    /**
-     * Gets the value of the authenticationVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAuthenticationVersion() {
-        return authenticationVersion;
-    }
-
-    /**
-     * Sets the value of the authenticationVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAuthenticationVersion(String value) {
-        this.authenticationVersion = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AuthorisationLevelType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AuthorisationLevelType.java
deleted file mode 100644
index c99e500..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/AuthorisationLevelType.java
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for AuthorisationLevelType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="AuthorisationLevelType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token";>
- *     &lt;length value="1"/>
- *     &lt;enumeration value="E"/>
- *     &lt;enumeration value="A"/>
- *     &lt;enumeration value="B"/>
- *     &lt;enumeration value="T"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "AuthorisationLevelType")
-@XmlEnum
-public enum AuthorisationLevelType {
-
-
-    /**
-     * Einzelunterschrift
-     * 
-     */
-    E,
-
-    /**
-     * Erstunterschrift
-     * 
-     */
-    A,
-
-    /**
-     * Zweitunterschrift
-     * 
-     */
-    B,
-
-    /**
-     * Transportunterschrift
-     * 
-     */
-    T;
-
-    public String value() {
-        return name();
-    }
-
-    public static AuthorisationLevelType fromValue(String v) {
-        return valueOf(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/BankCodeRoleType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/BankCodeRoleType.java
deleted file mode 100644
index ac15d81..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/BankCodeRoleType.java
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for BankCodeRoleType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="BankCodeRoleType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token";>
- *     &lt;enumeration value="Originator"/>
- *     &lt;enumeration value="Recipient"/>
- *     &lt;enumeration value="Correspondent"/>
- *     &lt;enumeration value="Other"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "BankCodeRoleType")
-@XmlEnum
-public enum BankCodeRoleType {
-
-
-    /**
-     * Auftraggeberbank
-     * 
-     */
-    @XmlEnumValue("Originator")
-    ORIGINATOR("Originator"),
-
-    /**
-     * Empfängerbank
-     * 
-     */
-    @XmlEnumValue("Recipient")
-    RECIPIENT("Recipient"),
-
-    /**
-     * Korrespondenzbank
-     * 
-     */
-    @XmlEnumValue("Correspondent")
-    CORRESPONDENT("Correspondent"),
-
-    /**
-     * andere Bankrolle
-     * 
-     */
-    @XmlEnumValue("Other")
-    OTHER("Other");
-    private final String value;
-
-    BankCodeRoleType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static BankCodeRoleType fromValue(String v) {
-        for (BankCodeRoleType c: BankCodeRoleType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/BankInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/BankInfoType.java
deleted file mode 100644
index 6d1cc67..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/BankInfoType.java
+++ /dev/null
@@ -1,147 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für VEU-Kreditinstitutsinformationen (HKD, HTD).
- * 
- * <p>Java class for BankInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="BankInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="HostID" type="{urn:org:ebics:H004}HostIDType"/>
- *         &lt;element ref="{urn:org:ebics:H004}Parameter" 
maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BankInfoType", propOrder = {
-    "hostID",
-    "parameter",
-    "any"
-})
-public class BankInfoType {
-
-    @XmlElement(name = "HostID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String hostID;
-    @XmlElement(name = "Parameter")
-    protected List<Parameter> parameter;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the hostID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getHostID() {
-        return hostID;
-    }
-
-    /**
-     * Sets the value of the hostID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setHostID(String value) {
-        this.hostID = value;
-    }
-
-    /**
-     * Gets the value of the parameter property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the parameter 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getParameter().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Parameter }
-     * 
-     * 
-     */
-    public List<Parameter> getParameter() {
-        if (parameter == null) {
-            parameter = new ArrayList<Parameter>();
-        }
-        return this.parameter;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/BankSignatureDataSigBookType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/BankSignatureDataSigBookType.java
deleted file mode 100644
index 2fa034c..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/BankSignatureDataSigBookType.java
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for digital signature data transferred using EBICS.
- * 
- * <p>Java class for BankSignatureDataSigBookType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="BankSignatureDataSigBookType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderSignature" maxOccurs="0" minOccurs="0">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension base="&lt;urn:org:ebics:H004>SignatureType">
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BankSignatureDataSigBookType", propOrder = {
-    "any"
-})
-public class BankSignatureDataSigBookType {
-
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>SignatureType">
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class OrderSignature {
-
-        @XmlValue
-        protected byte[] value;
-
-        /**
-         * Datentyp für kryptographische Unterschriften.
-         * 
-         * @return
-         *     possible object is
-         *     byte[]
-         */
-        public byte[] getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     byte[]
-         */
-        public void setValue(byte[] value) {
-            this.value = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/CanonicalizationMethodType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/CanonicalizationMethodType.java
deleted file mode 100644
index a124a03..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/CanonicalizationMethodType.java
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CanonicalizationMethodType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="CanonicalizationMethodType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;any maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Algorithm" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CanonicalizationMethodType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class CanonicalizationMethodType {
-
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Algorithm", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String algorithm;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-    /**
-     * Gets the value of the algorithm property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAlgorithm() {
-        return algorithm;
-    }
-
-    /**
-     * Sets the value of the algorithm property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAlgorithm(String value) {
-        this.algorithm = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/CertificateInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/CertificateInfoType.java
deleted file mode 100644
index 9038bd7..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/CertificateInfoType.java
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Data Type for Certificates for the bank-technical signature for 
authorisation (ES)
- * 
- * <p>Java class for CertificateInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="CertificateInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CertificateInfoType", propOrder = {
-    "x509Data",
-    "any"
-})
-@XmlSeeAlso({
-    AuthenticationCertificateInfoType.class,
-    EncryptionCertificateInfoType.class,
-    SignatureCertificateInfoType.class
-})
-public class CertificateInfoType {
-
-    @XmlElement(name = "X509Data", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, required = true)
-    protected X509DataType x509Data;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the x509Data property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link X509DataType }
-     *     
-     */
-    public X509DataType getX509Data() {
-        return x509Data;
-    }
-
-    /**
-     * Sets the value of the x509Data property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link X509DataType }
-     *     
-     */
-    public void setX509Data(X509DataType value) {
-        this.x509Data = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/CurrencyCode.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/CurrencyCode.java
deleted file mode 100644
index dba1e93..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/CurrencyCode.java
+++ /dev/null
@@ -1,1183 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CurrencyCode.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="CurrencyCode">
- *   &lt;restriction base="{urn:org:ebics:H004}CurrencyBaseType">
- *     &lt;length value="3"/>
- *     &lt;enumeration value="AFN"/>
- *     &lt;enumeration value="ALL"/>
- *     &lt;enumeration value="AMD"/>
- *     &lt;enumeration value="ANG"/>
- *     &lt;enumeration value="AOA"/>
- *     &lt;enumeration value="ARS"/>
- *     &lt;enumeration value="AUD"/>
- *     &lt;enumeration value="AWG"/>
- *     &lt;enumeration value="AZM"/>
- *     &lt;enumeration value="BAM"/>
- *     &lt;enumeration value="BBD"/>
- *     &lt;enumeration value="BDT"/>
- *     &lt;enumeration value="BGN"/>
- *     &lt;enumeration value="BHD"/>
- *     &lt;enumeration value="BMD"/>
- *     &lt;enumeration value="BND"/>
- *     &lt;enumeration value="BOB"/>
- *     &lt;enumeration value="BRL"/>
- *     &lt;enumeration value="BSD"/>
- *     &lt;enumeration value="BTN"/>
- *     &lt;enumeration value="BWP"/>
- *     &lt;enumeration value="BYR"/>
- *     &lt;enumeration value="BZD"/>
- *     &lt;enumeration value="CAD"/>
- *     &lt;enumeration value="CDF"/>
- *     &lt;enumeration value="CHF"/>
- *     &lt;enumeration value="CLP"/>
- *     &lt;enumeration value="CNY"/>
- *     &lt;enumeration value="COP"/>
- *     &lt;enumeration value="CRC"/>
- *     &lt;enumeration value="CSD"/>
- *     &lt;enumeration value="CUP"/>
- *     &lt;enumeration value="CVE"/>
- *     &lt;enumeration value="CYP"/>
- *     &lt;enumeration value="CZK"/>
- *     &lt;enumeration value="DJV"/>
- *     &lt;enumeration value="DKK"/>
- *     &lt;enumeration value="DOP"/>
- *     &lt;enumeration value="DZD"/>
- *     &lt;enumeration value="ECS"/>
- *     &lt;enumeration value="EEK"/>
- *     &lt;enumeration value="EGP"/>
- *     &lt;enumeration value="ETB"/>
- *     &lt;enumeration value="EUR"/>
- *     &lt;enumeration value="FJD"/>
- *     &lt;enumeration value="FKP"/>
- *     &lt;enumeration value="GBP"/>
- *     &lt;enumeration value="GEL"/>
- *     &lt;enumeration value="GHC"/>
- *     &lt;enumeration value="GIP"/>
- *     &lt;enumeration value="GMD"/>
- *     &lt;enumeration value="GNF"/>
- *     &lt;enumeration value="GTQ"/>
- *     &lt;enumeration value="GYD"/>
- *     &lt;enumeration value="HKD"/>
- *     &lt;enumeration value="HNL"/>
- *     &lt;enumeration value="HRK"/>
- *     &lt;enumeration value="HTG"/>
- *     &lt;enumeration value="HUF"/>
- *     &lt;enumeration value="IDR"/>
- *     &lt;enumeration value="ILS"/>
- *     &lt;enumeration value="INR"/>
- *     &lt;enumeration value="IQD"/>
- *     &lt;enumeration value="IRR"/>
- *     &lt;enumeration value="ISK"/>
- *     &lt;enumeration value="JMD"/>
- *     &lt;enumeration value="JOD"/>
- *     &lt;enumeration value="JPY"/>
- *     &lt;enumeration value="KES"/>
- *     &lt;enumeration value="KGS"/>
- *     &lt;enumeration value="KHR"/>
- *     &lt;enumeration value="KMF"/>
- *     &lt;enumeration value="KPW"/>
- *     &lt;enumeration value="KRW"/>
- *     &lt;enumeration value="KWD"/>
- *     &lt;enumeration value="KYD"/>
- *     &lt;enumeration value="KZT"/>
- *     &lt;enumeration value="LAK"/>
- *     &lt;enumeration value="LBP"/>
- *     &lt;enumeration value="LKR"/>
- *     &lt;enumeration value="LRD"/>
- *     &lt;enumeration value="LSL"/>
- *     &lt;enumeration value="LTL"/>
- *     &lt;enumeration value="LVL"/>
- *     &lt;enumeration value="LYD"/>
- *     &lt;enumeration value="MAD"/>
- *     &lt;enumeration value="MDL"/>
- *     &lt;enumeration value="MGF"/>
- *     &lt;enumeration value="MKD"/>
- *     &lt;enumeration value="MMK"/>
- *     &lt;enumeration value="MNT"/>
- *     &lt;enumeration value="MOP"/>
- *     &lt;enumeration value="MRO"/>
- *     &lt;enumeration value="MTL"/>
- *     &lt;enumeration value="MUR"/>
- *     &lt;enumeration value="MVR"/>
- *     &lt;enumeration value="MWK"/>
- *     &lt;enumeration value="MXN"/>
- *     &lt;enumeration value="MYR"/>
- *     &lt;enumeration value="MZM"/>
- *     &lt;enumeration value="NAD"/>
- *     &lt;enumeration value="NGN"/>
- *     &lt;enumeration value="NIO"/>
- *     &lt;enumeration value="NOK"/>
- *     &lt;enumeration value="NPR"/>
- *     &lt;enumeration value="NZD"/>
- *     &lt;enumeration value="OMR"/>
- *     &lt;enumeration value="PAB"/>
- *     &lt;enumeration value="PEN"/>
- *     &lt;enumeration value="PGK"/>
- *     &lt;enumeration value="PHP"/>
- *     &lt;enumeration value="PKR"/>
- *     &lt;enumeration value="PLN"/>
- *     &lt;enumeration value="PYG"/>
- *     &lt;enumeration value="QAR"/>
- *     &lt;enumeration value="ROL"/>
- *     &lt;enumeration value="RUB"/>
- *     &lt;enumeration value="RWF"/>
- *     &lt;enumeration value="SAR"/>
- *     &lt;enumeration value="SBD"/>
- *     &lt;enumeration value="SCR"/>
- *     &lt;enumeration value="SDD"/>
- *     &lt;enumeration value="SEK"/>
- *     &lt;enumeration value="SGD"/>
- *     &lt;enumeration value="SHP"/>
- *     &lt;enumeration value="SIT"/>
- *     &lt;enumeration value="SKK"/>
- *     &lt;enumeration value="SLL"/>
- *     &lt;enumeration value="SOS"/>
- *     &lt;enumeration value="SRD"/>
- *     &lt;enumeration value="STD"/>
- *     &lt;enumeration value="SVC"/>
- *     &lt;enumeration value="SYP"/>
- *     &lt;enumeration value="SZL"/>
- *     &lt;enumeration value="THB"/>
- *     &lt;enumeration value="TJS"/>
- *     &lt;enumeration value="TMM"/>
- *     &lt;enumeration value="TND"/>
- *     &lt;enumeration value="TOP"/>
- *     &lt;enumeration value="TRL"/>
- *     &lt;enumeration value="TRY"/>
- *     &lt;enumeration value="TTD"/>
- *     &lt;enumeration value="TWD"/>
- *     &lt;enumeration value="TZS"/>
- *     &lt;enumeration value="UAH"/>
- *     &lt;enumeration value="UGX"/>
- *     &lt;enumeration value="USD"/>
- *     &lt;enumeration value="UYU"/>
- *     &lt;enumeration value="UZS"/>
- *     &lt;enumeration value="VEB"/>
- *     &lt;enumeration value="VND"/>
- *     &lt;enumeration value="VUV"/>
- *     &lt;enumeration value="WST"/>
- *     &lt;enumeration value="XAF"/>
- *     &lt;enumeration value="XCD"/>
- *     &lt;enumeration value="XOF"/>
- *     &lt;enumeration value="XPF"/>
- *     &lt;enumeration value="XTS"/>
- *     &lt;enumeration value="XXX"/>
- *     &lt;enumeration value="YER"/>
- *     &lt;enumeration value="ZAR"/>
- *     &lt;enumeration value="ZMK"/>
- *     &lt;enumeration value="ZWD"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "CurrencyCode")
-@XmlEnum
-public enum CurrencyCode {
-
-
-    /**
-     * Afghanistan: Afghani
-     * 
-     */
-    AFN,
-
-    /**
-     * Albanien: Lek
-     * 
-     */
-    ALL,
-
-    /**
-     * Armenien: Dram
-     * 
-     */
-    AMD,
-
-    /**
-     * Niederländische Antillen: Gulden
-     * 
-     */
-    ANG,
-
-    /**
-     * Angola: Kwanza
-     * 
-     */
-    AOA,
-
-    /**
-     * Argentinien: Peso
-     * 
-     */
-    ARS,
-
-    /**
-     * Australien: Dollar
-     * 
-     */
-    AUD,
-
-    /**
-     * Aruba: Florin
-     * 
-     */
-    AWG,
-
-    /**
-     * Aserbaidschan: Manat
-     * 
-     */
-    AZM,
-
-    /**
-     * Bosnien und Herzegowina: Konvertible Mark
-     * 
-     */
-    BAM,
-
-    /**
-     * Barbados: Dollar
-     * 
-     */
-    BBD,
-
-    /**
-     * Bangladesch: Taka
-     * 
-     */
-    BDT,
-
-    /**
-     * Bulgarien: Lew
-     * 
-     */
-    BGN,
-
-    /**
-     * Bahrain: Dinar
-     * 
-     */
-    BHD,
-
-    /**
-     * Bermuda: Dollar
-     * 
-     */
-    BMD,
-
-    /**
-     * Brunei: Dollar
-     * 
-     */
-    BND,
-
-    /**
-     * Bolivien: Boliviano
-     * 
-     */
-    BOB,
-
-    /**
-     * Brasilien: Real
-     * 
-     */
-    BRL,
-
-    /**
-     * Bahamas: Dollar
-     * 
-     */
-    BSD,
-
-    /**
-     * Bhutan: Ngultrum
-     * 
-     */
-    BTN,
-
-    /**
-     * Botswana: Pula
-     * 
-     */
-    BWP,
-
-    /**
-     * Weißrussland (Belarus): Rubel
-     * 
-     */
-    BYR,
-
-    /**
-     * Belize: Dollar
-     * 
-     */
-    BZD,
-
-    /**
-     * Kanada: Dollar
-     * 
-     */
-    CAD,
-
-    /**
-     * Demokratische Republik Kongo: Franc
-     * 
-     */
-    CDF,
-
-    /**
-     * Schweiz: Franken
-     * 
-     */
-    CHF,
-
-    /**
-     * Chile: Peso
-     * 
-     */
-    CLP,
-
-    /**
-     * China (Volksrepublik): Renminbi Yuan
-     * 
-     */
-    CNY,
-
-    /**
-     * Kolumbien: Peso
-     * 
-     */
-    COP,
-
-    /**
-     * Costa Rica: Colón
-     * 
-     */
-    CRC,
-
-    /**
-     * Serbien: Dinar
-     * 
-     */
-    CSD,
-
-    /**
-     * Kuba: Peso
-     * 
-     */
-    CUP,
-
-    /**
-     * Kap Verde: Escudo
-     * 
-     */
-    CVE,
-
-    /**
-     * Zypern (griechischer Teil): Pfund
-     * 
-     */
-    CYP,
-
-    /**
-     * Tschechien: Krone
-     * 
-     */
-    CZK,
-
-    /**
-     * Dschibuti: Franc
-     * 
-     */
-    DJV,
-
-    /**
-     * Dänemark: Krone
-     * 
-     */
-    DKK,
-
-    /**
-     * Dominikanische Republik: Peso
-     * 
-     */
-    DOP,
-
-    /**
-     * Algerien: Dinar
-     * 
-     */
-    DZD,
-
-    /**
-     * Ecuador (bis 2000): Sucre
-     * 
-     */
-    ECS,
-
-    /**
-     * Estland: Krone
-     * 
-     */
-    EEK,
-
-    /**
-     * Ägypten: Pfund
-     * 
-     */
-    EGP,
-
-    /**
-     * Äthiopien: Birr
-     * 
-     */
-    ETB,
-
-    /**
-     * Europäische Währungsunion: Euro
-     * 
-     */
-    EUR,
-
-    /**
-     * Fidschi: Dollar
-     * 
-     */
-    FJD,
-
-    /**
-     * Falklandinseln: Pfund
-     * 
-     */
-    FKP,
-
-    /**
-     * Vereinigtes Königreich: Pfund
-     * 
-     */
-    GBP,
-
-    /**
-     * Georgien: Lari
-     * 
-     */
-    GEL,
-
-    /**
-     * Ghana: Cedi
-     * 
-     */
-    GHC,
-
-    /**
-     * Gibraltar: Pfund
-     * 
-     */
-    GIP,
-
-    /**
-     * Gambia: Dalasi
-     * 
-     */
-    GMD,
-
-    /**
-     * Guinea: Franc
-     * 
-     */
-    GNF,
-
-    /**
-     * Guatemala: Quetzal
-     * 
-     */
-    GTQ,
-
-    /**
-     * Guyana: Dollar
-     * 
-     */
-    GYD,
-
-    /**
-     * Hongkong: Dollar
-     * 
-     */
-    HKD,
-
-    /**
-     * Honduras: Lempira
-     * 
-     */
-    HNL,
-
-    /**
-     * Kroatien: Kuna
-     * 
-     */
-    HRK,
-
-    /**
-     * Haiti: Gourde
-     * 
-     */
-    HTG,
-
-    /**
-     * Ungarn: Forint
-     * 
-     */
-    HUF,
-
-    /**
-     * Indonesien: Rupiah
-     * 
-     */
-    IDR,
-
-    /**
-     * Israel: Schekel
-     * 
-     */
-    ILS,
-
-    /**
-     * Indien: Rupie
-     * 
-     */
-    INR,
-
-    /**
-     * Irak: Dinar
-     * 
-     */
-    IQD,
-
-    /**
-     * Iran: Rial
-     * 
-     */
-    IRR,
-
-    /**
-     * Island: Krone
-     * 
-     */
-    ISK,
-
-    /**
-     * Jamaika: Dollar
-     * 
-     */
-    JMD,
-
-    /**
-     * Jordanien: Dinar
-     * 
-     */
-    JOD,
-
-    /**
-     * Japan: Yen
-     * 
-     */
-    JPY,
-
-    /**
-     * Kenia: Schilling
-     * 
-     */
-    KES,
-
-    /**
-     * Kirgisistan: Som
-     * 
-     */
-    KGS,
-
-    /**
-     * Kambodscha: Riel
-     * 
-     */
-    KHR,
-
-    /**
-     * Komoren: Franc
-     * 
-     */
-    KMF,
-
-    /**
-     * Nordkorea: Won
-     * 
-     */
-    KPW,
-
-    /**
-     * Südkorea: Won
-     * 
-     */
-    KRW,
-
-    /**
-     * Kuwait: Dinar
-     * 
-     */
-    KWD,
-
-    /**
-     * Kaimaninseln: Dollar
-     * 
-     */
-    KYD,
-
-    /**
-     * Kasachstan: Tenge
-     * 
-     */
-    KZT,
-
-    /**
-     * Laos: Kip
-     * 
-     */
-    LAK,
-
-    /**
-     * Libanon: Pfund
-     * 
-     */
-    LBP,
-
-    /**
-     * Sri Lanka: Rupie
-     * 
-     */
-    LKR,
-
-    /**
-     * Liberia: Dollar
-     * 
-     */
-    LRD,
-
-    /**
-     * Lesotho: Loti
-     * 
-     */
-    LSL,
-
-    /**
-     * Litauen: Litas
-     * 
-     */
-    LTL,
-
-    /**
-     * Lettland: Lats
-     * 
-     */
-    LVL,
-
-    /**
-     * Libyen: Dinar
-     * 
-     */
-    LYD,
-
-    /**
-     * Marokko: Dirham
-     * 
-     */
-    MAD,
-
-    /**
-     * Moldawien: Leu
-     * 
-     */
-    MDL,
-
-    /**
-     * Madagaskar: Franc
-     * 
-     */
-    MGF,
-
-    /**
-     * Mazedonien: Denar
-     * 
-     */
-    MKD,
-
-    /**
-     * Myanmar: Kyat
-     * 
-     */
-    MMK,
-
-    /**
-     * Mongolei: Tugrik
-     * 
-     */
-    MNT,
-
-    /**
-     * Macau: Pataca
-     * 
-     */
-    MOP,
-
-    /**
-     * Mauretanien: Ouguiya
-     * 
-     */
-    MRO,
-
-    /**
-     * Malta: Lira
-     * 
-     */
-    MTL,
-
-    /**
-     * Mauritius: Rupie
-     * 
-     */
-    MUR,
-
-    /**
-     * Malediven: Rufiyaa
-     * 
-     */
-    MVR,
-
-    /**
-     * Malawi: Kwacha
-     * 
-     */
-    MWK,
-
-    /**
-     * Mexiko: Peso
-     * 
-     */
-    MXN,
-
-    /**
-     * Malaysia: Ringgit
-     * 
-     */
-    MYR,
-
-    /**
-     * Mosambik: Metical
-     * 
-     */
-    MZM,
-
-    /**
-     * Namibia: Dollar
-     * 
-     */
-    NAD,
-
-    /**
-     * Nigeria: Naira
-     * 
-     */
-    NGN,
-
-    /**
-     * Nicaragua: Cordoba Oro
-     * 
-     */
-    NIO,
-
-    /**
-     * Norwegen: Krone
-     * 
-     */
-    NOK,
-
-    /**
-     * Nepal: Rupie
-     * 
-     */
-    NPR,
-
-    /**
-     * Neuseeland: Dollar
-     * 
-     */
-    NZD,
-
-    /**
-     * Oman: Rial
-     * 
-     */
-    OMR,
-
-    /**
-     * Panama: Balboa
-     * 
-     */
-    PAB,
-
-    /**
-     * Peru: Nuevo Sol
-     * 
-     */
-    PEN,
-
-    /**
-     * Papua-Neuguinea: Kina
-     * 
-     */
-    PGK,
-
-    /**
-     * Philippinen: Peso
-     * 
-     */
-    PHP,
-
-    /**
-     * Pakistan: Rupie
-     * 
-     */
-    PKR,
-
-    /**
-     * Polen: Zloty
-     * 
-     */
-    PLN,
-
-    /**
-     * Paraguay: Guaraní
-     * 
-     */
-    PYG,
-
-    /**
-     * Katar: Riyal
-     * 
-     */
-    QAR,
-
-    /**
-     * Rumänien: Leu
-     * 
-     */
-    ROL,
-
-    /**
-     * Russland: Rubel
-     * 
-     */
-    RUB,
-
-    /**
-     * Ruanda: Franc
-     * 
-     */
-    RWF,
-
-    /**
-     * Saudi-Arabien: Riyal
-     * 
-     */
-    SAR,
-
-    /**
-     * Salomonen: Dollar
-     * 
-     */
-    SBD,
-
-    /**
-     * Seychellen: Rupie
-     * 
-     */
-    SCR,
-
-    /**
-     * Sudan: Dinar
-     * 
-     */
-    SDD,
-
-    /**
-     * Schweden: Krone
-     * 
-     */
-    SEK,
-
-    /**
-     * Singapur: Dollar
-     * 
-     */
-    SGD,
-
-    /**
-     * St. Helena: Pfund
-     * 
-     */
-    SHP,
-
-    /**
-     * Slowenien: Tolar
-     * 
-     */
-    SIT,
-
-    /**
-     * Slowakei: Krone
-     * 
-     */
-    SKK,
-
-    /**
-     * Sierra Leone: Leone
-     * 
-     */
-    SLL,
-
-    /**
-     * Somalia: Schilling
-     * 
-     */
-    SOS,
-
-    /**
-     * Suriname: Dollar
-     * 
-     */
-    SRD,
-
-    /**
-     * São Tomé und Príncipe: Dobra
-     * 
-     */
-    STD,
-
-    /**
-     * El Salvador: Colón
-     * 
-     */
-    SVC,
-
-    /**
-     * Syrien: Pfund
-     * 
-     */
-    SYP,
-
-    /**
-     * Swasiland: Lilangeni
-     * 
-     */
-    SZL,
-
-    /**
-     * Thailand: Baht
-     * 
-     */
-    THB,
-
-    /**
-     * Tadschikistan: Somoni
-     * 
-     */
-    TJS,
-
-    /**
-     * Turkmenistan: Manat
-     * 
-     */
-    TMM,
-
-    /**
-     * Tunesien: Dinar
-     * 
-     */
-    TND,
-
-    /**
-     * Tonga: Pa'anga
-     * 
-     */
-    TOP,
-
-    /**
-     * Türkei: Lira
-     * 
-     */
-    TRL,
-
-    /**
-     * Türkei: Neue Lira (ab 2005)
-     * 
-     */
-    TRY,
-
-    /**
-     * Trinidad und Tobago: Dollar
-     * 
-     */
-    TTD,
-
-    /**
-     * Taiwan: Dollar
-     * 
-     */
-    TWD,
-
-    /**
-     * Tansania: Schilling
-     * 
-     */
-    TZS,
-
-    /**
-     * Ukraine: Hrywnja
-     * 
-     */
-    UAH,
-
-    /**
-     * Uganda: Shilling
-     * 
-     */
-    UGX,
-
-    /**
-     * USA: Dollar
-     * 
-     */
-    USD,
-
-    /**
-     * Uruguay: Peso
-     * 
-     */
-    UYU,
-
-    /**
-     * Usbekistan: Sum
-     * 
-     */
-    UZS,
-
-    /**
-     * Venezuela: Bolivar
-     * 
-     */
-    VEB,
-
-    /**
-     * Vietnam: Dong
-     * 
-     */
-    VND,
-
-    /**
-     * Vanuatu: Vatu
-     * 
-     */
-    VUV,
-
-    /**
-     * Samoa: Tala
-     * 
-     */
-    WST,
-
-    /**
-     * Zentralafrikanische Wirtschafts- und Währungsunion: CFA-Franc
-     * 
-     */
-    XAF,
-
-    /**
-     * Ostkaribische Währungsunion: Dollar
-     * 
-     */
-    XCD,
-
-    /**
-     * Westafrikanische Wirtschafts- und Währungsunion: CFA-Franc
-     * 
-     */
-    XOF,
-
-    /**
-     * Neukaledonien: CFP-Franc
-     * 
-     */
-    XPF,
-
-    /**
-     * Spezialcode für Testzwecke; keine existierende Währung
-     * 
-     */
-    XTS,
-
-    /**
-     * keine Währung
-     * 
-     */
-    XXX,
-
-    /**
-     * Jemen: Rial
-     * 
-     */
-    YER,
-
-    /**
-     * Südafrika: Rand
-     * 
-     */
-    ZAR,
-
-    /**
-     * Sambia: Kwacha
-     * 
-     */
-    ZMK,
-
-    /**
-     * Simbabwe: Dollar
-     * 
-     */
-    ZWD;
-
-    public String value() {
-        return name();
-    }
-
-    public static CurrencyCode fromValue(String v) {
-        return valueOf(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/DSAKeyValueType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/DSAKeyValueType.java
deleted file mode 100644
index ad92499..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/DSAKeyValueType.java
+++ /dev/null
@@ -1,227 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for DSAKeyValueType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="DSAKeyValueType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;sequence minOccurs="0">
- *           &lt;element name="P" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *           &lt;element name="Q" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         &lt;/sequence>
- *         &lt;element name="G" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"; minOccurs="0"/>
- *         &lt;element name="Y" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         &lt;element name="J" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"; minOccurs="0"/>
- *         &lt;sequence minOccurs="0">
- *           &lt;element name="Seed" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *           &lt;element name="PgenCounter" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         &lt;/sequence>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DSAKeyValueType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "p",
-    "q",
-    "g",
-    "y",
-    "j",
-    "seed",
-    "pgenCounter"
-})
-public class DSAKeyValueType {
-
-    @XmlElement(name = "P")
-    protected byte[] p;
-    @XmlElement(name = "Q")
-    protected byte[] q;
-    @XmlElement(name = "G")
-    protected byte[] g;
-    @XmlElement(name = "Y", required = true)
-    protected byte[] y;
-    @XmlElement(name = "J")
-    protected byte[] j;
-    @XmlElement(name = "Seed")
-    protected byte[] seed;
-    @XmlElement(name = "PgenCounter")
-    protected byte[] pgenCounter;
-
-    /**
-     * Gets the value of the p property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getP() {
-        return p;
-    }
-
-    /**
-     * Sets the value of the p property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setP(byte[] value) {
-        this.p = value;
-    }
-
-    /**
-     * Gets the value of the q property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getQ() {
-        return q;
-    }
-
-    /**
-     * Sets the value of the q property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setQ(byte[] value) {
-        this.q = value;
-    }
-
-    /**
-     * Gets the value of the g property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getG() {
-        return g;
-    }
-
-    /**
-     * Sets the value of the g property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setG(byte[] value) {
-        this.g = value;
-    }
-
-    /**
-     * Gets the value of the y property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getY() {
-        return y;
-    }
-
-    /**
-     * Sets the value of the y property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setY(byte[] value) {
-        this.y = value;
-    }
-
-    /**
-     * Gets the value of the j property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getJ() {
-        return j;
-    }
-
-    /**
-     * Sets the value of the j property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setJ(byte[] value) {
-        this.j = value;
-    }
-
-    /**
-     * Gets the value of the seed property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getSeed() {
-        return seed;
-    }
-
-    /**
-     * Sets the value of the seed property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setSeed(byte[] value) {
-        this.seed = value;
-    }
-
-    /**
-     * Gets the value of the pgenCounter property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getPgenCounter() {
-        return pgenCounter;
-    }
-
-    /**
-     * Sets the value of the pgenCounter property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setPgenCounter(byte[] value) {
-        this.pgenCounter = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/DataDigestType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/DataDigestType.java
deleted file mode 100644
index 60f9a15..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/DataDigestType.java
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for DataDigestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="DataDigestType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;urn:org:ebics:H004>DigestType">
- *       &lt;attribute name="SignatureVersion" 
type="{urn:org:ebics:H004}SignatureVersionType" default="A004" />
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DataDigestType", propOrder = {
-    "value"
-})
-public class DataDigestType {
-
-    @XmlValue
-    protected byte[] value;
-    @XmlAttribute(name = "SignatureVersion")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String signatureVersion;
-
-    /**
-     * Datentyp für Hashwerte.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setValue(byte[] value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the signatureVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSignatureVersion() {
-        if (signatureVersion == null) {
-            return "A004";
-        } else {
-            return signatureVersion;
-        }
-    }
-
-    /**
-     * Sets the value of the signatureVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSignatureVersion(String value) {
-        this.signatureVersion = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/DataEncryptionInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/DataEncryptionInfoType.java
deleted file mode 100644
index 43fbd34..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/DataEncryptionInfoType.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for the modelling of information regarding the encryption of 
signature and order data.
- * 
- * <p>Java class for DataEncryptionInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="DataEncryptionInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="EncryptionPubKeyDigest">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension base="&lt;urn:org:ebics:H004>PubKeyDigestType">
- *                 &lt;attribute name="Version" use="required" 
type="{urn:org:ebics:H004}EncryptionVersionType" />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="TransactionKey" 
type="{urn:org:ebics:H004}SymmetricKeyType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DataEncryptionInfoType", propOrder = {
-    "encryptionPubKeyDigest",
-    "transactionKey",
-    "any"
-})
-@XmlSeeAlso({
-    
tech.libeufin.messages.ebics.keyresponse.EbicsKeyManagementResponse.Body.DataTransfer.DataEncryptionInfo.class,
-    
tech.libeufin.messages.ebics.keyresponse.DataTransferRequestType.DataEncryptionInfo.class,
-    
tech.libeufin.messages.ebics.keyresponse.DataTransferResponseType.DataEncryptionInfo.class
-})
-public class DataEncryptionInfoType {
-
-    @XmlElement(name = "EncryptionPubKeyDigest", required = true)
-    protected DataEncryptionInfoType.EncryptionPubKeyDigest 
encryptionPubKeyDigest;
-    @XmlElement(name = "TransactionKey", required = true)
-    protected byte[] transactionKey;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the encryptionPubKeyDigest property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataEncryptionInfoType.EncryptionPubKeyDigest }
-     *     
-     */
-    public DataEncryptionInfoType.EncryptionPubKeyDigest 
getEncryptionPubKeyDigest() {
-        return encryptionPubKeyDigest;
-    }
-
-    /**
-     * Sets the value of the encryptionPubKeyDigest property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataEncryptionInfoType.EncryptionPubKeyDigest }
-     *     
-     */
-    public void 
setEncryptionPubKeyDigest(DataEncryptionInfoType.EncryptionPubKeyDigest value) {
-        this.encryptionPubKeyDigest = value;
-    }
-
-    /**
-     * Gets the value of the transactionKey property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getTransactionKey() {
-        return transactionKey;
-    }
-
-    /**
-     * Sets the value of the transactionKey property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setTransactionKey(byte[] value) {
-        this.transactionKey = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>PubKeyDigestType">
-     *       &lt;attribute name="Version" use="required" 
type="{urn:org:ebics:H004}EncryptionVersionType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class EncryptionPubKeyDigest
-        extends PubKeyDigestType
-    {
-
-        @XmlAttribute(name = "Version", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String version;
-
-        /**
-         * Gets the value of the version property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getVersion() {
-            return version;
-        }
-
-        /**
-         * Sets the value of the version property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setVersion(String value) {
-            this.version = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/DataTransferRequestType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/DataTransferRequestType.java
deleted file mode 100644
index 65bc6f8..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/DataTransferRequestType.java
+++ /dev/null
@@ -1,386 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.namespace.QName;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für den Transfer von Auftragsdaten (Anfrage).
- * 
- * <p>Java class for DataTransferRequestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="DataTransferRequestType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;choice>
- *           &lt;sequence>
- *             &lt;element name="DataEncryptionInfo">
- *               &lt;complexType>
- *                 &lt;complexContent>
- *                   &lt;extension 
base="{urn:org:ebics:H004}DataEncryptionInfoType">
- *                     &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *                   &lt;/extension>
- *                 &lt;/complexContent>
- *               &lt;/complexType>
- *             &lt;/element>
- *             &lt;element name="SignatureData">
- *               &lt;complexType>
- *                 &lt;simpleContent>
- *                   &lt;extension 
base="&lt;urn:org:ebics:H004>SignatureDataType">
- *                     &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *                   &lt;/extension>
- *                 &lt;/simpleContent>
- *               &lt;/complexType>
- *             &lt;/element>
- *           &lt;/sequence>
- *           &lt;sequence>
- *             &lt;element name="OrderData">
- *               &lt;complexType>
- *                 &lt;simpleContent>
- *                   &lt;extension base="&lt;urn:org:ebics:H004>OrderDataType">
- *                     &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
- *                   &lt;/extension>
- *                 &lt;/simpleContent>
- *               &lt;/complexType>
- *             &lt;/element>
- *           &lt;/sequence>
- *         &lt;/choice>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DataTransferRequestType", propOrder = {
-    "dataEncryptionInfo",
-    "signatureData",
-    "orderData",
-    "any"
-})
-public class DataTransferRequestType {
-
-    @XmlElement(name = "DataEncryptionInfo")
-    protected DataTransferRequestType.DataEncryptionInfo dataEncryptionInfo;
-    @XmlElement(name = "SignatureData")
-    protected DataTransferRequestType.SignatureData signatureData;
-    @XmlElement(name = "OrderData")
-    protected DataTransferRequestType.OrderData orderData;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the dataEncryptionInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataTransferRequestType.DataEncryptionInfo }
-     *     
-     */
-    public DataTransferRequestType.DataEncryptionInfo getDataEncryptionInfo() {
-        return dataEncryptionInfo;
-    }
-
-    /**
-     * Sets the value of the dataEncryptionInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataTransferRequestType.DataEncryptionInfo }
-     *     
-     */
-    public void 
setDataEncryptionInfo(DataTransferRequestType.DataEncryptionInfo value) {
-        this.dataEncryptionInfo = value;
-    }
-
-    /**
-     * Gets the value of the signatureData property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataTransferRequestType.SignatureData }
-     *     
-     */
-    public DataTransferRequestType.SignatureData getSignatureData() {
-        return signatureData;
-    }
-
-    /**
-     * Sets the value of the signatureData property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataTransferRequestType.SignatureData }
-     *     
-     */
-    public void setSignatureData(DataTransferRequestType.SignatureData value) {
-        this.signatureData = value;
-    }
-
-    /**
-     * Gets the value of the orderData property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataTransferRequestType.OrderData }
-     *     
-     */
-    public DataTransferRequestType.OrderData getOrderData() {
-        return orderData;
-    }
-
-    /**
-     * Sets the value of the orderData property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataTransferRequestType.OrderData }
-     *     
-     */
-    public void setOrderData(DataTransferRequestType.OrderData value) {
-        this.orderData = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:org:ebics:H004}DataEncryptionInfoType">
-     *       &lt;attGroup ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class DataEncryptionInfo
-        extends DataEncryptionInfoType
-    {
-
-        @XmlAttribute(name = "authenticate", required = true)
-        protected boolean authenticate;
-
-        /**
-         * Gets the value of the authenticate property.
-         * 
-         */
-        public boolean isAuthenticate() {
-            return authenticate;
-        }
-
-        /**
-         * Sets the value of the authenticate property.
-         * 
-         */
-        public void setAuthenticate(boolean value) {
-            this.authenticate = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>OrderDataType">
-     *       &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class OrderData {
-
-        @XmlValue
-        protected byte[] value;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Datentyp für binäre Auftragsdaten (komprimiert, verschlüsselt und 
kodiert).
-         * 
-         * @return
-         *     possible object is
-         *     byte[]
-         */
-        public byte[] getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     byte[]
-         */
-        public void setValue(byte[] value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>SignatureDataType">
-     *       &lt;attGroup ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class SignatureData {
-
-        @XmlValue
-        protected byte[] value;
-        @XmlAttribute(name = "authenticate", required = true)
-        protected boolean authenticate;
-
-        /**
-         * Datentyp für binäre Signaturdaten (komprimiert, verschlüsselt und 
kodiert).
-         * 
-         * @return
-         *     possible object is
-         *     byte[]
-         */
-        public byte[] getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     byte[]
-         */
-        public void setValue(byte[] value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the authenticate property.
-         * 
-         */
-        public boolean isAuthenticate() {
-            return authenticate;
-        }
-
-        /**
-         * Sets the value of the authenticate property.
-         * 
-         */
-        public void setAuthenticate(boolean value) {
-            this.authenticate = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/DataTransferResponseType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/DataTransferResponseType.java
deleted file mode 100644
index c6af887..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/DataTransferResponseType.java
+++ /dev/null
@@ -1,355 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.namespace.QName;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für den Transfer von Auftragsdaten (Antwort).
- * 
- * <p>Java class for DataTransferResponseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="DataTransferResponseType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;sequence minOccurs="0">
- *           &lt;element name="DataEncryptionInfo">
- *             &lt;complexType>
- *               &lt;complexContent>
- *                 &lt;extension 
base="{urn:org:ebics:H004}DataEncryptionInfoType">
- *                   &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *                 &lt;/extension>
- *               &lt;/complexContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *           &lt;element name="SignatureData" maxOccurs="0" minOccurs="0">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;urn:org:ebics:H004>SignatureDataType">
- *                   &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *         &lt;/sequence>
- *         &lt;element name="OrderData">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension base="&lt;urn:org:ebics:H004>OrderDataType">
- *                 &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DataTransferResponseType", propOrder = {
-    "dataEncryptionInfo",
-    "orderData",
-    "any"
-})
-public class DataTransferResponseType {
-
-    @XmlElement(name = "DataEncryptionInfo")
-    protected DataTransferResponseType.DataEncryptionInfo dataEncryptionInfo;
-    @XmlElement(name = "OrderData", required = true)
-    protected DataTransferResponseType.OrderData orderData;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the dataEncryptionInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataTransferResponseType.DataEncryptionInfo }
-     *     
-     */
-    public DataTransferResponseType.DataEncryptionInfo getDataEncryptionInfo() 
{
-        return dataEncryptionInfo;
-    }
-
-    /**
-     * Sets the value of the dataEncryptionInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataTransferResponseType.DataEncryptionInfo }
-     *     
-     */
-    public void 
setDataEncryptionInfo(DataTransferResponseType.DataEncryptionInfo value) {
-        this.dataEncryptionInfo = value;
-    }
-
-    /**
-     * Gets the value of the orderData property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataTransferResponseType.OrderData }
-     *     
-     */
-    public DataTransferResponseType.OrderData getOrderData() {
-        return orderData;
-    }
-
-    /**
-     * Sets the value of the orderData property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataTransferResponseType.OrderData }
-     *     
-     */
-    public void setOrderData(DataTransferResponseType.OrderData value) {
-        this.orderData = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:org:ebics:H004}DataEncryptionInfoType">
-     *       &lt;attGroup ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class DataEncryptionInfo
-        extends DataEncryptionInfoType
-    {
-
-        @XmlAttribute(name = "authenticate", required = true)
-        protected boolean authenticate;
-
-        /**
-         * Gets the value of the authenticate property.
-         * 
-         */
-        public boolean isAuthenticate() {
-            return authenticate;
-        }
-
-        /**
-         * Sets the value of the authenticate property.
-         * 
-         */
-        public void setAuthenticate(boolean value) {
-            this.authenticate = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>OrderDataType">
-     *       &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class OrderData {
-
-        @XmlValue
-        protected byte[] value;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Datentyp für binäre Auftragsdaten (komprimiert, verschlüsselt und 
kodiert).
-         * 
-         * @return
-         *     possible object is
-         *     byte[]
-         */
-        public byte[] getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     byte[]
-         */
-        public void setValue(byte[] value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>SignatureDataType">
-     *       &lt;attGroup ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class SignatureData {
-
-        @XmlValue
-        protected byte[] value;
-        @XmlAttribute(name = "authenticate", required = true)
-        protected boolean authenticate;
-
-        /**
-         * Datentyp für binäre Signaturdaten (komprimiert, verschlüsselt und 
kodiert).
-         * 
-         * @return
-         *     possible object is
-         *     byte[]
-         */
-        public byte[] getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     byte[]
-         */
-        public void setValue(byte[] value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the authenticate property.
-         * 
-         */
-        public boolean isAuthenticate() {
-            return authenticate;
-        }
-
-        /**
-         * Sets the value of the authenticate property.
-         * 
-         */
-        public void setAuthenticate(boolean value) {
-            this.authenticate = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/DigestMethodType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/DigestMethodType.java
deleted file mode 100644
index 2f84a68..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/DigestMethodType.java
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for DigestMethodType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="DigestMethodType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Algorithm" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DigestMethodType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class DigestMethodType {
-
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Algorithm", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String algorithm;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-    /**
-     * Gets the value of the algorithm property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAlgorithm() {
-        return algorithm;
-    }
-
-    /**
-     * Sets the value of the algorithm property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAlgorithm(String value) {
-        this.algorithm = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/EbicsKeyManagementResponse.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/EbicsKeyManagementResponse.java
deleted file mode 100644
index 89813f4..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/EbicsKeyManagementResponse.java
+++ /dev/null
@@ -1,927 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="header">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;sequence>
- *                   &lt;element name="static">
- *                     &lt;complexType>
- *                       &lt;complexContent>
- *                         &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                           &lt;sequence>
- *                           &lt;/sequence>
- *                         &lt;/restriction>
- *                       &lt;/complexContent>
- *                     &lt;/complexType>
- *                   &lt;/element>
- *                   &lt;element name="mutable" 
type="{urn:org:ebics:H004}KeyMgmntResponseMutableHeaderType"/>
- *                 &lt;/sequence>
- *                 &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="body">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;sequence>
- *                   &lt;element name="DataTransfer" minOccurs="0">
- *                     &lt;complexType>
- *                       &lt;complexContent>
- *                         &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                           &lt;sequence>
- *                             &lt;element name="DataEncryptionInfo">
- *                               &lt;complexType>
- *                                 &lt;complexContent>
- *                                   &lt;extension 
base="{urn:org:ebics:H004}DataEncryptionInfoType">
- *                                     &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *                                   &lt;/extension>
- *                                 &lt;/complexContent>
- *                               &lt;/complexType>
- *                             &lt;/element>
- *                             &lt;element name="OrderData">
- *                               &lt;complexType>
- *                                 &lt;simpleContent>
- *                                   &lt;extension 
base="&lt;urn:org:ebics:H004>OrderDataType">
- *                                     &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
- *                                   &lt;/extension>
- *                                 &lt;/simpleContent>
- *                               &lt;/complexType>
- *                             &lt;/element>
- *                             &lt;any processContents='lax' 
namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *                           &lt;/sequence>
- *                         &lt;/restriction>
- *                       &lt;/complexContent>
- *                     &lt;/complexType>
- *                   &lt;/element>
- *                   &lt;element name="ReturnCode">
- *                     &lt;complexType>
- *                       &lt;simpleContent>
- *                         &lt;extension 
base="&lt;urn:org:ebics:H004>ReturnCodeType">
- *                           &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *                         &lt;/extension>
- *                       &lt;/simpleContent>
- *                     &lt;/complexType>
- *                   &lt;/element>
- *                   &lt;element name="TimestampBankParameter" minOccurs="0">
- *                     &lt;complexType>
- *                       &lt;simpleContent>
- *                         &lt;extension 
base="&lt;urn:org:ebics:H004>TimestampType">
- *                           &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *                         &lt;/extension>
- *                       &lt;/simpleContent>
- *                     &lt;/complexType>
- *                   &lt;/element>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *       &lt;attGroup ref="{urn:org:ebics:H004}VersionAttrGroup"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "header",
-    "body"
-})
-@XmlRootElement(name = "ebicsKeyManagementResponse")
-public class EbicsKeyManagementResponse {
-
-    @XmlElement(required = true)
-    protected EbicsKeyManagementResponse.Header header;
-    @XmlElement(required = true)
-    protected EbicsKeyManagementResponse.Body body;
-    @XmlAttribute(name = "Version", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String version;
-    @XmlAttribute(name = "Revision")
-    protected Integer revision;
-
-    /**
-     * Gets the value of the header property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EbicsKeyManagementResponse.Header }
-     *     
-     */
-    public EbicsKeyManagementResponse.Header getHeader() {
-        return header;
-    }
-
-    /**
-     * Sets the value of the header property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EbicsKeyManagementResponse.Header }
-     *     
-     */
-    public void setHeader(EbicsKeyManagementResponse.Header value) {
-        this.header = value;
-    }
-
-    /**
-     * Gets the value of the body property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EbicsKeyManagementResponse.Body }
-     *     
-     */
-    public EbicsKeyManagementResponse.Body getBody() {
-        return body;
-    }
-
-    /**
-     * Sets the value of the body property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EbicsKeyManagementResponse.Body }
-     *     
-     */
-    public void setBody(EbicsKeyManagementResponse.Body value) {
-        this.body = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVersion() {
-        return version;
-    }
-
-    /**
-     * Sets the value of the version property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVersion(String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the revision property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getRevision() {
-        return revision;
-    }
-
-    /**
-     * Sets the value of the revision property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setRevision(Integer value) {
-        this.revision = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;sequence>
-     *         &lt;element name="DataTransfer" minOccurs="0">
-     *           &lt;complexType>
-     *             &lt;complexContent>
-     *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *                 &lt;sequence>
-     *                   &lt;element name="DataEncryptionInfo">
-     *                     &lt;complexType>
-     *                       &lt;complexContent>
-     *                         &lt;extension 
base="{urn:org:ebics:H004}DataEncryptionInfoType">
-     *                           &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *                         &lt;/extension>
-     *                       &lt;/complexContent>
-     *                     &lt;/complexType>
-     *                   &lt;/element>
-     *                   &lt;element name="OrderData">
-     *                     &lt;complexType>
-     *                       &lt;simpleContent>
-     *                         &lt;extension 
base="&lt;urn:org:ebics:H004>OrderDataType">
-     *                           &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
-     *                         &lt;/extension>
-     *                       &lt;/simpleContent>
-     *                     &lt;/complexType>
-     *                   &lt;/element>
-     *                   &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
-     *                 &lt;/sequence>
-     *               &lt;/restriction>
-     *             &lt;/complexContent>
-     *           &lt;/complexType>
-     *         &lt;/element>
-     *         &lt;element name="ReturnCode">
-     *           &lt;complexType>
-     *             &lt;simpleContent>
-     *               &lt;extension 
base="&lt;urn:org:ebics:H004>ReturnCodeType">
-     *                 &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *               &lt;/extension>
-     *             &lt;/simpleContent>
-     *           &lt;/complexType>
-     *         &lt;/element>
-     *         &lt;element name="TimestampBankParameter" minOccurs="0">
-     *           &lt;complexType>
-     *             &lt;simpleContent>
-     *               &lt;extension base="&lt;urn:org:ebics:H004>TimestampType">
-     *                 &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *               &lt;/extension>
-     *             &lt;/simpleContent>
-     *           &lt;/complexType>
-     *         &lt;/element>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "dataTransfer",
-        "returnCode",
-        "timestampBankParameter"
-    })
-    public static class Body {
-
-        @XmlElement(name = "DataTransfer")
-        protected EbicsKeyManagementResponse.Body.DataTransfer dataTransfer;
-        @XmlElement(name = "ReturnCode", required = true)
-        protected EbicsKeyManagementResponse.Body.ReturnCode returnCode;
-        @XmlElement(name = "TimestampBankParameter")
-        protected EbicsKeyManagementResponse.Body.TimestampBankParameter 
timestampBankParameter;
-
-        /**
-         * Gets the value of the dataTransfer property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link EbicsKeyManagementResponse.Body.DataTransfer }
-         *     
-         */
-        public EbicsKeyManagementResponse.Body.DataTransfer getDataTransfer() {
-            return dataTransfer;
-        }
-
-        /**
-         * Sets the value of the dataTransfer property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link EbicsKeyManagementResponse.Body.DataTransfer }
-         *     
-         */
-        public void 
setDataTransfer(EbicsKeyManagementResponse.Body.DataTransfer value) {
-            this.dataTransfer = value;
-        }
-
-        /**
-         * Gets the value of the returnCode property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link EbicsKeyManagementResponse.Body.ReturnCode }
-         *     
-         */
-        public EbicsKeyManagementResponse.Body.ReturnCode getReturnCode() {
-            return returnCode;
-        }
-
-        /**
-         * Sets the value of the returnCode property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link EbicsKeyManagementResponse.Body.ReturnCode }
-         *     
-         */
-        public void setReturnCode(EbicsKeyManagementResponse.Body.ReturnCode 
value) {
-            this.returnCode = value;
-        }
-
-        /**
-         * Gets the value of the timestampBankParameter property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link EbicsKeyManagementResponse.Body.TimestampBankParameter }
-         *     
-         */
-        public EbicsKeyManagementResponse.Body.TimestampBankParameter 
getTimestampBankParameter() {
-            return timestampBankParameter;
-        }
-
-        /**
-         * Sets the value of the timestampBankParameter property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link EbicsKeyManagementResponse.Body.TimestampBankParameter }
-         *     
-         */
-        public void 
setTimestampBankParameter(EbicsKeyManagementResponse.Body.TimestampBankParameter
 value) {
-            this.timestampBankParameter = value;
-        }
-
-
-        /**
-         * <p>Java class for anonymous complex type.
-         * 
-         * <p>The following schema fragment specifies the expected content 
contained within this class.
-         * 
-         * <pre>
-         * &lt;complexType>
-         *   &lt;complexContent>
-         *     &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
-         *       &lt;sequence>
-         *         &lt;element name="DataEncryptionInfo">
-         *           &lt;complexType>
-         *             &lt;complexContent>
-         *               &lt;extension 
base="{urn:org:ebics:H004}DataEncryptionInfoType">
-         *                 &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-         *               &lt;/extension>
-         *             &lt;/complexContent>
-         *           &lt;/complexType>
-         *         &lt;/element>
-         *         &lt;element name="OrderData">
-         *           &lt;complexType>
-         *             &lt;simpleContent>
-         *               &lt;extension 
base="&lt;urn:org:ebics:H004>OrderDataType">
-         *                 &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
-         *               &lt;/extension>
-         *             &lt;/simpleContent>
-         *           &lt;/complexType>
-         *         &lt;/element>
-         *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
-         *       &lt;/sequence>
-         *     &lt;/restriction>
-         *   &lt;/complexContent>
-         * &lt;/complexType>
-         * </pre>
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "dataEncryptionInfo",
-            "orderData",
-            "any"
-        })
-        public static class DataTransfer {
-
-            @XmlElement(name = "DataEncryptionInfo", required = true)
-            protected 
EbicsKeyManagementResponse.Body.DataTransfer.DataEncryptionInfo 
dataEncryptionInfo;
-            @XmlElement(name = "OrderData", required = true)
-            protected EbicsKeyManagementResponse.Body.DataTransfer.OrderData 
orderData;
-            @XmlAnyElement(lax = true)
-            protected List<Object> any;
-
-            /**
-             * Gets the value of the dataEncryptionInfo property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link 
EbicsKeyManagementResponse.Body.DataTransfer.DataEncryptionInfo }
-             *     
-             */
-            public 
EbicsKeyManagementResponse.Body.DataTransfer.DataEncryptionInfo 
getDataEncryptionInfo() {
-                return dataEncryptionInfo;
-            }
-
-            /**
-             * Sets the value of the dataEncryptionInfo property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link 
EbicsKeyManagementResponse.Body.DataTransfer.DataEncryptionInfo }
-             *     
-             */
-            public void 
setDataEncryptionInfo(EbicsKeyManagementResponse.Body.DataTransfer.DataEncryptionInfo
 value) {
-                this.dataEncryptionInfo = value;
-            }
-
-            /**
-             * Gets the value of the orderData property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link 
EbicsKeyManagementResponse.Body.DataTransfer.OrderData }
-             *     
-             */
-            public EbicsKeyManagementResponse.Body.DataTransfer.OrderData 
getOrderData() {
-                return orderData;
-            }
-
-            /**
-             * Sets the value of the orderData property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link 
EbicsKeyManagementResponse.Body.DataTransfer.OrderData }
-             *     
-             */
-            public void 
setOrderData(EbicsKeyManagementResponse.Body.DataTransfer.OrderData value) {
-                this.orderData = value;
-            }
-
-            /**
-             * Gets the value of the any property.
-             * 
-             * <p>
-             * This accessor method returns a reference to the live list,
-             * not a snapshot. Therefore any modification you make to the
-             * returned list will be present inside the JAXB object.
-             * This is why there is not a <CODE>set</CODE> method for the any 
property.
-             * 
-             * <p>
-             * For example, to add a new item, do as follows:
-             * <pre>
-             *    getAny().add(newItem);
-             * </pre>
-             * 
-             * 
-             * <p>
-             * Objects of the following type(s) are allowed in the list
-             * {@link Element }
-             * {@link Object }
-             * 
-             * 
-             */
-            public List<Object> getAny() {
-                if (any == null) {
-                    any = new ArrayList<Object>();
-                }
-                return this.any;
-            }
-
-
-            /**
-             * <p>Java class for anonymous complex type.
-             * 
-             * <p>The following schema fragment specifies the expected content 
contained within this class.
-             * 
-             * <pre>
-             * &lt;complexType>
-             *   &lt;complexContent>
-             *     &lt;extension 
base="{urn:org:ebics:H004}DataEncryptionInfoType">
-             *       &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-             *     &lt;/extension>
-             *   &lt;/complexContent>
-             * &lt;/complexType>
-             * </pre>
-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "")
-            public static class DataEncryptionInfo
-                extends DataEncryptionInfoType
-            {
-
-                @XmlAttribute(name = "authenticate", required = true)
-                protected boolean authenticate;
-
-                /**
-                 * Gets the value of the authenticate property.
-                 * 
-                 */
-                public boolean isAuthenticate() {
-                    return authenticate;
-                }
-
-                /**
-                 * Sets the value of the authenticate property.
-                 * 
-                 */
-                public void setAuthenticate(boolean value) {
-                    this.authenticate = value;
-                }
-
-            }
-
-
-            /**
-             * <p>Java class for anonymous complex type.
-             * 
-             * <p>The following schema fragment specifies the expected content 
contained within this class.
-             * 
-             * <pre>
-             * &lt;complexType>
-             *   &lt;simpleContent>
-             *     &lt;extension base="&lt;urn:org:ebics:H004>OrderDataType">
-             *       &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
-             *     &lt;/extension>
-             *   &lt;/simpleContent>
-             * &lt;/complexType>
-             * </pre>
-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "", propOrder = {
-                "value"
-            })
-            public static class OrderData {
-
-                @XmlValue
-                protected byte[] value;
-                @XmlAnyAttribute
-                private Map<QName, String> otherAttributes = new 
HashMap<QName, String>();
-
-                /**
-                 * Datentyp für binäre Auftragsdaten (komprimiert, 
verschlüsselt und kodiert).
-                 * 
-                 * @return
-                 *     possible object is
-                 *     byte[]
-                 */
-                public byte[] getValue() {
-                    return value;
-                }
-
-                /**
-                 * Sets the value of the value property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     byte[]
-                 */
-                public void setValue(byte[] value) {
-                    this.value = value;
-                }
-
-                /**
-                 * Gets a map that contains attributes that aren't bound to 
any typed property on this class.
-                 * 
-                 * <p>
-                 * the map is keyed by the name of the attribute and 
-                 * the value is the string value of the attribute.
-                 * 
-                 * the map returned by this method is live, and you can add 
new attribute
-                 * by updating the map directly. Because of this design, 
there's no setter.
-                 * 
-                 * 
-                 * @return
-                 *     always non-null
-                 */
-                public Map<QName, String> getOtherAttributes() {
-                    return otherAttributes;
-                }
-
-            }
-
-        }
-
-
-        /**
-         * <p>Java class for anonymous complex type.
-         * 
-         * <p>The following schema fragment specifies the expected content 
contained within this class.
-         * 
-         * <pre>
-         * &lt;complexType>
-         *   &lt;simpleContent>
-         *     &lt;extension base="&lt;urn:org:ebics:H004>ReturnCodeType">
-         *       &lt;attGroup ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-         *     &lt;/extension>
-         *   &lt;/simpleContent>
-         * &lt;/complexType>
-         * </pre>
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "value"
-        })
-        public static class ReturnCode {
-
-            @XmlValue
-            @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-            protected String value;
-            @XmlAttribute(name = "authenticate", required = true)
-            protected boolean authenticate;
-
-            /**
-             * Datentyp für Antwortcodes.
-             * 
-             * @return
-             *     possible object is
-             *     {@link String }
-             *     
-             */
-            public String getValue() {
-                return value;
-            }
-
-            /**
-             * Sets the value of the value property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *     
-             */
-            public void setValue(String value) {
-                this.value = value;
-            }
-
-            /**
-             * Gets the value of the authenticate property.
-             * 
-             */
-            public boolean isAuthenticate() {
-                return authenticate;
-            }
-
-            /**
-             * Sets the value of the authenticate property.
-             * 
-             */
-            public void setAuthenticate(boolean value) {
-                this.authenticate = value;
-            }
-
-        }
-
-
-        /**
-         * <p>Java class for anonymous complex type.
-         * 
-         * <p>The following schema fragment specifies the expected content 
contained within this class.
-         * 
-         * <pre>
-         * &lt;complexType>
-         *   &lt;simpleContent>
-         *     &lt;extension base="&lt;urn:org:ebics:H004>TimestampType">
-         *       &lt;attGroup ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-         *     &lt;/extension>
-         *   &lt;/simpleContent>
-         * &lt;/complexType>
-         * </pre>
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "value"
-        })
-        public static class TimestampBankParameter {
-
-            @XmlValue
-            protected XMLGregorianCalendar value;
-            @XmlAttribute(name = "authenticate", required = true)
-            protected boolean authenticate;
-
-            /**
-             * Datentyp für Zeitstempel.
-             * 
-             * @return
-             *     possible object is
-             *     {@link XMLGregorianCalendar }
-             *     
-             */
-            public XMLGregorianCalendar getValue() {
-                return value;
-            }
-
-            /**
-             * Sets the value of the value property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link XMLGregorianCalendar }
-             *     
-             */
-            public void setValue(XMLGregorianCalendar value) {
-                this.value = value;
-            }
-
-            /**
-             * Gets the value of the authenticate property.
-             * 
-             */
-            public boolean isAuthenticate() {
-                return authenticate;
-            }
-
-            /**
-             * Sets the value of the authenticate property.
-             * 
-             */
-            public void setAuthenticate(boolean value) {
-                this.authenticate = value;
-            }
-
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;sequence>
-     *         &lt;element name="static">
-     *           &lt;complexType>
-     *             &lt;complexContent>
-     *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *                 &lt;sequence>
-     *                 &lt;/sequence>
-     *               &lt;/restriction>
-     *             &lt;/complexContent>
-     *           &lt;/complexType>
-     *         &lt;/element>
-     *         &lt;element name="mutable" 
type="{urn:org:ebics:H004}KeyMgmntResponseMutableHeaderType"/>
-     *       &lt;/sequence>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "_static",
-        "mutable"
-    })
-    public static class Header {
-
-        @XmlElement(name = "static", required = true)
-        protected EbicsKeyManagementResponse.Header.Static _static;
-        @XmlElement(required = true)
-        protected KeyMgmntResponseMutableHeaderType mutable;
-        @XmlAttribute(name = "authenticate", required = true)
-        protected boolean authenticate;
-
-        /**
-         * Gets the value of the static property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link EbicsKeyManagementResponse.Header.Static }
-         *     
-         */
-        public EbicsKeyManagementResponse.Header.Static getStatic() {
-            return _static;
-        }
-
-        /**
-         * Sets the value of the static property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link EbicsKeyManagementResponse.Header.Static }
-         *     
-         */
-        public void setStatic(EbicsKeyManagementResponse.Header.Static value) {
-            this._static = value;
-        }
-
-        /**
-         * Gets the value of the mutable property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link KeyMgmntResponseMutableHeaderType }
-         *     
-         */
-        public KeyMgmntResponseMutableHeaderType getMutable() {
-            return mutable;
-        }
-
-        /**
-         * Sets the value of the mutable property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link KeyMgmntResponseMutableHeaderType }
-         *     
-         */
-        public void setMutable(KeyMgmntResponseMutableHeaderType value) {
-            this.mutable = value;
-        }
-
-        /**
-         * Gets the value of the authenticate property.
-         * 
-         */
-        public boolean isAuthenticate() {
-            return authenticate;
-        }
-
-        /**
-         * Sets the value of the authenticate property.
-         * 
-         */
-        public void setAuthenticate(boolean value) {
-            this.authenticate = value;
-        }
-
-
-        /**
-         * <p>Java class for anonymous complex type.
-         * 
-         * <p>The following schema fragment specifies the expected content 
contained within this class.
-         * 
-         * <pre>
-         * &lt;complexType>
-         *   &lt;complexContent>
-         *     &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
-         *       &lt;sequence>
-         *       &lt;/sequence>
-         *     &lt;/restriction>
-         *   &lt;/complexContent>
-         * &lt;/complexType>
-         * </pre>
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class Static {
-
-
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/EncryptionCertificateInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/EncryptionCertificateInfoType.java
deleted file mode 100644
index cefbac8..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/EncryptionCertificateInfoType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Data type for encryption key.
- * 
- * <p>Java class for EncryptionCertificateInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="EncryptionCertificateInfoType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}CertificateInfoType">
- *       &lt;sequence>
- *         &lt;element name="EncryptionVersion" 
type="{urn:org:ebics:H004}EncryptionVersionType"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EncryptionCertificateInfoType", propOrder = {
-    "encryptionVersion"
-})
-public class EncryptionCertificateInfoType
-    extends CertificateInfoType
-{
-
-    @XmlElement(name = "EncryptionVersion", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String encryptionVersion;
-
-    /**
-     * Gets the value of the encryptionVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getEncryptionVersion() {
-        return encryptionVersion;
-    }
-
-    /**
-     * Sets the value of the encryptionVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setEncryptionVersion(String value) {
-        this.encryptionVersion = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/EncryptionPubKeyInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/EncryptionPubKeyInfoType.java
deleted file mode 100644
index 3cf9330..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/EncryptionPubKeyInfoType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für öffentliche Verschlüsselungsschlüssel.
- * 
- * <p>Java class for EncryptionPubKeyInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="EncryptionPubKeyInfoType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}PubKeyInfoType">
- *       &lt;sequence>
- *         &lt;element name="EncryptionVersion" 
type="{urn:org:ebics:H004}EncryptionVersionType"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EncryptionPubKeyInfoType", propOrder = {
-    "encryptionVersion"
-})
-public class EncryptionPubKeyInfoType
-    extends PubKeyInfoTypeAtEbicsTypes
-{
-
-    @XmlElement(name = "EncryptionVersion", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String encryptionVersion;
-
-    /**
-     * Gets the value of the encryptionVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getEncryptionVersion() {
-        return encryptionVersion;
-    }
-
-    /**
-     * Sets the value of the encryptionVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setEncryptionVersion(String value) {
-        this.encryptionVersion = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/FDLOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/FDLOrderParamsType.java
deleted file mode 100644
index 8837a9a..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/FDLOrderParamsType.java
+++ /dev/null
@@ -1,232 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für Auftragsart FDL.
- * 
- * <p>Java class for FDLOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="FDLOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="DateRange" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;sequence>
- *                   &lt;element name="Start" 
type="{urn:org:ebics:H004}DateType"/>
- *                   &lt;element name="End" 
type="{urn:org:ebics:H004}DateType"/>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element ref="{urn:org:ebics:H004}Parameter" 
maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="FileFormat" 
type="{urn:org:ebics:H004}FileFormatType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FDLOrderParamsType", propOrder = {
-    "dateRange",
-    "parameter",
-    "fileFormat"
-})
-public class FDLOrderParamsType {
-
-    @XmlElement(name = "DateRange")
-    protected FDLOrderParamsType.DateRange dateRange;
-    @XmlElement(name = "Parameter")
-    protected List<Parameter> parameter;
-    @XmlElement(name = "FileFormat", required = true)
-    protected FileFormatType fileFormat;
-
-    /**
-     * Gets the value of the dateRange property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FDLOrderParamsType.DateRange }
-     *     
-     */
-    public FDLOrderParamsType.DateRange getDateRange() {
-        return dateRange;
-    }
-
-    /**
-     * Sets the value of the dateRange property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FDLOrderParamsType.DateRange }
-     *     
-     */
-    public void setDateRange(FDLOrderParamsType.DateRange value) {
-        this.dateRange = value;
-    }
-
-    /**
-     * Gets the value of the parameter property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the parameter 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getParameter().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Parameter }
-     * 
-     * 
-     */
-    public List<Parameter> getParameter() {
-        if (parameter == null) {
-            parameter = new ArrayList<Parameter>();
-        }
-        return this.parameter;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;sequence>
-     *         &lt;element name="Start" type="{urn:org:ebics:H004}DateType"/>
-     *         &lt;element name="End" type="{urn:org:ebics:H004}DateType"/>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "start",
-        "end"
-    })
-    public static class DateRange {
-
-        @XmlElement(name = "Start", required = true)
-        @XmlSchemaType(name = "date")
-        protected XMLGregorianCalendar start;
-        @XmlElement(name = "End", required = true)
-        @XmlSchemaType(name = "date")
-        protected XMLGregorianCalendar end;
-
-        /**
-         * Gets the value of the start property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public XMLGregorianCalendar getStart() {
-            return start;
-        }
-
-        /**
-         * Sets the value of the start property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public void setStart(XMLGregorianCalendar value) {
-            this.start = value;
-        }
-
-        /**
-         * Gets the value of the end property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public XMLGregorianCalendar getEnd() {
-            return end;
-        }
-
-        /**
-         * Sets the value of the end property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public void setEnd(XMLGregorianCalendar value) {
-            this.end = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/FULOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/FULOrderParamsType.java
deleted file mode 100644
index d77e5bf..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/FULOrderParamsType.java
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für Auftragsart FUL.
- * 
- * <p>Java class for FULOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="FULOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{urn:org:ebics:H004}Parameter" 
maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="FileFormat" 
type="{urn:org:ebics:H004}FileFormatType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FULOrderParamsType", propOrder = {
-    "parameter",
-    "fileFormat"
-})
-public class FULOrderParamsType {
-
-    @XmlElement(name = "Parameter")
-    protected List<Parameter> parameter;
-    @XmlElement(name = "FileFormat", required = true)
-    protected FileFormatType fileFormat;
-
-    /**
-     * Gets the value of the parameter property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the parameter 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getParameter().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Parameter }
-     * 
-     * 
-     */
-    public List<Parameter> getParameter() {
-        if (parameter == null) {
-            parameter = new ArrayList<Parameter>();
-        }
-        return this.parameter;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/FileFormatType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/FileFormatType.java
deleted file mode 100644
index 7110050..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/FileFormatType.java
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für das Dateiformat.
- * 
- * <p>Java class for FileFormatType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="FileFormatType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>token">
- *       &lt;attribute name="CountryCode" 
type="{urn:org:ebics:H004}CountryCodeType" />
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FileFormatType", propOrder = {
-    "value"
-})
-public class FileFormatType {
-
-    @XmlValue
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String value;
-    @XmlAttribute(name = "CountryCode")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String countryCode;
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the countryCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCountryCode() {
-        return countryCode;
-    }
-
-    /**
-     * Sets the value of the countryCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCountryCode(String value) {
-        this.countryCode = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/GenericOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/GenericOrderParamsType.java
deleted file mode 100644
index 5a006ed..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/GenericOrderParamsType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für beliebige Auftragsarten.
- * 
- * <p>Java class for GenericOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="GenericOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{urn:org:ebics:H004}Parameter" 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GenericOrderParamsType", propOrder = {
-    "parameter"
-})
-public class GenericOrderParamsType {
-
-    @XmlElement(name = "Parameter")
-    protected List<Parameter> parameter;
-
-    /**
-     * Gets the value of the parameter property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the parameter 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getParameter().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Parameter }
-     * 
-     * 
-     */
-    public List<Parameter> getParameter() {
-        if (parameter == null) {
-            parameter = new ArrayList<Parameter>();
-        }
-        return this.parameter;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/H3KRequestOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/H3KRequestOrderDataType.java
deleted file mode 100644
index 956730e..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/H3KRequestOrderDataType.java
+++ /dev/null
@@ -1,190 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Order type for order data H3K (request: initialise all three user's keys).
- * 
- * <p>Java class for H3KRequestOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="H3KRequestOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="SignatureCertificateInfo" 
type="{urn:org:ebics:H004}SignatureCertificateInfoType"/>
- *         &lt;element name="AuthenticationCertificateInfo" 
type="{urn:org:ebics:H004}AuthenticationCertificateInfoType"/>
- *         &lt;element name="EncryptionCertificateInfo" 
type="{urn:org:ebics:H004}EncryptionCertificateInfoType"/>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "H3KRequestOrderDataType", propOrder = {
-    "signatureCertificateInfo",
-    "authenticationCertificateInfo",
-    "encryptionCertificateInfo",
-    "partnerID",
-    "userID"
-})
-public class H3KRequestOrderDataType {
-
-    @XmlElement(name = "SignatureCertificateInfo", required = true)
-    protected SignatureCertificateInfoType signatureCertificateInfo;
-    @XmlElement(name = "AuthenticationCertificateInfo", required = true)
-    protected AuthenticationCertificateInfoType authenticationCertificateInfo;
-    @XmlElement(name = "EncryptionCertificateInfo", required = true)
-    protected EncryptionCertificateInfoType encryptionCertificateInfo;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-
-    /**
-     * Gets the value of the signatureCertificateInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignatureCertificateInfoType }
-     *     
-     */
-    public SignatureCertificateInfoType getSignatureCertificateInfo() {
-        return signatureCertificateInfo;
-    }
-
-    /**
-     * Sets the value of the signatureCertificateInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignatureCertificateInfoType }
-     *     
-     */
-    public void setSignatureCertificateInfo(SignatureCertificateInfoType 
value) {
-        this.signatureCertificateInfo = value;
-    }
-
-    /**
-     * Gets the value of the authenticationCertificateInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthenticationCertificateInfoType }
-     *     
-     */
-    public AuthenticationCertificateInfoType 
getAuthenticationCertificateInfo() {
-        return authenticationCertificateInfo;
-    }
-
-    /**
-     * Sets the value of the authenticationCertificateInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthenticationCertificateInfoType }
-     *     
-     */
-    public void 
setAuthenticationCertificateInfo(AuthenticationCertificateInfoType value) {
-        this.authenticationCertificateInfo = value;
-    }
-
-    /**
-     * Gets the value of the encryptionCertificateInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EncryptionCertificateInfoType }
-     *     
-     */
-    public EncryptionCertificateInfoType getEncryptionCertificateInfo() {
-        return encryptionCertificateInfo;
-    }
-
-    /**
-     * Sets the value of the encryptionCertificateInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EncryptionCertificateInfoType }
-     *     
-     */
-    public void setEncryptionCertificateInfo(EncryptionCertificateInfoType 
value) {
-        this.encryptionCertificateInfo = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HAAResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HAAResponseOrderDataType.java
deleted file mode 100644
index 48f06e4..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HAAResponseOrderDataType.java
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HAA (Antwort: abrufbare 
Auftragsarten abholen).
- * 
- * <p>Java class for HAAResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HAAResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderTypes" 
type="{urn:org:ebics:H004}OrderTListType"/>
- *         &lt;any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HAAResponseOrderDataType", propOrder = {
-    "orderTypes",
-    "any"
-})
-public class HAAResponseOrderDataType {
-
-    @XmlList
-    @XmlElement(name = "OrderTypes", required = true)
-    protected List<String> orderTypes;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderTypes property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderTypes 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderTypes().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getOrderTypes() {
-        if (orderTypes == null) {
-            orderTypes = new ArrayList<String>();
-        }
-        return this.orderTypes;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HCARequestOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HCARequestOrderDataType.java
deleted file mode 100644
index 479dc3d..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HCARequestOrderDataType.java
+++ /dev/null
@@ -1,200 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HCA (Anfrage: Änderung der 
Teilnehmerschlüssel für Authentifikation und Verschlüsselung).
- * 
- * <p>Java class for HCARequestOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HCARequestOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="AuthenticationPubKeyInfo" 
type="{urn:org:ebics:H004}AuthenticationPubKeyInfoType"/>
- *         &lt;element name="EncryptionPubKeyInfo" 
type="{urn:org:ebics:H004}EncryptionPubKeyInfoType"/>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HCARequestOrderDataType", propOrder = {
-    "authenticationPubKeyInfo",
-    "encryptionPubKeyInfo",
-    "partnerID",
-    "userID",
-    "any"
-})
-public class HCARequestOrderDataType {
-
-    @XmlElement(name = "AuthenticationPubKeyInfo", required = true)
-    protected AuthenticationPubKeyInfoType authenticationPubKeyInfo;
-    @XmlElement(name = "EncryptionPubKeyInfo", required = true)
-    protected EncryptionPubKeyInfoType encryptionPubKeyInfo;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the authenticationPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public AuthenticationPubKeyInfoType getAuthenticationPubKeyInfo() {
-        return authenticationPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the authenticationPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public void setAuthenticationPubKeyInfo(AuthenticationPubKeyInfoType 
value) {
-        this.authenticationPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the encryptionPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public EncryptionPubKeyInfoType getEncryptionPubKeyInfo() {
-        return encryptionPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the encryptionPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public void setEncryptionPubKeyInfo(EncryptionPubKeyInfoType value) {
-        this.encryptionPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HCSRequestOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HCSRequestOrderDataType.java
deleted file mode 100644
index 6c8a741..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HCSRequestOrderDataType.java
+++ /dev/null
@@ -1,228 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HCS (Anfrage: Schlüsselwechsel 
aller Schlüssel).
- * 
- * <p>Java class for HCSRequestOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HCSRequestOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="AuthenticationPubKeyInfo" 
type="{urn:org:ebics:H004}AuthenticationPubKeyInfoType"/>
- *         &lt;element name="EncryptionPubKeyInfo" 
type="{urn:org:ebics:H004}EncryptionPubKeyInfoType"/>
- *         &lt;element ref="{http://www.ebics.org/S001}SignaturePubKeyInfo"/>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HCSRequestOrderDataType", propOrder = {
-    "authenticationPubKeyInfo",
-    "encryptionPubKeyInfo",
-    "signaturePubKeyInfo",
-    "partnerID",
-    "userID",
-    "any"
-})
-public class HCSRequestOrderDataType {
-
-    @XmlElement(name = "AuthenticationPubKeyInfo", required = true)
-    protected AuthenticationPubKeyInfoType authenticationPubKeyInfo;
-    @XmlElement(name = "EncryptionPubKeyInfo", required = true)
-    protected EncryptionPubKeyInfoType encryptionPubKeyInfo;
-    @XmlElement(name = "SignaturePubKeyInfo", namespace = 
"http://www.ebics.org/S001";, required = true)
-    protected SignaturePubKeyInfoType signaturePubKeyInfo;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the authenticationPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public AuthenticationPubKeyInfoType getAuthenticationPubKeyInfo() {
-        return authenticationPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the authenticationPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public void setAuthenticationPubKeyInfo(AuthenticationPubKeyInfoType 
value) {
-        this.authenticationPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the encryptionPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public EncryptionPubKeyInfoType getEncryptionPubKeyInfo() {
-        return encryptionPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the encryptionPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public void setEncryptionPubKeyInfo(EncryptionPubKeyInfoType value) {
-        this.encryptionPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the signaturePubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignaturePubKeyInfoType }
-     *     
-     */
-    public SignaturePubKeyInfoType getSignaturePubKeyInfo() {
-        return signaturePubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the signaturePubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignaturePubKeyInfoType }
-     *     
-     */
-    public void setSignaturePubKeyInfo(SignaturePubKeyInfoType value) {
-        this.signaturePubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HIARequestOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HIARequestOrderDataType.java
deleted file mode 100644
index ba0d1d9..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HIARequestOrderDataType.java
+++ /dev/null
@@ -1,200 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HIA (Anfrage: Initialisierung 
der Teilnehmerschlüssel für Authentifikation und Verschlüsselung).
- * 
- * <p>Java class for HIARequestOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HIARequestOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="AuthenticationPubKeyInfo" 
type="{urn:org:ebics:H004}AuthenticationPubKeyInfoType"/>
- *         &lt;element name="EncryptionPubKeyInfo" 
type="{urn:org:ebics:H004}EncryptionPubKeyInfoType"/>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HIARequestOrderDataType", propOrder = {
-    "authenticationPubKeyInfo",
-    "encryptionPubKeyInfo",
-    "partnerID",
-    "userID",
-    "any"
-})
-public class HIARequestOrderDataType {
-
-    @XmlElement(name = "AuthenticationPubKeyInfo", required = true)
-    protected AuthenticationPubKeyInfoType authenticationPubKeyInfo;
-    @XmlElement(name = "EncryptionPubKeyInfo", required = true)
-    protected EncryptionPubKeyInfoType encryptionPubKeyInfo;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the authenticationPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public AuthenticationPubKeyInfoType getAuthenticationPubKeyInfo() {
-        return authenticationPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the authenticationPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public void setAuthenticationPubKeyInfo(AuthenticationPubKeyInfoType 
value) {
-        this.authenticationPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the encryptionPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public EncryptionPubKeyInfoType getEncryptionPubKeyInfo() {
-        return encryptionPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the encryptionPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public void setEncryptionPubKeyInfo(EncryptionPubKeyInfoType value) {
-        this.encryptionPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HKDResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HKDResponseOrderDataType.java
deleted file mode 100644
index e966aa2..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HKDResponseOrderDataType.java
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Order data for order type HKD (response: receive customer based information 
on the customer and the customer's user.
- * 
- * <p>Java class for HKDResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HKDResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="PartnerInfo" 
type="{urn:org:ebics:H004}PartnerInfoType"/>
- *         &lt;element name="UserInfo" type="{urn:org:ebics:H004}UserInfoType" 
maxOccurs="unbounded"/>
- *         &lt;any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HKDResponseOrderDataType", propOrder = {
-    "partnerInfo",
-    "userInfo",
-    "any"
-})
-public class HKDResponseOrderDataType {
-
-    @XmlElement(name = "PartnerInfo", required = true)
-    protected PartnerInfoType partnerInfo;
-    @XmlElement(name = "UserInfo", required = true)
-    protected List<UserInfoType> userInfo;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PartnerInfoType }
-     *     
-     */
-    public PartnerInfoType getPartnerInfo() {
-        return partnerInfo;
-    }
-
-    /**
-     * Sets the value of the partnerInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PartnerInfoType }
-     *     
-     */
-    public void setPartnerInfo(PartnerInfoType value) {
-        this.partnerInfo = value;
-    }
-
-    /**
-     * Gets the value of the userInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the userInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getUserInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link UserInfoType }
-     * 
-     * 
-     */
-    public List<UserInfoType> getUserInfo() {
-        if (userInfo == null) {
-            userInfo = new ArrayList<UserInfoType>();
-        }
-        return this.userInfo;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HPBResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HPBResponseOrderDataType.java
deleted file mode 100644
index f8b6fac..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HPBResponseOrderDataType.java
+++ /dev/null
@@ -1,169 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HPB (Antwort: Transfer der 
Bankschlüssel).
- * 
- * <p>Java class for HPBResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HPBResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="AuthenticationPubKeyInfo" 
type="{urn:org:ebics:H004}AuthenticationPubKeyInfoType"/>
- *         &lt;element name="EncryptionPubKeyInfo" 
type="{urn:org:ebics:H004}EncryptionPubKeyInfoType"/>
- *         &lt;element ref="{http://www.ebics.org/S001}SignaturePubKeyInfo"; 
maxOccurs="0" minOccurs="0"/>
- *         &lt;element name="HostID" type="{urn:org:ebics:H004}HostIDType"/>
- *         &lt;any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HPBResponseOrderDataType", propOrder = {
-    "authenticationPubKeyInfo",
-    "encryptionPubKeyInfo",
-    "hostID",
-    "any"
-})
-public class HPBResponseOrderDataType {
-
-    @XmlElement(name = "AuthenticationPubKeyInfo", required = true)
-    protected AuthenticationPubKeyInfoType authenticationPubKeyInfo;
-    @XmlElement(name = "EncryptionPubKeyInfo", required = true)
-    protected EncryptionPubKeyInfoType encryptionPubKeyInfo;
-    @XmlElement(name = "HostID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String hostID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the authenticationPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public AuthenticationPubKeyInfoType getAuthenticationPubKeyInfo() {
-        return authenticationPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the authenticationPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public void setAuthenticationPubKeyInfo(AuthenticationPubKeyInfoType 
value) {
-        this.authenticationPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the encryptionPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public EncryptionPubKeyInfoType getEncryptionPubKeyInfo() {
-        return encryptionPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the encryptionPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public void setEncryptionPubKeyInfo(EncryptionPubKeyInfoType value) {
-        this.encryptionPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the hostID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getHostID() {
-        return hostID;
-    }
-
-    /**
-     * Sets the value of the hostID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setHostID(String value) {
-        this.hostID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HPDAccessParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HPDAccessParamsType.java
deleted file mode 100644
index 8091e0b..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HPDAccessParamsType.java
+++ /dev/null
@@ -1,274 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.datatype.XMLGregorianCalendar;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für HPD-Zugangsparameter.
- * 
- * <p>Java class for HPDAccessParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HPDAccessParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="URL" maxOccurs="unbounded">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension 
base="&lt;http://www.w3.org/2001/XMLSchema>anyURI">
- *                 &lt;attribute name="valid_from" 
type="{urn:org:ebics:H004}TimestampType" />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="Institute">
- *           &lt;simpleType>
- *             &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}normalizedString";>
- *               &lt;maxLength value="80"/>
- *             &lt;/restriction>
- *           &lt;/simpleType>
- *         &lt;/element>
- *         &lt;element name="HostID" type="{urn:org:ebics:H004}HostIDType" 
minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HPDAccessParamsType", propOrder = {
-    "url",
-    "institute",
-    "hostID",
-    "any"
-})
-public class HPDAccessParamsType {
-
-    @XmlElement(name = "URL", required = true)
-    protected List<HPDAccessParamsType.URL> url;
-    @XmlElement(name = "Institute", required = true)
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    protected String institute;
-    @XmlElement(name = "HostID")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String hostID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the url property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the url property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getURL().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link HPDAccessParamsType.URL }
-     * 
-     * 
-     */
-    public List<HPDAccessParamsType.URL> getURL() {
-        if (url == null) {
-            url = new ArrayList<HPDAccessParamsType.URL>();
-        }
-        return this.url;
-    }
-
-    /**
-     * Gets the value of the institute property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getInstitute() {
-        return institute;
-    }
-
-    /**
-     * Sets the value of the institute property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setInstitute(String value) {
-        this.institute = value;
-    }
-
-    /**
-     * Gets the value of the hostID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getHostID() {
-        return hostID;
-    }
-
-    /**
-     * Sets the value of the hostID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setHostID(String value) {
-        this.hostID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>anyURI">
-     *       &lt;attribute name="valid_from" 
type="{urn:org:ebics:H004}TimestampType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class URL {
-
-        @XmlValue
-        @XmlSchemaType(name = "anyURI")
-        protected String value;
-        @XmlAttribute(name = "valid_from")
-        protected XMLGregorianCalendar validFrom;
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the validFrom property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public XMLGregorianCalendar getValidFrom() {
-            return validFrom;
-        }
-
-        /**
-         * Sets the value of the validFrom property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public void setValidFrom(XMLGregorianCalendar value) {
-            this.validFrom = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HPDProtocolParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HPDProtocolParamsType.java
deleted file mode 100644
index b761543..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HPDProtocolParamsType.java
+++ /dev/null
@@ -1,713 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for HPD's parameters regarding the EBICS protocol.
- * 
- * <p>Java class for HPDProtocolParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HPDProtocolParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="Version" 
type="{urn:org:ebics:H004}HPDVersionType"/>
- *         &lt;element name="Recovery" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
- *                 &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="PreValidation" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
- *                 &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="X509Data" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
- *                 &lt;attribute name="persistent" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
- *                 &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="ClientDataDownload" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
- *                 &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="DownloadableOrderData" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
- *                 &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HPDProtocolParamsType", propOrder = {
-    "version",
-    "recovery",
-    "preValidation",
-    "x509Data",
-    "clientDataDownload",
-    "downloadableOrderData",
-    "any"
-})
-public class HPDProtocolParamsType {
-
-    @XmlElement(name = "Version", required = true)
-    protected HPDVersionType version;
-    @XmlElement(name = "Recovery")
-    protected HPDProtocolParamsType.Recovery recovery;
-    @XmlElement(name = "PreValidation")
-    protected HPDProtocolParamsType.PreValidation preValidation;
-    @XmlElement(name = "X509Data")
-    protected HPDProtocolParamsType.X509Data x509Data;
-    @XmlElement(name = "ClientDataDownload")
-    protected HPDProtocolParamsType.ClientDataDownload clientDataDownload;
-    @XmlElement(name = "DownloadableOrderData")
-    protected HPDProtocolParamsType.DownloadableOrderData 
downloadableOrderData;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the version property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDVersionType }
-     *     
-     */
-    public HPDVersionType getVersion() {
-        return version;
-    }
-
-    /**
-     * Sets the value of the version property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDVersionType }
-     *     
-     */
-    public void setVersion(HPDVersionType value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the recovery property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDProtocolParamsType.Recovery }
-     *     
-     */
-    public HPDProtocolParamsType.Recovery getRecovery() {
-        return recovery;
-    }
-
-    /**
-     * Sets the value of the recovery property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDProtocolParamsType.Recovery }
-     *     
-     */
-    public void setRecovery(HPDProtocolParamsType.Recovery value) {
-        this.recovery = value;
-    }
-
-    /**
-     * Gets the value of the preValidation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDProtocolParamsType.PreValidation }
-     *     
-     */
-    public HPDProtocolParamsType.PreValidation getPreValidation() {
-        return preValidation;
-    }
-
-    /**
-     * Sets the value of the preValidation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDProtocolParamsType.PreValidation }
-     *     
-     */
-    public void setPreValidation(HPDProtocolParamsType.PreValidation value) {
-        this.preValidation = value;
-    }
-
-    /**
-     * Gets the value of the x509Data property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDProtocolParamsType.X509Data }
-     *     
-     */
-    public HPDProtocolParamsType.X509Data getX509Data() {
-        return x509Data;
-    }
-
-    /**
-     * Sets the value of the x509Data property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDProtocolParamsType.X509Data }
-     *     
-     */
-    public void setX509Data(HPDProtocolParamsType.X509Data value) {
-        this.x509Data = value;
-    }
-
-    /**
-     * Gets the value of the clientDataDownload property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDProtocolParamsType.ClientDataDownload }
-     *     
-     */
-    public HPDProtocolParamsType.ClientDataDownload getClientDataDownload() {
-        return clientDataDownload;
-    }
-
-    /**
-     * Sets the value of the clientDataDownload property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDProtocolParamsType.ClientDataDownload }
-     *     
-     */
-    public void setClientDataDownload(HPDProtocolParamsType.ClientDataDownload 
value) {
-        this.clientDataDownload = value;
-    }
-
-    /**
-     * Gets the value of the downloadableOrderData property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDProtocolParamsType.DownloadableOrderData }
-     *     
-     */
-    public HPDProtocolParamsType.DownloadableOrderData 
getDownloadableOrderData() {
-        return downloadableOrderData;
-    }
-
-    /**
-     * Sets the value of the downloadableOrderData property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDProtocolParamsType.DownloadableOrderData }
-     *     
-     */
-    public void 
setDownloadableOrderData(HPDProtocolParamsType.DownloadableOrderData value) {
-        this.downloadableOrderData = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
-     *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class ClientDataDownload {
-
-        @XmlAttribute(name = "supported")
-        protected Boolean supported;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Gets the value of the supported property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isSupported() {
-            if (supported == null) {
-                return true;
-            } else {
-                return supported;
-            }
-        }
-
-        /**
-         * Sets the value of the supported property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setSupported(Boolean value) {
-            this.supported = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
-     *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class DownloadableOrderData {
-
-        @XmlAttribute(name = "supported")
-        protected Boolean supported;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Gets the value of the supported property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isSupported() {
-            if (supported == null) {
-                return true;
-            } else {
-                return supported;
-            }
-        }
-
-        /**
-         * Sets the value of the supported property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setSupported(Boolean value) {
-            this.supported = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-
-    /**
-     * Optional support flag, default = true.
-     * 
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
-     *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class PreValidation {
-
-        @XmlAttribute(name = "supported")
-        protected Boolean supported;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Gets the value of the supported property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isSupported() {
-            if (supported == null) {
-                return true;
-            } else {
-                return supported;
-            }
-        }
-
-        /**
-         * Sets the value of the supported property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setSupported(Boolean value) {
-            this.supported = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
-     *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Recovery {
-
-        @XmlAttribute(name = "supported")
-        protected Boolean supported;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Gets the value of the supported property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isSupported() {
-            if (supported == null) {
-                return true;
-            } else {
-                return supported;
-            }
-        }
-
-        /**
-         * Sets the value of the supported property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setSupported(Boolean value) {
-            this.supported = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
-     *       &lt;attribute name="persistent" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-     *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class X509Data {
-
-        @XmlAttribute(name = "persistent")
-        protected Boolean persistent;
-        @XmlAttribute(name = "supported")
-        protected Boolean supported;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Gets the value of the persistent property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isPersistent() {
-            if (persistent == null) {
-                return false;
-            } else {
-                return persistent;
-            }
-        }
-
-        /**
-         * Sets the value of the persistent property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setPersistent(Boolean value) {
-            this.persistent = value;
-        }
-
-        /**
-         * Gets the value of the supported property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isSupported() {
-            if (supported == null) {
-                return true;
-            } else {
-                return supported;
-            }
-        }
-
-        /**
-         * Sets the value of the supported property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setSupported(Boolean value) {
-            this.supported = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HPDResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HPDResponseOrderDataType.java
deleted file mode 100644
index 54f0eca..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HPDResponseOrderDataType.java
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HPD (Antwort: Bankparameter 
abholen).
- * 
- * <p>Java class for HPDResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HPDResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="AccessParams" 
type="{urn:org:ebics:H004}HPDAccessParamsType"/>
- *         &lt;element name="ProtocolParams" 
type="{urn:org:ebics:H004}HPDProtocolParamsType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HPDResponseOrderDataType", propOrder = {
-    "accessParams",
-    "protocolParams"
-})
-public class HPDResponseOrderDataType {
-
-    @XmlElement(name = "AccessParams", required = true)
-    protected HPDAccessParamsType accessParams;
-    @XmlElement(name = "ProtocolParams", required = true)
-    protected HPDProtocolParamsType protocolParams;
-
-    /**
-     * Gets the value of the accessParams property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDAccessParamsType }
-     *     
-     */
-    public HPDAccessParamsType getAccessParams() {
-        return accessParams;
-    }
-
-    /**
-     * Sets the value of the accessParams property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDAccessParamsType }
-     *     
-     */
-    public void setAccessParams(HPDAccessParamsType value) {
-        this.accessParams = value;
-    }
-
-    /**
-     * Gets the value of the protocolParams property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDProtocolParamsType }
-     *     
-     */
-    public HPDProtocolParamsType getProtocolParams() {
-        return protocolParams;
-    }
-
-    /**
-     * Sets the value of the protocolParams property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDProtocolParamsType }
-     *     
-     */
-    public void setProtocolParams(HPDProtocolParamsType value) {
-        this.protocolParams = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HPDVersionType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HPDVersionType.java
deleted file mode 100644
index 6f0c70c..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HPDVersionType.java
+++ /dev/null
@@ -1,234 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für HPD-Versionsinformationen.
- * 
- * <p>Java class for HPDVersionType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HPDVersionType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="Protocol">
- *           &lt;simpleType>
- *             &lt;list itemType="{urn:org:ebics:H004}ProtocolVersionType" />
- *           &lt;/simpleType>
- *         &lt;/element>
- *         &lt;element name="Authentication">
- *           &lt;simpleType>
- *             &lt;list 
itemType="{urn:org:ebics:H004}AuthenticationVersionType" />
- *           &lt;/simpleType>
- *         &lt;/element>
- *         &lt;element name="Encryption">
- *           &lt;simpleType>
- *             &lt;list itemType="{urn:org:ebics:H004}EncryptionVersionType" />
- *           &lt;/simpleType>
- *         &lt;/element>
- *         &lt;element name="Signature">
- *           &lt;simpleType>
- *             &lt;list 
itemType="{http://www.ebics.org/S001}SignatureVersionType"; />
- *           &lt;/simpleType>
- *         &lt;/element>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HPDVersionType", propOrder = {
-    "protocol",
-    "authentication",
-    "encryption",
-    "signature",
-    "any"
-})
-public class HPDVersionType {
-
-    @XmlList
-    @XmlElement(name = "Protocol", required = true)
-    protected List<String> protocol;
-    @XmlList
-    @XmlElement(name = "Authentication", required = true)
-    protected List<String> authentication;
-    @XmlList
-    @XmlElement(name = "Encryption", required = true)
-    protected List<String> encryption;
-    @XmlList
-    @XmlElement(name = "Signature", required = true)
-    protected List<String> signature;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the protocol property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the protocol 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getProtocol().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getProtocol() {
-        if (protocol == null) {
-            protocol = new ArrayList<String>();
-        }
-        return this.protocol;
-    }
-
-    /**
-     * Gets the value of the authentication property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
authentication property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAuthentication().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getAuthentication() {
-        if (authentication == null) {
-            authentication = new ArrayList<String>();
-        }
-        return this.authentication;
-    }
-
-    /**
-     * Gets the value of the encryption property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the encryption 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getEncryption().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getEncryption() {
-        if (encryption == null) {
-            encryption = new ArrayList<String>();
-        }
-        return this.encryption;
-    }
-
-    /**
-     * Gets the value of the signature property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the signature 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSignature().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getSignature() {
-        if (signature == null) {
-            signature = new ArrayList<String>();
-        }
-        return this.signature;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HSARequestOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HSARequestOrderDataType.java
deleted file mode 100644
index f1d99bf..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HSARequestOrderDataType.java
+++ /dev/null
@@ -1,200 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HSA (Anfrage: Initialisierung 
der Teilnehmerschlüssel für Authentifikation und Verschlüsselung, bankfachlich 
signiert mit FTAM-Schlüssel).
- * 
- * <p>Java class for HSARequestOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HSARequestOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="AuthenticationPubKeyInfo" 
type="{urn:org:ebics:H004}AuthenticationPubKeyInfoType"/>
- *         &lt;element name="EncryptionPubKeyInfo" 
type="{urn:org:ebics:H004}EncryptionPubKeyInfoType"/>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HSARequestOrderDataType", propOrder = {
-    "authenticationPubKeyInfo",
-    "encryptionPubKeyInfo",
-    "partnerID",
-    "userID",
-    "any"
-})
-public class HSARequestOrderDataType {
-
-    @XmlElement(name = "AuthenticationPubKeyInfo", required = true)
-    protected AuthenticationPubKeyInfoType authenticationPubKeyInfo;
-    @XmlElement(name = "EncryptionPubKeyInfo", required = true)
-    protected EncryptionPubKeyInfoType encryptionPubKeyInfo;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the authenticationPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public AuthenticationPubKeyInfoType getAuthenticationPubKeyInfo() {
-        return authenticationPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the authenticationPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public void setAuthenticationPubKeyInfo(AuthenticationPubKeyInfoType 
value) {
-        this.authenticationPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the encryptionPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public EncryptionPubKeyInfoType getEncryptionPubKeyInfo() {
-        return encryptionPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the encryptionPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public void setEncryptionPubKeyInfo(EncryptionPubKeyInfoType value) {
-        this.encryptionPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HTDReponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HTDReponseOrderDataType.java
deleted file mode 100644
index 6855c0c..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HTDReponseOrderDataType.java
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HTD (Antwort: Kunden- und 
Teilnehmerdaten des Teilnehmers abholen).
- * 
- * <p>Java class for HTDReponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HTDReponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="PartnerInfo" 
type="{urn:org:ebics:H004}PartnerInfoType"/>
- *         &lt;element name="UserInfo" 
type="{urn:org:ebics:H004}UserInfoType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HTDReponseOrderDataType", propOrder = {
-    "partnerInfo",
-    "userInfo",
-    "any"
-})
-public class HTDReponseOrderDataType {
-
-    @XmlElement(name = "PartnerInfo", required = true)
-    protected PartnerInfoType partnerInfo;
-    @XmlElement(name = "UserInfo", required = true)
-    protected UserInfoType userInfo;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PartnerInfoType }
-     *     
-     */
-    public PartnerInfoType getPartnerInfo() {
-        return partnerInfo;
-    }
-
-    /**
-     * Sets the value of the partnerInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PartnerInfoType }
-     *     
-     */
-    public void setPartnerInfo(PartnerInfoType value) {
-        this.partnerInfo = value;
-    }
-
-    /**
-     * Gets the value of the userInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link UserInfoType }
-     *     
-     */
-    public UserInfoType getUserInfo() {
-        return userInfo;
-    }
-
-    /**
-     * Sets the value of the userInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link UserInfoType }
-     *     
-     */
-    public void setUserInfo(UserInfoType value) {
-        this.userInfo = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVDOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVDOrderParamsType.java
deleted file mode 100644
index fdd0e06..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVDOrderParamsType.java
+++ /dev/null
@@ -1,199 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für Auftragsart HVD.
- * 
- * <p>Java class for HVDOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVDOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;group ref="{urn:org:ebics:H004}HVRequestStructure"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVDOrderParamsType", propOrder = {
-    "partnerID",
-    "orderType",
-    "fileFormat",
-    "orderID",
-    "any"
-})
-public class HVDOrderParamsType {
-
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "OrderID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the orderID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderID() {
-        return orderID;
-    }
-
-    /**
-     * Sets the value of the orderID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderID(String value) {
-        this.orderID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVDResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVDResponseOrderDataType.java
deleted file mode 100644
index 6c97844..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVDResponseOrderDataType.java
+++ /dev/null
@@ -1,240 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HVD (Antwort: VEU-Status 
abrufen).
- * 
- * <p>Java class for HVDResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVDResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="DataDigest" 
type="{urn:org:ebics:H004}DataDigestType"/>
- *         &lt;element name="DisplayFile" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         &lt;element name="OrderDataAvailable" 
type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="OrderDataSize" 
type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *         &lt;element name="OrderDetailsAvailable" 
type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="BankSignature" 
type="{urn:org:ebics:H004}SignatureType" maxOccurs="0" minOccurs="0"/>
- *         &lt;element name="SignerInfo" 
type="{urn:org:ebics:H004}SignerInfoType" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVDResponseOrderDataType", propOrder = {
-    "dataDigest",
-    "displayFile",
-    "orderDataAvailable",
-    "orderDataSize",
-    "orderDetailsAvailable",
-    "signerInfo",
-    "any"
-})
-public class HVDResponseOrderDataType {
-
-    @XmlElement(name = "DataDigest", required = true)
-    protected DataDigestType dataDigest;
-    @XmlElement(name = "DisplayFile", required = true)
-    protected byte[] displayFile;
-    @XmlElement(name = "OrderDataAvailable")
-    protected boolean orderDataAvailable;
-    @XmlElement(name = "OrderDataSize", required = true)
-    @XmlSchemaType(name = "positiveInteger")
-    protected BigInteger orderDataSize;
-    @XmlElement(name = "OrderDetailsAvailable")
-    protected boolean orderDetailsAvailable;
-    @XmlElement(name = "SignerInfo")
-    protected List<SignerInfoType> signerInfo;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the dataDigest property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataDigestType }
-     *     
-     */
-    public DataDigestType getDataDigest() {
-        return dataDigest;
-    }
-
-    /**
-     * Sets the value of the dataDigest property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataDigestType }
-     *     
-     */
-    public void setDataDigest(DataDigestType value) {
-        this.dataDigest = value;
-    }
-
-    /**
-     * Gets the value of the displayFile property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getDisplayFile() {
-        return displayFile;
-    }
-
-    /**
-     * Sets the value of the displayFile property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setDisplayFile(byte[] value) {
-        this.displayFile = value;
-    }
-
-    /**
-     * Gets the value of the orderDataAvailable property.
-     * 
-     */
-    public boolean isOrderDataAvailable() {
-        return orderDataAvailable;
-    }
-
-    /**
-     * Sets the value of the orderDataAvailable property.
-     * 
-     */
-    public void setOrderDataAvailable(boolean value) {
-        this.orderDataAvailable = value;
-    }
-
-    /**
-     * Gets the value of the orderDataSize property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getOrderDataSize() {
-        return orderDataSize;
-    }
-
-    /**
-     * Sets the value of the orderDataSize property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setOrderDataSize(BigInteger value) {
-        this.orderDataSize = value;
-    }
-
-    /**
-     * Gets the value of the orderDetailsAvailable property.
-     * 
-     */
-    public boolean isOrderDetailsAvailable() {
-        return orderDetailsAvailable;
-    }
-
-    /**
-     * Sets the value of the orderDetailsAvailable property.
-     * 
-     */
-    public void setOrderDetailsAvailable(boolean value) {
-        this.orderDetailsAvailable = value;
-    }
-
-    /**
-     * Gets the value of the signerInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the signerInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSignerInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SignerInfoType }
-     * 
-     * 
-     */
-    public List<SignerInfoType> getSignerInfo() {
-        if (signerInfo == null) {
-            signerInfo = new ArrayList<SignerInfoType>();
-        }
-        return this.signerInfo;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVEOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVEOrderParamsType.java
deleted file mode 100644
index 56d65d4..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVEOrderParamsType.java
+++ /dev/null
@@ -1,199 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für Auftragsart HVE.
- * 
- * <p>Java class for HVEOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVEOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;group ref="{urn:org:ebics:H004}HVRequestStructure"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVEOrderParamsType", propOrder = {
-    "partnerID",
-    "orderType",
-    "fileFormat",
-    "orderID",
-    "any"
-})
-public class HVEOrderParamsType {
-
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "OrderID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the orderID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderID() {
-        return orderID;
-    }
-
-    /**
-     * Sets the value of the orderID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderID(String value) {
-        this.orderID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVSOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVSOrderParamsType.java
deleted file mode 100644
index 1667454..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVSOrderParamsType.java
+++ /dev/null
@@ -1,199 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für Auftragsart HVS.
- * 
- * <p>Java class for HVSOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVSOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;group ref="{urn:org:ebics:H004}HVRequestStructure"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVSOrderParamsType", propOrder = {
-    "partnerID",
-    "orderType",
-    "fileFormat",
-    "orderID",
-    "any"
-})
-public class HVSOrderParamsType {
-
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "OrderID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the orderID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderID() {
-        return orderID;
-    }
-
-    /**
-     * Sets the value of the orderID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderID(String value) {
-        this.orderID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVSRequestOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVSRequestOrderDataType.java
deleted file mode 100644
index 20d2d68..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVSRequestOrderDataType.java
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HVS (Anfrage: VEU-Storno).
- * 
- * <p>Java class for HVSRequestOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVSRequestOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="CancelledDataDigest" 
type="{urn:org:ebics:H004}DataDigestType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVSRequestOrderDataType", propOrder = {
-    "cancelledDataDigest",
-    "any"
-})
-public class HVSRequestOrderDataType {
-
-    @XmlElement(name = "CancelledDataDigest", required = true)
-    protected DataDigestType cancelledDataDigest;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the cancelledDataDigest property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataDigestType }
-     *     
-     */
-    public DataDigestType getCancelledDataDigest() {
-        return cancelledDataDigest;
-    }
-
-    /**
-     * Sets the value of the cancelledDataDigest property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataDigestType }
-     *     
-     */
-    public void setCancelledDataDigest(DataDigestType value) {
-        this.cancelledDataDigest = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVTAccountInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVTAccountInfoType.java
deleted file mode 100644
index 7fff551..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVTAccountInfoType.java
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Data type for account information regarding order type HVT.
- * 
- * <p>Java class for HVTAccountInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVTAccountInfoType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}AttributedAccountType">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVTAccountInfoType")
-public class HVTAccountInfoType
-    extends AttributedAccountType
-{
-
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVTOrderFlagsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVTOrderFlagsType.java
deleted file mode 100644
index 4b4dbba..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVTOrderFlagsType.java
+++ /dev/null
@@ -1,155 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.math.BigInteger;
-import java.util.HashMap;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-
-/**
- * Datentyp für HVT-Auftragsflags.
- * 
- * <p>Java class for HVTOrderFlagsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVTOrderFlagsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;attribute name="completeOrderData" use="required" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; />
- *       &lt;attribute name="fetchLimit" use="required">
- *         &lt;simpleType>
- *           &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger";>
- *             &lt;totalDigits value="10"/>
- *           &lt;/restriction>
- *         &lt;/simpleType>
- *       &lt;/attribute>
- *       &lt;attribute name="fetchOffset" use="required">
- *         &lt;simpleType>
- *           &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger";>
- *             &lt;totalDigits value="10"/>
- *           &lt;/restriction>
- *         &lt;/simpleType>
- *       &lt;/attribute>
- *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVTOrderFlagsType")
-@XmlSeeAlso({
-    
tech.libeufin.messages.ebics.keyresponse.HVTOrderParamsType.OrderFlags.class
-})
-public class HVTOrderFlagsType {
-
-    @XmlAttribute(name = "completeOrderData", required = true)
-    protected boolean completeOrderData;
-    @XmlAttribute(name = "fetchLimit", required = true)
-    protected BigInteger fetchLimit;
-    @XmlAttribute(name = "fetchOffset", required = true)
-    protected BigInteger fetchOffset;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-    /**
-     * Gets the value of the completeOrderData property.
-     * 
-     */
-    public boolean isCompleteOrderData() {
-        return completeOrderData;
-    }
-
-    /**
-     * Sets the value of the completeOrderData property.
-     * 
-     */
-    public void setCompleteOrderData(boolean value) {
-        this.completeOrderData = value;
-    }
-
-    /**
-     * Gets the value of the fetchLimit property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getFetchLimit() {
-        return fetchLimit;
-    }
-
-    /**
-     * Sets the value of the fetchLimit property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setFetchLimit(BigInteger value) {
-        this.fetchLimit = value;
-    }
-
-    /**
-     * Gets the value of the fetchOffset property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getFetchOffset() {
-        return fetchOffset;
-    }
-
-    /**
-     * Sets the value of the fetchOffset property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setFetchOffset(BigInteger value) {
-        this.fetchOffset = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVTOrderInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVTOrderInfoType.java
deleted file mode 100644
index 0af3392..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVTOrderInfoType.java
+++ /dev/null
@@ -1,520 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.datatype.XMLGregorianCalendar;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für HVT-Auftragsinformationen.
- * 
- * <p>Java class for HVTOrderInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVTOrderInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderFormat" 
type="{urn:org:ebics:H004}OrderFormatType" minOccurs="0"/>
- *         &lt;element name="AccountInfo" 
type="{urn:org:ebics:H004}HVTAccountInfoType" maxOccurs="3" minOccurs="2"/>
- *         &lt;element name="ExecutionDate" minOccurs="0">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension 
base="&lt;http://www.w3.org/2001/XMLSchema>date">
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="Amount">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension base="&lt;urn:org:ebics:H004>AmountValueType">
- *                 &lt;attribute name="isCredit" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; />
- *                 &lt;attribute name="Currency" 
type="{urn:org:ebics:H004}CurrencyBaseType" />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="Description" maxOccurs="4" minOccurs="0">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension 
base="&lt;http://www.w3.org/2001/XMLSchema>string">
- *                 &lt;attribute name="Type" use="required">
- *                   &lt;simpleType>
- *                     &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}token";>
- *                       &lt;enumeration value="Purpose"/>
- *                       &lt;enumeration value="Details"/>
- *                       &lt;enumeration value="Comment"/>
- *                     &lt;/restriction>
- *                   &lt;/simpleType>
- *                 &lt;/attribute>
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVTOrderInfoType", propOrder = {
-    "orderFormat",
-    "accountInfo",
-    "executionDate",
-    "amount",
-    "description",
-    "any"
-})
-public class HVTOrderInfoType {
-
-    @XmlElement(name = "OrderFormat")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderFormat;
-    @XmlElement(name = "AccountInfo", required = true)
-    protected List<HVTAccountInfoType> accountInfo;
-    @XmlElement(name = "ExecutionDate")
-    protected HVTOrderInfoType.ExecutionDate executionDate;
-    @XmlElement(name = "Amount", required = true)
-    protected HVTOrderInfoType.Amount amount;
-    @XmlElement(name = "Description")
-    protected List<HVTOrderInfoType.Description> description;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderFormat() {
-        return orderFormat;
-    }
-
-    /**
-     * Sets the value of the orderFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderFormat(String value) {
-        this.orderFormat = value;
-    }
-
-    /**
-     * Gets the value of the accountInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the accountInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAccountInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link HVTAccountInfoType }
-     * 
-     * 
-     */
-    public List<HVTAccountInfoType> getAccountInfo() {
-        if (accountInfo == null) {
-            accountInfo = new ArrayList<HVTAccountInfoType>();
-        }
-        return this.accountInfo;
-    }
-
-    /**
-     * Gets the value of the executionDate property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVTOrderInfoType.ExecutionDate }
-     *     
-     */
-    public HVTOrderInfoType.ExecutionDate getExecutionDate() {
-        return executionDate;
-    }
-
-    /**
-     * Sets the value of the executionDate property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVTOrderInfoType.ExecutionDate }
-     *     
-     */
-    public void setExecutionDate(HVTOrderInfoType.ExecutionDate value) {
-        this.executionDate = value;
-    }
-
-    /**
-     * Gets the value of the amount property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVTOrderInfoType.Amount }
-     *     
-     */
-    public HVTOrderInfoType.Amount getAmount() {
-        return amount;
-    }
-
-    /**
-     * Sets the value of the amount property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVTOrderInfoType.Amount }
-     *     
-     */
-    public void setAmount(HVTOrderInfoType.Amount value) {
-        this.amount = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the description 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getDescription().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link HVTOrderInfoType.Description }
-     * 
-     * 
-     */
-    public List<HVTOrderInfoType.Description> getDescription() {
-        if (description == null) {
-            description = new ArrayList<HVTOrderInfoType.Description>();
-        }
-        return this.description;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>AmountValueType">
-     *       &lt;attribute name="isCredit" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; />
-     *       &lt;attribute name="Currency" 
type="{urn:org:ebics:H004}CurrencyBaseType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Amount {
-
-        @XmlValue
-        protected BigDecimal value;
-        @XmlAttribute(name = "isCredit")
-        protected Boolean isCredit;
-        @XmlAttribute(name = "Currency")
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String currency;
-
-        /**
-         * Datentyp für einen Betragswert (ohne Währung).
-         * 
-         * @return
-         *     possible object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public BigDecimal getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public void setValue(BigDecimal value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the isCredit property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isIsCredit() {
-            return isCredit;
-        }
-
-        /**
-         * Sets the value of the isCredit property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setIsCredit(Boolean value) {
-            this.isCredit = value;
-        }
-
-        /**
-         * Gets the value of the currency property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getCurrency() {
-            return currency;
-        }
-
-        /**
-         * Sets the value of the currency property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setCurrency(String value) {
-            this.currency = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
-     *       &lt;attribute name="Type" use="required">
-     *         &lt;simpleType>
-     *           &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}token";>
-     *             &lt;enumeration value="Purpose"/>
-     *             &lt;enumeration value="Details"/>
-     *             &lt;enumeration value="Comment"/>
-     *           &lt;/restriction>
-     *         &lt;/simpleType>
-     *       &lt;/attribute>
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Description {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "Type", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String type;
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the type property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getType() {
-            return type;
-        }
-
-        /**
-         * Sets the value of the type property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setType(String value) {
-            this.type = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>date">
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class ExecutionDate {
-
-        @XmlValue
-        @XmlSchemaType(name = "date")
-        protected XMLGregorianCalendar value;
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public XMLGregorianCalendar getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public void setValue(XMLGregorianCalendar value) {
-            this.value = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVTOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVTOrderParamsType.java
deleted file mode 100644
index 5620ac9..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVTOrderParamsType.java
+++ /dev/null
@@ -1,295 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for additional order parameters for order type HVT.
- * 
- * <p>Java class for HVTOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVTOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;group ref="{urn:org:ebics:H004}HVRequestStructure"/>
- *         &lt;element name="OrderFlags">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;extension base="{urn:org:ebics:H004}HVTOrderFlagsType">
- *                 &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *               &lt;/extension>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element ref="{urn:org:ebics:H004}Parameter" 
maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVTOrderParamsType", propOrder = {
-    "partnerID",
-    "orderType",
-    "fileFormat",
-    "orderID",
-    "orderFlags",
-    "parameter",
-    "any"
-})
-public class HVTOrderParamsType {
-
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "OrderID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderID;
-    @XmlElement(name = "OrderFlags", required = true)
-    protected HVTOrderParamsType.OrderFlags orderFlags;
-    @XmlElement(name = "Parameter")
-    protected List<Parameter> parameter;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the orderID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderID() {
-        return orderID;
-    }
-
-    /**
-     * Sets the value of the orderID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderID(String value) {
-        this.orderID = value;
-    }
-
-    /**
-     * Gets the value of the orderFlags property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVTOrderParamsType.OrderFlags }
-     *     
-     */
-    public HVTOrderParamsType.OrderFlags getOrderFlags() {
-        return orderFlags;
-    }
-
-    /**
-     * Sets the value of the orderFlags property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVTOrderParamsType.OrderFlags }
-     *     
-     */
-    public void setOrderFlags(HVTOrderParamsType.OrderFlags value) {
-        this.orderFlags = value;
-    }
-
-    /**
-     * Generic key-value parameters Gets the value of the parameter property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the parameter 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getParameter().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Parameter }
-     * 
-     * 
-     */
-    public List<Parameter> getParameter() {
-        if (parameter == null) {
-            parameter = new ArrayList<Parameter>();
-        }
-        return this.parameter;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:org:ebics:H004}HVTOrderFlagsType">
-     *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class OrderFlags
-        extends HVTOrderFlagsType
-    {
-
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVTResponseOrderData.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVTResponseOrderData.java
deleted file mode 100644
index eaa4cfd..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVTResponseOrderData.java
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}HVTResponseOrderDataType">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "")
-public class HVTResponseOrderData
-    extends HVTResponseOrderDataType
-{
-
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVTResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVTResponseOrderDataType.java
deleted file mode 100644
index 7e2b5d8..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVTResponseOrderDataType.java
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Antwort mit Einzelauftraginfos für Auftragsart HVT (Antwort 
VEU-Transaktionsdetails abrufen mit completeOrderData="false").
- * 
- * <p>Java class for HVTResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVTResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="NumOrderInfos" 
type="{urn:org:ebics:H004}NumOrderInfosType"/>
- *         &lt;element name="OrderInfo" 
type="{urn:org:ebics:H004}HVTOrderInfoType" maxOccurs="unbounded"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVTResponseOrderDataType", propOrder = {
-    "numOrderInfos",
-    "orderInfo",
-    "any"
-})
-@XmlSeeAlso({
-    HVTResponseOrderData.class
-})
-public class HVTResponseOrderDataType {
-
-    @XmlElement(name = "NumOrderInfos", required = true)
-    @XmlSchemaType(name = "nonNegativeInteger")
-    protected BigInteger numOrderInfos;
-    @XmlElement(name = "OrderInfo", required = true)
-    protected List<HVTOrderInfoType> orderInfo;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the numOrderInfos property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getNumOrderInfos() {
-        return numOrderInfos;
-    }
-
-    /**
-     * Sets the value of the numOrderInfos property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setNumOrderInfos(BigInteger value) {
-        this.numOrderInfos = value;
-    }
-
-    /**
-     * Gets the value of the orderInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link HVTOrderInfoType }
-     * 
-     * 
-     */
-    public List<HVTOrderInfoType> getOrderInfo() {
-        if (orderInfo == null) {
-            orderInfo = new ArrayList<HVTOrderInfoType>();
-        }
-        return this.orderInfo;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVUOrderDetailsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVUOrderDetailsType.java
deleted file mode 100644
index 543a9a9..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVUOrderDetailsType.java
+++ /dev/null
@@ -1,291 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für HVU-Auftragsdetails.
- * 
- * <p>Java class for HVUOrderDetailsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVUOrderDetailsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderType" 
type="{urn:org:ebics:H004}OrderTBaseType"/>
- *         &lt;element name="FileFormat" 
type="{urn:org:ebics:H004}FileFormatType" minOccurs="0"/>
- *         &lt;element name="OrderID" type="{urn:org:ebics:H004}OrderIDType"/>
- *         &lt;element name="OrderDataSize" 
type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *         &lt;element name="SigningInfo" 
type="{urn:org:ebics:H004}HVUSigningInfoType"/>
- *         &lt;element name="SignerInfo" 
type="{urn:org:ebics:H004}SignerInfoType" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="OriginatorInfo" 
type="{urn:org:ebics:H004}HVUOriginatorInfoType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVUOrderDetailsType", propOrder = {
-    "orderType",
-    "fileFormat",
-    "orderID",
-    "orderDataSize",
-    "signingInfo",
-    "signerInfo",
-    "originatorInfo",
-    "any"
-})
-public class HVUOrderDetailsType {
-
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "OrderID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderID;
-    @XmlElement(name = "OrderDataSize", required = true)
-    @XmlSchemaType(name = "positiveInteger")
-    protected BigInteger orderDataSize;
-    @XmlElement(name = "SigningInfo", required = true)
-    protected HVUSigningInfoType signingInfo;
-    @XmlElement(name = "SignerInfo")
-    protected List<SignerInfoType> signerInfo;
-    @XmlElement(name = "OriginatorInfo", required = true)
-    protected HVUOriginatorInfoType originatorInfo;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the orderID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderID() {
-        return orderID;
-    }
-
-    /**
-     * Sets the value of the orderID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderID(String value) {
-        this.orderID = value;
-    }
-
-    /**
-     * Gets the value of the orderDataSize property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getOrderDataSize() {
-        return orderDataSize;
-    }
-
-    /**
-     * Sets the value of the orderDataSize property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setOrderDataSize(BigInteger value) {
-        this.orderDataSize = value;
-    }
-
-    /**
-     * Gets the value of the signingInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVUSigningInfoType }
-     *     
-     */
-    public HVUSigningInfoType getSigningInfo() {
-        return signingInfo;
-    }
-
-    /**
-     * Sets the value of the signingInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVUSigningInfoType }
-     *     
-     */
-    public void setSigningInfo(HVUSigningInfoType value) {
-        this.signingInfo = value;
-    }
-
-    /**
-     * Gets the value of the signerInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the signerInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSignerInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SignerInfoType }
-     * 
-     * 
-     */
-    public List<SignerInfoType> getSignerInfo() {
-        if (signerInfo == null) {
-            signerInfo = new ArrayList<SignerInfoType>();
-        }
-        return this.signerInfo;
-    }
-
-    /**
-     * Gets the value of the originatorInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVUOriginatorInfoType }
-     *     
-     */
-    public HVUOriginatorInfoType getOriginatorInfo() {
-        return originatorInfo;
-    }
-
-    /**
-     * Sets the value of the originatorInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVUOriginatorInfoType }
-     *     
-     */
-    public void setOriginatorInfo(HVUOriginatorInfoType value) {
-        this.originatorInfo = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVUOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVUOrderParamsType.java
deleted file mode 100644
index 22ee2a4..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVUOrderParamsType.java
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für Auftragsart HVU.
- * 
- * <p>Java class for HVUOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVUOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderTypes" 
type="{urn:org:ebics:H004}OrderTListType" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVUOrderParamsType", propOrder = {
-    "orderTypes",
-    "any"
-})
-public class HVUOrderParamsType {
-
-    @XmlList
-    @XmlElement(name = "OrderTypes")
-    protected List<String> orderTypes;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderTypes property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderTypes 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderTypes().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getOrderTypes() {
-        if (orderTypes == null) {
-            orderTypes = new ArrayList<String>();
-        }
-        return this.orderTypes;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVUOriginatorInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVUOriginatorInfoType.java
deleted file mode 100644
index 7194936..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVUOriginatorInfoType.java
+++ /dev/null
@@ -1,203 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * Datentyp für Informationen zum Ersteller eines HVU-Auftrags.
- * 
- * <p>Java class for HVUOriginatorInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVUOriginatorInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;element name="Name" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;element name="Timestamp" 
type="{urn:org:ebics:H004}TimestampType"/>
- *         &lt;any namespace='urn:org:ebics:H004' maxOccurs="unbounded" 
minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVUOriginatorInfoType", propOrder = {
-    "partnerID",
-    "userID",
-    "name",
-    "timestamp",
-    "any"
-})
-public class HVUOriginatorInfoType {
-
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlElement(name = "Name")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String name;
-    @XmlElement(name = "Timestamp", required = true)
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar timestamp;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the timestamp property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getTimestamp() {
-        return timestamp;
-    }
-
-    /**
-     * Sets the value of the timestamp property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setTimestamp(XMLGregorianCalendar value) {
-        this.timestamp = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVUResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVUResponseOrderDataType.java
deleted file mode 100644
index 1e546fb..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVUResponseOrderDataType.java
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HVU (Antwort: VEU-Übersicht 
abholen).
- * 
- * <p>Java class for HVUResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVUResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderDetails" 
type="{urn:org:ebics:H004}HVUOrderDetailsType" maxOccurs="unbounded"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVUResponseOrderDataType", propOrder = {
-    "orderDetails",
-    "any"
-})
-public class HVUResponseOrderDataType {
-
-    @XmlElement(name = "OrderDetails", required = true)
-    protected List<HVUOrderDetailsType> orderDetails;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderDetails property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderDetails 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderDetails().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link HVUOrderDetailsType }
-     * 
-     * 
-     */
-    public List<HVUOrderDetailsType> getOrderDetails() {
-        if (orderDetails == null) {
-            orderDetails = new ArrayList<HVUOrderDetailsType>();
-        }
-        return this.orderDetails;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVUSigningInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVUSigningInfoType.java
deleted file mode 100644
index 5834774..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVUSigningInfoType.java
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.math.BigInteger;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für Informationen zu den HVU-Unterschriftsmodalitäten.
- * 
- * <p>Java class for HVUSigningInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVUSigningInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;attribute name="readyToBeSigned" use="required" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; />
- *       &lt;attribute name="NumSigRequired" use="required" 
type="{http://www.w3.org/2001/XMLSchema}positiveInteger"; />
- *       &lt;attribute name="NumSigDone" use="required" 
type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVUSigningInfoType")
-public class HVUSigningInfoType {
-
-    @XmlAttribute(name = "readyToBeSigned", required = true)
-    protected boolean readyToBeSigned;
-    @XmlAttribute(name = "NumSigRequired", required = true)
-    @XmlSchemaType(name = "positiveInteger")
-    protected BigInteger numSigRequired;
-    @XmlAttribute(name = "NumSigDone", required = true)
-    @XmlSchemaType(name = "nonNegativeInteger")
-    protected BigInteger numSigDone;
-
-    /**
-     * Gets the value of the readyToBeSigned property.
-     * 
-     */
-    public boolean isReadyToBeSigned() {
-        return readyToBeSigned;
-    }
-
-    /**
-     * Sets the value of the readyToBeSigned property.
-     * 
-     */
-    public void setReadyToBeSigned(boolean value) {
-        this.readyToBeSigned = value;
-    }
-
-    /**
-     * Gets the value of the numSigRequired property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getNumSigRequired() {
-        return numSigRequired;
-    }
-
-    /**
-     * Sets the value of the numSigRequired property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setNumSigRequired(BigInteger value) {
-        this.numSigRequired = value;
-    }
-
-    /**
-     * Gets the value of the numSigDone property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getNumSigDone() {
-        return numSigDone;
-    }
-
-    /**
-     * Sets the value of the numSigDone property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setNumSigDone(BigInteger value) {
-        this.numSigDone = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVZOrderDetailsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVZOrderDetailsType.java
deleted file mode 100644
index 677bdd1..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVZOrderDetailsType.java
+++ /dev/null
@@ -1,1190 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für HVZ-Auftragsdetails.
- * 
- * <p>Java class for HVZOrderDetailsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVZOrderDetailsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderType" 
type="{urn:org:ebics:H004}OrderTBaseType"/>
- *         &lt;element name="FileFormat" 
type="{urn:org:ebics:H004}FileFormatType" minOccurs="0"/>
- *         &lt;element name="OrderID" type="{urn:org:ebics:H004}OrderIDType"/>
- *         &lt;element name="DataDigest" 
type="{urn:org:ebics:H004}DataDigestType"/>
- *         &lt;element name="OrderDataAvailable" 
type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="OrderDataSize" 
type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *         &lt;element name="OrderDetailsAvailable" 
type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;group ref="{urn:org:ebics:H004}HVZPaymentOrderDetailsStructure" 
minOccurs="0"/>
- *         &lt;element name="SigningInfo" 
type="{urn:org:ebics:H004}HVUSigningInfoType"/>
- *         &lt;element name="SignerInfo" 
type="{urn:org:ebics:H004}SignerInfoType" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="OriginatorInfo" 
type="{urn:org:ebics:H004}HVUOriginatorInfoType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVZOrderDetailsType", propOrder = {
-    "orderType",
-    "fileFormat",
-    "orderID",
-    "dataDigest",
-    "orderDataAvailable",
-    "orderDataSize",
-    "orderDetailsAvailable",
-    "totalOrders",
-    "totalAmount",
-    "currency",
-    "firstOrderInfo",
-    "signingInfo",
-    "signerInfo",
-    "originatorInfo",
-    "any"
-})
-public class HVZOrderDetailsType {
-
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "OrderID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderID;
-    @XmlElement(name = "DataDigest", required = true)
-    protected DataDigestType dataDigest;
-    @XmlElement(name = "OrderDataAvailable")
-    protected boolean orderDataAvailable;
-    @XmlElement(name = "OrderDataSize", required = true)
-    @XmlSchemaType(name = "positiveInteger")
-    protected BigInteger orderDataSize;
-    @XmlElement(name = "OrderDetailsAvailable")
-    protected boolean orderDetailsAvailable;
-    @XmlElement(name = "TotalOrders")
-    @XmlSchemaType(name = "nonNegativeInteger")
-    protected BigInteger totalOrders;
-    @XmlElement(name = "TotalAmount")
-    protected HVZOrderDetailsType.TotalAmount totalAmount;
-    @XmlElement(name = "Currency")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String currency;
-    @XmlElement(name = "FirstOrderInfo")
-    protected HVZOrderDetailsType.FirstOrderInfo firstOrderInfo;
-    @XmlElement(name = "SigningInfo", required = true)
-    protected HVUSigningInfoType signingInfo;
-    @XmlElement(name = "SignerInfo")
-    protected List<SignerInfoType> signerInfo;
-    @XmlElement(name = "OriginatorInfo", required = true)
-    protected HVUOriginatorInfoType originatorInfo;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the orderID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderID() {
-        return orderID;
-    }
-
-    /**
-     * Sets the value of the orderID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderID(String value) {
-        this.orderID = value;
-    }
-
-    /**
-     * Gets the value of the dataDigest property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataDigestType }
-     *     
-     */
-    public DataDigestType getDataDigest() {
-        return dataDigest;
-    }
-
-    /**
-     * Sets the value of the dataDigest property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataDigestType }
-     *     
-     */
-    public void setDataDigest(DataDigestType value) {
-        this.dataDigest = value;
-    }
-
-    /**
-     * Gets the value of the orderDataAvailable property.
-     * 
-     */
-    public boolean isOrderDataAvailable() {
-        return orderDataAvailable;
-    }
-
-    /**
-     * Sets the value of the orderDataAvailable property.
-     * 
-     */
-    public void setOrderDataAvailable(boolean value) {
-        this.orderDataAvailable = value;
-    }
-
-    /**
-     * Gets the value of the orderDataSize property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getOrderDataSize() {
-        return orderDataSize;
-    }
-
-    /**
-     * Sets the value of the orderDataSize property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setOrderDataSize(BigInteger value) {
-        this.orderDataSize = value;
-    }
-
-    /**
-     * Gets the value of the orderDetailsAvailable property.
-     * 
-     */
-    public boolean isOrderDetailsAvailable() {
-        return orderDetailsAvailable;
-    }
-
-    /**
-     * Sets the value of the orderDetailsAvailable property.
-     * 
-     */
-    public void setOrderDetailsAvailable(boolean value) {
-        this.orderDetailsAvailable = value;
-    }
-
-    /**
-     * Gets the value of the totalOrders property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getTotalOrders() {
-        return totalOrders;
-    }
-
-    /**
-     * Sets the value of the totalOrders property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setTotalOrders(BigInteger value) {
-        this.totalOrders = value;
-    }
-
-    /**
-     * Gets the value of the totalAmount property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVZOrderDetailsType.TotalAmount }
-     *     
-     */
-    public HVZOrderDetailsType.TotalAmount getTotalAmount() {
-        return totalAmount;
-    }
-
-    /**
-     * Sets the value of the totalAmount property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVZOrderDetailsType.TotalAmount }
-     *     
-     */
-    public void setTotalAmount(HVZOrderDetailsType.TotalAmount value) {
-        this.totalAmount = value;
-    }
-
-    /**
-     * Gets the value of the currency property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCurrency() {
-        return currency;
-    }
-
-    /**
-     * Sets the value of the currency property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCurrency(String value) {
-        this.currency = value;
-    }
-
-    /**
-     * Gets the value of the firstOrderInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVZOrderDetailsType.FirstOrderInfo }
-     *     
-     */
-    public HVZOrderDetailsType.FirstOrderInfo getFirstOrderInfo() {
-        return firstOrderInfo;
-    }
-
-    /**
-     * Sets the value of the firstOrderInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVZOrderDetailsType.FirstOrderInfo }
-     *     
-     */
-    public void setFirstOrderInfo(HVZOrderDetailsType.FirstOrderInfo value) {
-        this.firstOrderInfo = value;
-    }
-
-    /**
-     * Gets the value of the signingInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVUSigningInfoType }
-     *     
-     */
-    public HVUSigningInfoType getSigningInfo() {
-        return signingInfo;
-    }
-
-    /**
-     * Sets the value of the signingInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVUSigningInfoType }
-     *     
-     */
-    public void setSigningInfo(HVUSigningInfoType value) {
-        this.signingInfo = value;
-    }
-
-    /**
-     * Gets the value of the signerInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the signerInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSignerInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SignerInfoType }
-     * 
-     * 
-     */
-    public List<SignerInfoType> getSignerInfo() {
-        if (signerInfo == null) {
-            signerInfo = new ArrayList<SignerInfoType>();
-        }
-        return this.signerInfo;
-    }
-
-    /**
-     * Gets the value of the originatorInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVUOriginatorInfoType }
-     *     
-     */
-    public HVUOriginatorInfoType getOriginatorInfo() {
-        return originatorInfo;
-    }
-
-    /**
-     * Sets the value of the originatorInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVUOriginatorInfoType }
-     *     
-     */
-    public void setOriginatorInfo(HVUOriginatorInfoType value) {
-        this.originatorInfo = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;sequence>
-     *         &lt;element name="OrderPartyInfo" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; minOccurs="0"/>
-     *         &lt;element name="AccountInfo" minOccurs="0">
-     *           &lt;complexType>
-     *             &lt;complexContent>
-     *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *                 &lt;sequence>
-     *                   &lt;choice maxOccurs="2">
-     *                     &lt;element name="AccountNumber">
-     *                       &lt;complexType>
-     *                         &lt;simpleContent>
-     *                           &lt;extension 
base="&lt;urn:org:ebics:H004>AccountNumberType">
-     *                             &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-     *                           &lt;/extension>
-     *                         &lt;/simpleContent>
-     *                       &lt;/complexType>
-     *                     &lt;/element>
-     *                     &lt;element name="NationalAccountNumber">
-     *                       &lt;complexType>
-     *                         &lt;simpleContent>
-     *                           &lt;extension 
base="&lt;urn:org:ebics:H004>NationalAccountNumberType">
-     *                             &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-     *                           &lt;/extension>
-     *                         &lt;/simpleContent>
-     *                       &lt;/complexType>
-     *                     &lt;/element>
-     *                   &lt;/choice>
-     *                   &lt;choice maxOccurs="2">
-     *                     &lt;element name="BankCode">
-     *                       &lt;complexType>
-     *                         &lt;simpleContent>
-     *                           &lt;extension 
base="&lt;urn:org:ebics:H004>BankCodeType">
-     *                             &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-     *                             &lt;attribute name="Prefix" 
type="{urn:org:ebics:H004}BankCodePrefixType" />
-     *                           &lt;/extension>
-     *                         &lt;/simpleContent>
-     *                       &lt;/complexType>
-     *                     &lt;/element>
-     *                     &lt;element name="NationalBankCode">
-     *                       &lt;complexType>
-     *                         &lt;simpleContent>
-     *                           &lt;extension 
base="&lt;urn:org:ebics:H004>NationalBankCodeType">
-     *                             &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-     *                           &lt;/extension>
-     *                         &lt;/simpleContent>
-     *                       &lt;/complexType>
-     *                     &lt;/element>
-     *                   &lt;/choice>
-     *                 &lt;/sequence>
-     *               &lt;/restriction>
-     *             &lt;/complexContent>
-     *           &lt;/complexType>
-     *         &lt;/element>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "orderPartyInfo",
-        "accountInfo"
-    })
-    public static class FirstOrderInfo {
-
-        @XmlElement(name = "OrderPartyInfo")
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        @XmlSchemaType(name = "normalizedString")
-        protected String orderPartyInfo;
-        @XmlElement(name = "AccountInfo")
-        protected HVZOrderDetailsType.FirstOrderInfo.AccountInfo accountInfo;
-
-        /**
-         * Gets the value of the orderPartyInfo property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getOrderPartyInfo() {
-            return orderPartyInfo;
-        }
-
-        /**
-         * Sets the value of the orderPartyInfo property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setOrderPartyInfo(String value) {
-            this.orderPartyInfo = value;
-        }
-
-        /**
-         * Gets the value of the accountInfo property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link HVZOrderDetailsType.FirstOrderInfo.AccountInfo }
-         *     
-         */
-        public HVZOrderDetailsType.FirstOrderInfo.AccountInfo getAccountInfo() 
{
-            return accountInfo;
-        }
-
-        /**
-         * Sets the value of the accountInfo property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link HVZOrderDetailsType.FirstOrderInfo.AccountInfo }
-         *     
-         */
-        public void 
setAccountInfo(HVZOrderDetailsType.FirstOrderInfo.AccountInfo value) {
-            this.accountInfo = value;
-        }
-
-
-        /**
-         * <p>Java class for anonymous complex type.
-         * 
-         * <p>The following schema fragment specifies the expected content 
contained within this class.
-         * 
-         * <pre>
-         * &lt;complexType>
-         *   &lt;complexContent>
-         *     &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
-         *       &lt;sequence>
-         *         &lt;choice maxOccurs="2">
-         *           &lt;element name="AccountNumber">
-         *             &lt;complexType>
-         *               &lt;simpleContent>
-         *                 &lt;extension 
base="&lt;urn:org:ebics:H004>AccountNumberType">
-         *                   &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-         *                 &lt;/extension>
-         *               &lt;/simpleContent>
-         *             &lt;/complexType>
-         *           &lt;/element>
-         *           &lt;element name="NationalAccountNumber">
-         *             &lt;complexType>
-         *               &lt;simpleContent>
-         *                 &lt;extension 
base="&lt;urn:org:ebics:H004>NationalAccountNumberType">
-         *                   &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-         *                 &lt;/extension>
-         *               &lt;/simpleContent>
-         *             &lt;/complexType>
-         *           &lt;/element>
-         *         &lt;/choice>
-         *         &lt;choice maxOccurs="2">
-         *           &lt;element name="BankCode">
-         *             &lt;complexType>
-         *               &lt;simpleContent>
-         *                 &lt;extension 
base="&lt;urn:org:ebics:H004>BankCodeType">
-         *                   &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-         *                   &lt;attribute name="Prefix" 
type="{urn:org:ebics:H004}BankCodePrefixType" />
-         *                 &lt;/extension>
-         *               &lt;/simpleContent>
-         *             &lt;/complexType>
-         *           &lt;/element>
-         *           &lt;element name="NationalBankCode">
-         *             &lt;complexType>
-         *               &lt;simpleContent>
-         *                 &lt;extension 
base="&lt;urn:org:ebics:H004>NationalBankCodeType">
-         *                   &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-         *                 &lt;/extension>
-         *               &lt;/simpleContent>
-         *             &lt;/complexType>
-         *           &lt;/element>
-         *         &lt;/choice>
-         *       &lt;/sequence>
-         *     &lt;/restriction>
-         *   &lt;/complexContent>
-         * &lt;/complexType>
-         * </pre>
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "accountNumberOrNationalAccountNumber",
-            "bankCodeOrNationalBankCode"
-        })
-        public static class AccountInfo {
-
-            @XmlElements({
-                @XmlElement(name = "AccountNumber", type = 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.AccountNumber.class),
-                @XmlElement(name = "NationalAccountNumber", type = 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalAccountNumber.class)
-            })
-            protected List<Object> accountNumberOrNationalAccountNumber;
-            @XmlElements({
-                @XmlElement(name = "BankCode", type = 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.BankCode.class),
-                @XmlElement(name = "NationalBankCode", type = 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalBankCode.class)
-            })
-            protected List<Object> bankCodeOrNationalBankCode;
-
-            /**
-             * Gets the value of the accountNumberOrNationalAccountNumber 
property.
-             * 
-             * <p>
-             * This accessor method returns a reference to the live list,
-             * not a snapshot. Therefore any modification you make to the
-             * returned list will be present inside the JAXB object.
-             * This is why there is not a <CODE>set</CODE> method for the 
accountNumberOrNationalAccountNumber property.
-             * 
-             * <p>
-             * For example, to add a new item, do as follows:
-             * <pre>
-             *    getAccountNumberOrNationalAccountNumber().add(newItem);
-             * </pre>
-             * 
-             * 
-             * <p>
-             * Objects of the following type(s) are allowed in the list
-             * {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.AccountNumber }
-             * {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalAccountNumber }
-             * 
-             * 
-             */
-            public List<Object> getAccountNumberOrNationalAccountNumber() {
-                if (accountNumberOrNationalAccountNumber == null) {
-                    accountNumberOrNationalAccountNumber = new 
ArrayList<Object>();
-                }
-                return this.accountNumberOrNationalAccountNumber;
-            }
-
-            /**
-             * Gets the value of the bankCodeOrNationalBankCode property.
-             * 
-             * <p>
-             * This accessor method returns a reference to the live list,
-             * not a snapshot. Therefore any modification you make to the
-             * returned list will be present inside the JAXB object.
-             * This is why there is not a <CODE>set</CODE> method for the 
bankCodeOrNationalBankCode property.
-             * 
-             * <p>
-             * For example, to add a new item, do as follows:
-             * <pre>
-             *    getBankCodeOrNationalBankCode().add(newItem);
-             * </pre>
-             * 
-             * 
-             * <p>
-             * Objects of the following type(s) are allowed in the list
-             * {@link HVZOrderDetailsType.FirstOrderInfo.AccountInfo.BankCode }
-             * {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalBankCode }
-             * 
-             * 
-             */
-            public List<Object> getBankCodeOrNationalBankCode() {
-                if (bankCodeOrNationalBankCode == null) {
-                    bankCodeOrNationalBankCode = new ArrayList<Object>();
-                }
-                return this.bankCodeOrNationalBankCode;
-            }
-
-
-            /**
-             * <p>Java class for anonymous complex type.
-             * 
-             * <p>The following schema fragment specifies the expected content 
contained within this class.
-             * 
-             * <pre>
-             * &lt;complexType>
-             *   &lt;simpleContent>
-             *     &lt;extension 
base="&lt;urn:org:ebics:H004>AccountNumberType">
-             *       &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-             *     &lt;/extension>
-             *   &lt;/simpleContent>
-             * &lt;/complexType>
-             * </pre>
-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "", propOrder = {
-                "value"
-            })
-            public static class AccountNumber {
-
-                @XmlValue
-                @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-                protected String value;
-                @XmlAttribute(name = "international")
-                protected Boolean international;
-
-                /**
-                 * Datentyp für eine Kontonummer (national/international).
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getValue() {
-                    return value;
-                }
-
-                /**
-                 * Sets the value of the value property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setValue(String value) {
-                    this.value = value;
-                }
-
-                /**
-                 * Gets the value of the international property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public boolean isInternational() {
-                    if (international == null) {
-                        return false;
-                    } else {
-                        return international;
-                    }
-                }
-
-                /**
-                 * Sets the value of the international property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public void setInternational(Boolean value) {
-                    this.international = value;
-                }
-
-            }
-
-
-            /**
-             * <p>Java class for anonymous complex type.
-             * 
-             * <p>The following schema fragment specifies the expected content 
contained within this class.
-             * 
-             * <pre>
-             * &lt;complexType>
-             *   &lt;simpleContent>
-             *     &lt;extension base="&lt;urn:org:ebics:H004>BankCodeType">
-             *       &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-             *       &lt;attribute name="Prefix" 
type="{urn:org:ebics:H004}BankCodePrefixType" />
-             *     &lt;/extension>
-             *   &lt;/simpleContent>
-             * &lt;/complexType>
-             * </pre>
-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "", propOrder = {
-                "value"
-            })
-            public static class BankCode {
-
-                @XmlValue
-                @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-                protected String value;
-                @XmlAttribute(name = "international")
-                protected Boolean international;
-                @XmlAttribute(name = "Prefix")
-                @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-                protected String prefix;
-
-                /**
-                 * Datentyp für eine Bankleitzahl (national/international).
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getValue() {
-                    return value;
-                }
-
-                /**
-                 * Sets the value of the value property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setValue(String value) {
-                    this.value = value;
-                }
-
-                /**
-                 * Gets the value of the international property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public boolean isInternational() {
-                    if (international == null) {
-                        return false;
-                    } else {
-                        return international;
-                    }
-                }
-
-                /**
-                 * Sets the value of the international property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public void setInternational(Boolean value) {
-                    this.international = value;
-                }
-
-                /**
-                 * Gets the value of the prefix property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getPrefix() {
-                    return prefix;
-                }
-
-                /**
-                 * Sets the value of the prefix property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setPrefix(String value) {
-                    this.prefix = value;
-                }
-
-            }
-
-
-            /**
-             * <p>Java class for anonymous complex type.
-             * 
-             * <p>The following schema fragment specifies the expected content 
contained within this class.
-             * 
-             * <pre>
-             * &lt;complexType>
-             *   &lt;simpleContent>
-             *     &lt;extension 
base="&lt;urn:org:ebics:H004>NationalAccountNumberType">
-             *       &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-             *     &lt;/extension>
-             *   &lt;/simpleContent>
-             * &lt;/complexType>
-             * </pre>
-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "", propOrder = {
-                "value"
-            })
-            public static class NationalAccountNumber {
-
-                @XmlValue
-                @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-                protected String value;
-                @XmlAttribute(name = "format", required = true)
-                @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-                @XmlSchemaType(name = "token")
-                protected String format;
-
-                /**
-                 * Datentyp für eine Kontonummer (freies Format).
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getValue() {
-                    return value;
-                }
-
-                /**
-                 * Sets the value of the value property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setValue(String value) {
-                    this.value = value;
-                }
-
-                /**
-                 * Gets the value of the format property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getFormat() {
-                    return format;
-                }
-
-                /**
-                 * Sets the value of the format property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setFormat(String value) {
-                    this.format = value;
-                }
-
-            }
-
-
-            /**
-             * <p>Java class for anonymous complex type.
-             * 
-             * <p>The following schema fragment specifies the expected content 
contained within this class.
-             * 
-             * <pre>
-             * &lt;complexType>
-             *   &lt;simpleContent>
-             *     &lt;extension 
base="&lt;urn:org:ebics:H004>NationalBankCodeType">
-             *       &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-             *     &lt;/extension>
-             *   &lt;/simpleContent>
-             * &lt;/complexType>
-             * </pre>
-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "", propOrder = {
-                "value"
-            })
-            public static class NationalBankCode {
-
-                @XmlValue
-                @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-                protected String value;
-                @XmlAttribute(name = "format", required = true)
-                @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-                @XmlSchemaType(name = "token")
-                protected String format;
-
-                /**
-                 * Datentyp für eine Bankleitzahl (freies Format).
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getValue() {
-                    return value;
-                }
-
-                /**
-                 * Sets the value of the value property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setValue(String value) {
-                    this.value = value;
-                }
-
-                /**
-                 * Gets the value of the format property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getFormat() {
-                    return format;
-                }
-
-                /**
-                 * Sets the value of the format property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setFormat(String value) {
-                    this.format = value;
-                }
-
-            }
-
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>AmountValueType">
-     *       &lt;attribute name="isCredit" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class TotalAmount {
-
-        @XmlValue
-        protected BigDecimal value;
-        @XmlAttribute(name = "isCredit")
-        protected Boolean isCredit;
-
-        /**
-         * Datentyp für einen Betragswert (ohne Währung).
-         * 
-         * @return
-         *     possible object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public BigDecimal getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public void setValue(BigDecimal value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the isCredit property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isIsCredit() {
-            return isCredit;
-        }
-
-        /**
-         * Sets the value of the isCredit property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setIsCredit(Boolean value) {
-            this.isCredit = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVZOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVZOrderParamsType.java
deleted file mode 100644
index ae6d2cf..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVZOrderParamsType.java
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für Auftragsart HVZ.
- * 
- * <p>Java class for HVZOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVZOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderTypes" 
type="{urn:org:ebics:H004}OrderTListType" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVZOrderParamsType", propOrder = {
-    "orderTypes",
-    "any"
-})
-public class HVZOrderParamsType {
-
-    @XmlList
-    @XmlElement(name = "OrderTypes")
-    protected List<String> orderTypes;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderTypes property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderTypes 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderTypes().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getOrderTypes() {
-        if (orderTypes == null) {
-            orderTypes = new ArrayList<String>();
-        }
-        return this.orderTypes;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVZResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVZResponseOrderDataType.java
deleted file mode 100644
index 9a7d8eb..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/HVZResponseOrderDataType.java
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Order data for order type HVZ (response: receive summary of orders 
currently stored in the distributed signature processing unit with additional 
informations).
- * 
- * <p>Java class for HVZResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVZResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderDetails" 
type="{urn:org:ebics:H004}HVZOrderDetailsType" maxOccurs="unbounded"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVZResponseOrderDataType", propOrder = {
-    "orderDetails",
-    "any"
-})
-public class HVZResponseOrderDataType {
-
-    @XmlElement(name = "OrderDetails", required = true)
-    protected List<HVZOrderDetailsType> orderDetails;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderDetails property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderDetails 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderDetails().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link HVZOrderDetailsType }
-     * 
-     * 
-     */
-    public List<HVZOrderDetailsType> getOrderDetails() {
-        if (orderDetails == null) {
-            orderDetails = new ArrayList<HVZOrderDetailsType>();
-        }
-        return this.orderDetails;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/KeyInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/KeyInfoType.java
deleted file mode 100644
index c8023f5..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/KeyInfoType.java
+++ /dev/null
@@ -1,142 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for KeyInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="KeyInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;choice maxOccurs="unbounded">
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}KeyName"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}KeyValue"/>
- *         &lt;element 
ref="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethod"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}PGPData"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SPKIData"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}MgmtData"/>
- *         &lt;any processContents='lax' namespace='##other'/>
- *       &lt;/choice>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "KeyInfoType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class KeyInfoType {
-
-    @XmlElementRefs({
-        @XmlElementRef(name = "PGPData", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "MgmtData", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "KeyName", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "RetrievalMethod", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "KeyValue", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "X509Data", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "SPKIData", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false)
-    })
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link Object }
-     * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
-     * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
-     * {@link String }
-     * {@link Element }
-     * {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
-     * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/KeyMgmntResponseMutableHeaderType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/KeyMgmntResponseMutableHeaderType.java
deleted file mode 100644
index 3233091..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/KeyMgmntResponseMutableHeaderType.java
+++ /dev/null
@@ -1,175 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für den variablen EBICS-Header.
- * 
- * <p>Java class for KeyMgmntResponseMutableHeaderType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="KeyMgmntResponseMutableHeaderType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderID" type="{urn:org:ebics:H004}OrderIDType" 
minOccurs="0"/>
- *         &lt;element name="ReturnCode" 
type="{urn:org:ebics:H004}ReturnCodeType"/>
- *         &lt;element name="ReportText" 
type="{urn:org:ebics:H004}ReportTextType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "KeyMgmntResponseMutableHeaderType", propOrder = {
-    "orderID",
-    "returnCode",
-    "reportText",
-    "any"
-})
-public class KeyMgmntResponseMutableHeaderType {
-
-    @XmlElement(name = "OrderID")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderID;
-    @XmlElement(name = "ReturnCode", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String returnCode;
-    @XmlElement(name = "ReportText", required = true)
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String reportText;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderID() {
-        return orderID;
-    }
-
-    /**
-     * Sets the value of the orderID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderID(String value) {
-        this.orderID = value;
-    }
-
-    /**
-     * Gets the value of the returnCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getReturnCode() {
-        return returnCode;
-    }
-
-    /**
-     * Sets the value of the returnCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setReturnCode(String value) {
-        this.returnCode = value;
-    }
-
-    /**
-     * Gets the value of the reportText property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getReportText() {
-        return reportText;
-    }
-
-    /**
-     * Sets the value of the reportText property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setReportText(String value) {
-        this.reportText = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/KeyValueType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/KeyValueType.java
deleted file mode 100644
index 22cd66a..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/KeyValueType.java
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for KeyValueType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="KeyValueType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;choice>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValue"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
- *         &lt;any processContents='lax' namespace='##other'/>
- *       &lt;/choice>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "KeyValueType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class KeyValueType {
-
-    @XmlElementRefs({
-        @XmlElementRef(name = "RSAKeyValue", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "DSAKeyValue", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false)
-    })
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * {@link Element }
-     * {@link Object }
-     * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
-     * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/ManifestType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/ManifestType.java
deleted file mode 100644
index 0b0d871..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/ManifestType.java
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for ManifestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="ManifestType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Reference"; 
maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ManifestType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "reference"
-})
-public class ManifestType {
-
-    @XmlElement(name = "Reference", required = true)
-    protected List<ReferenceType> reference;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the reference property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the reference 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getReference().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ReferenceType }
-     * 
-     * 
-     */
-    public List<ReferenceType> getReference() {
-        if (reference == null) {
-            reference = new ArrayList<ReferenceType>();
-        }
-        return this.reference;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/ObjectFactory.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/ObjectFactory.java
deleted file mode 100644
index b6379f2..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/ObjectFactory.java
+++ /dev/null
@@ -1,1893 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.math.BigInteger;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the tech.libeufin.messages.ebics.keyresponse package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _HVTResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HVTResponseOrderData");
-    private final static QName _KeyInfo_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "KeyInfo");
-    private final static QName _HPBResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HPBResponseOrderData");
-    private final static QName _GenericOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "GenericOrderParams");
-    private final static QName _HSARequestOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HSARequestOrderData");
-    private final static QName _ebicsSignatureDataAtEbicsOrders_QNAME = new 
QName("urn:org:ebics:H004", "EBICSSignatureData");
-    private final static QName _HVDResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HVDResponseOrderData");
-    private final static QName _HCARequestOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HCARequestOrderData");
-    private final static QName _SignatureProperty_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "SignatureProperty");
-    private final static QName _HVEOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "HVEOrderParams");
-    private final static QName _EBICSOrderData_QNAME = new 
QName("urn:org:ebics:H004", "EBICSOrderData");
-    private final static QName _RSAKeyValue_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "RSAKeyValue");
-    private final static QName _HCSRequestOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HCSRequestOrderData");
-    private final static QName _HVSOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "HVSOrderParams");
-    private final static QName _SignatureMethod_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "SignatureMethod");
-    private final static QName _Object_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "Object");
-    private final static QName _BankSignatureData_QNAME = new 
QName("urn:org:ebics:H004", "BankSignatureData");
-    private final static QName _FDLOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "FDLOrderParams");
-    private final static QName _PGPData_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "PGPData");
-    private final static QName _RetrievalMethod_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "RetrievalMethod");
-    private final static QName _SignaturePubKeyOrderData_QNAME = new 
QName("http://www.ebics.org/S001";, "SignaturePubKeyOrderData");
-    private final static QName _DSAKeyValue_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "DSAKeyValue");
-    private final static QName _HVSRequestOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HVSRequestOrderData");
-    private final static QName _OrderSignatureData_QNAME = new 
QName("http://www.ebics.org/S001";, "OrderSignatureData");
-    private final static QName _H3KRequestOrderData_QNAME = new 
QName("urn:org:ebics:H004", "H3KRequestOrderData");
-    private final static QName _HTDResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HTDResponseOrderData");
-    private final static QName _SPKIData_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "SPKIData");
-    private final static QName _HIARequestOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HIARequestOrderData");
-    private final static QName _HVZResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HVZResponseOrderData");
-    private final static QName _SignatureValue_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "SignatureValue");
-    private final static QName _UserSignatureData_QNAME = new 
QName("http://www.ebics.org/S001";, "UserSignatureData");
-    private final static QName _OrderParams_QNAME = new 
QName("urn:org:ebics:H004", "OrderParams");
-    private final static QName _KeyValue_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "KeyValue");
-    private final static QName _Transforms_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "Transforms");
-    private final static QName _HVUResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HVUResponseOrderData");
-    private final static QName _SignaturePubKeyInfo_QNAME = new 
QName("http://www.ebics.org/S001";, "SignaturePubKeyInfo");
-    private final static QName _HVUOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "HVUOrderParams");
-    private final static QName _DigestMethod_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "DigestMethod");
-    private final static QName _X509Data_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "X509Data");
-    private final static QName _AuthSignature_QNAME = new 
QName("urn:org:ebics:H004", "AuthSignature");
-    private final static QName _KeyName_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "KeyName");
-    private final static QName _Signature_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "Signature");
-    private final static QName _MgmtData_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "MgmtData");
-    private final static QName _HAAResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HAAResponseOrderData");
-    private final static QName _HVZOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "HVZOrderParams");
-    private final static QName _SignatureProperties_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "SignatureProperties");
-    private final static QName _HPDResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HPDResponseOrderData");
-    private final static QName _FULOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "FULOrderParams");
-    private final static QName _Transform_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "Transform");
-    private final static QName _HKDResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HKDResponseOrderData");
-    private final static QName _HVDOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "HVDOrderParams");
-    private final static QName _StandardOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "StandardOrderParams");
-    private final static QName _Reference_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "Reference");
-    private final static QName _DigestValue_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "DigestValue");
-    private final static QName _HVTOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "HVTOrderParams");
-    private final static QName _CanonicalizationMethod_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "CanonicalizationMethod");
-    private final static QName _SignedInfo_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "SignedInfo");
-    private final static QName _ebicsSignatureDataAtEbicsSignatures_QNAME = 
new QName("http://www.ebics.org/S001";, "EBICSSignatureData");
-    private final static QName _Manifest_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "Manifest");
-    private final static QName _PGPDataTypePGPKeyID_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "PGPKeyID");
-    private final static QName _PGPDataTypePGPKeyPacket_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "PGPKeyPacket");
-    private final static QName _X509DataTypeX509IssuerSerial_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "X509IssuerSerial");
-    private final static QName _X509DataTypeX509CRL_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "X509CRL");
-    private final static QName _X509DataTypeX509SubjectName_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "X509SubjectName");
-    private final static QName _X509DataTypeX509SKI_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "X509SKI");
-    private final static QName _X509DataTypeX509Certificate_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "X509Certificate");
-    private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = 
new QName("http://www.w3.org/2000/09/xmldsig#";, "HMACOutputLength");
-    private final static QName _TransformTypeXPath_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "XPath");
-    private final static QName _SPKIDataTypeSPKISexp_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "SPKISexp");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of 
schema derived classes for package: tech.libeufin.messages.ebics.keyresponse
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link EbicsKeyManagementResponse }
-     * 
-     */
-    public EbicsKeyManagementResponse createEbicsKeyManagementResponse() {
-        return new EbicsKeyManagementResponse();
-    }
-
-    /**
-     * Create an instance of {@link Parameter }
-     * 
-     */
-    public Parameter createParameter() {
-        return new Parameter();
-    }
-
-    /**
-     * Create an instance of {@link UserSignatureDataSigBookType }
-     * 
-     */
-    public UserSignatureDataSigBookType createUserSignatureDataSigBookType() {
-        return new UserSignatureDataSigBookType();
-    }
-
-    /**
-     * Create an instance of {@link AccountType }
-     * 
-     */
-    public AccountType createAccountType() {
-        return new AccountType();
-    }
-
-    /**
-     * Create an instance of {@link DataTransferResponseType }
-     * 
-     */
-    public DataTransferResponseType createDataTransferResponseType() {
-        return new DataTransferResponseType();
-    }
-
-    /**
-     * Create an instance of {@link DataEncryptionInfoType }
-     * 
-     */
-    public DataEncryptionInfoType createDataEncryptionInfoType() {
-        return new DataEncryptionInfoType();
-    }
-
-    /**
-     * Create an instance of {@link AttributedAccountType }
-     * 
-     */
-    public AttributedAccountType createAttributedAccountType() {
-        return new AttributedAccountType();
-    }
-
-    /**
-     * Create an instance of {@link UserInfoType }
-     * 
-     */
-    public UserInfoType createUserInfoType() {
-        return new UserInfoType();
-    }
-
-    /**
-     * Create an instance of {@link HPDAccessParamsType }
-     * 
-     */
-    public HPDAccessParamsType createHPDAccessParamsType() {
-        return new HPDAccessParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HVZOrderDetailsType }
-     * 
-     */
-    public HVZOrderDetailsType createHVZOrderDetailsType() {
-        return new HVZOrderDetailsType();
-    }
-
-    /**
-     * Create an instance of {@link HVZOrderDetailsType.FirstOrderInfo }
-     * 
-     */
-    public HVZOrderDetailsType.FirstOrderInfo 
createHVZOrderDetailsTypeFirstOrderInfo() {
-        return new HVZOrderDetailsType.FirstOrderInfo();
-    }
-
-    /**
-     * Create an instance of {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo }
-     * 
-     */
-    public HVZOrderDetailsType.FirstOrderInfo.AccountInfo 
createHVZOrderDetailsTypeFirstOrderInfoAccountInfo() {
-        return new HVZOrderDetailsType.FirstOrderInfo.AccountInfo();
-    }
-
-    /**
-     * Create an instance of {@link PartnerInfoType }
-     * 
-     */
-    public PartnerInfoType createPartnerInfoType() {
-        return new PartnerInfoType();
-    }
-
-    /**
-     * Create an instance of {@link HVTOrderInfoType }
-     * 
-     */
-    public HVTOrderInfoType createHVTOrderInfoType() {
-        return new HVTOrderInfoType();
-    }
-
-    /**
-     * Create an instance of {@link DataTransferRequestType }
-     * 
-     */
-    public DataTransferRequestType createDataTransferRequestType() {
-        return new DataTransferRequestType();
-    }
-
-    /**
-     * Create an instance of {@link SignerInfoType }
-     * 
-     */
-    public SignerInfoType createSignerInfoType() {
-        return new SignerInfoType();
-    }
-
-    /**
-     * Create an instance of {@link HPDProtocolParamsType }
-     * 
-     */
-    public HPDProtocolParamsType createHPDProtocolParamsType() {
-        return new HPDProtocolParamsType();
-    }
-
-    /**
-     * Create an instance of {@link EbicsKeyManagementResponse.Body }
-     * 
-     */
-    public EbicsKeyManagementResponse.Body 
createEbicsKeyManagementResponseBody() {
-        return new EbicsKeyManagementResponse.Body();
-    }
-
-    /**
-     * Create an instance of {@link 
EbicsKeyManagementResponse.Body.DataTransfer }
-     * 
-     */
-    public EbicsKeyManagementResponse.Body.DataTransfer 
createEbicsKeyManagementResponseBodyDataTransfer() {
-        return new EbicsKeyManagementResponse.Body.DataTransfer();
-    }
-
-    /**
-     * Create an instance of {@link EbicsKeyManagementResponse.Header }
-     * 
-     */
-    public EbicsKeyManagementResponse.Header 
createEbicsKeyManagementResponseHeader() {
-        return new EbicsKeyManagementResponse.Header();
-    }
-
-    /**
-     * Create an instance of {@link BankSignatureDataSigBookType }
-     * 
-     */
-    public BankSignatureDataSigBookType createBankSignatureDataSigBookType() {
-        return new BankSignatureDataSigBookType();
-    }
-
-    /**
-     * Create an instance of {@link StandardOrderParamsType }
-     * 
-     */
-    public StandardOrderParamsType createStandardOrderParamsType() {
-        return new StandardOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link FDLOrderParamsType }
-     * 
-     */
-    public FDLOrderParamsType createFDLOrderParamsType() {
-        return new FDLOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HVTOrderParamsType }
-     * 
-     */
-    public HVTOrderParamsType createHVTOrderParamsType() {
-        return new HVTOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HVZOrderParamsType }
-     * 
-     */
-    public HVZOrderParamsType createHVZOrderParamsType() {
-        return new HVZOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HAAResponseOrderDataType }
-     * 
-     */
-    public HAAResponseOrderDataType createHAAResponseOrderDataType() {
-        return new HAAResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HVSOrderParamsType }
-     * 
-     */
-    public HVSOrderParamsType createHVSOrderParamsType() {
-        return new HVSOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HPDResponseOrderDataType }
-     * 
-     */
-    public HPDResponseOrderDataType createHPDResponseOrderDataType() {
-        return new HPDResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link FULOrderParamsType }
-     * 
-     */
-    public FULOrderParamsType createFULOrderParamsType() {
-        return new FULOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link SignatureType }
-     * 
-     */
-    public SignatureType createSignatureType() {
-        return new SignatureType();
-    }
-
-    /**
-     * Create an instance of {@link HVEOrderParamsType }
-     * 
-     */
-    public HVEOrderParamsType createHVEOrderParamsType() {
-        return new HVEOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HCSRequestOrderDataType }
-     * 
-     */
-    public HCSRequestOrderDataType createHCSRequestOrderDataType() {
-        return new HCSRequestOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HVSRequestOrderDataType }
-     * 
-     */
-    public HVSRequestOrderDataType createHVSRequestOrderDataType() {
-        return new HVSRequestOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link H3KRequestOrderDataType }
-     * 
-     */
-    public H3KRequestOrderDataType createH3KRequestOrderDataType() {
-        return new H3KRequestOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HTDReponseOrderDataType }
-     * 
-     */
-    public HTDReponseOrderDataType createHTDReponseOrderDataType() {
-        return new HTDReponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HKDResponseOrderDataType }
-     * 
-     */
-    public HKDResponseOrderDataType createHKDResponseOrderDataType() {
-        return new HKDResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HVDOrderParamsType }
-     * 
-     */
-    public HVDOrderParamsType createHVDOrderParamsType() {
-        return new HVDOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HPBResponseOrderDataType }
-     * 
-     */
-    public HPBResponseOrderDataType createHPBResponseOrderDataType() {
-        return new HPBResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link GenericOrderParamsType }
-     * 
-     */
-    public GenericOrderParamsType createGenericOrderParamsType() {
-        return new GenericOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HSARequestOrderDataType }
-     * 
-     */
-    public HSARequestOrderDataType createHSARequestOrderDataType() {
-        return new HSARequestOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HIARequestOrderDataType }
-     * 
-     */
-    public HIARequestOrderDataType createHIARequestOrderDataType() {
-        return new HIARequestOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HVZResponseOrderDataType }
-     * 
-     */
-    public HVZResponseOrderDataType createHVZResponseOrderDataType() {
-        return new HVZResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HVTResponseOrderData }
-     * 
-     */
-    public HVTResponseOrderData createHVTResponseOrderData() {
-        return new HVTResponseOrderData();
-    }
-
-    /**
-     * Create an instance of {@link HCARequestOrderDataType }
-     * 
-     */
-    public HCARequestOrderDataType createHCARequestOrderDataType() {
-        return new HCARequestOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link Parameter.Value }
-     * 
-     */
-    public Parameter.Value createParameterValue() {
-        return new Parameter.Value();
-    }
-
-    /**
-     * Create an instance of {@link HVUOrderParamsType }
-     * 
-     */
-    public HVUOrderParamsType createHVUOrderParamsType() {
-        return new HVUOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HVUResponseOrderDataType }
-     * 
-     */
-    public HVUResponseOrderDataType createHVUResponseOrderDataType() {
-        return new HVUResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HVDResponseOrderDataType }
-     * 
-     */
-    public HVDResponseOrderDataType createHVDResponseOrderDataType() {
-        return new HVDResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link PubKeyDigestType }
-     * 
-     */
-    public PubKeyDigestType createPubKeyDigestType() {
-        return new PubKeyDigestType();
-    }
-
-    /**
-     * Create an instance of {@link FileFormatType }
-     * 
-     */
-    public FileFormatType createFileFormatType() {
-        return new FileFormatType();
-    }
-
-    /**
-     * Create an instance of {@link EncryptionPubKeyInfoType }
-     * 
-     */
-    public EncryptionPubKeyInfoType createEncryptionPubKeyInfoType() {
-        return new EncryptionPubKeyInfoType();
-    }
-
-    /**
-     * Create an instance of {@link HVTResponseOrderDataType }
-     * 
-     */
-    public HVTResponseOrderDataType createHVTResponseOrderDataType() {
-        return new HVTResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HVUSigningInfoType }
-     * 
-     */
-    public HVUSigningInfoType createHVUSigningInfoType() {
-        return new HVUSigningInfoType();
-    }
-
-    /**
-     * Create an instance of {@link AuthenticationCertificateInfoType }
-     * 
-     */
-    public AuthenticationCertificateInfoType 
createAuthenticationCertificateInfoType() {
-        return new AuthenticationCertificateInfoType();
-    }
-
-    /**
-     * Create an instance of {@link AmountType }
-     * 
-     */
-    public AmountType createAmountType() {
-        return new AmountType();
-    }
-
-    /**
-     * Create an instance of {@link KeyMgmntResponseMutableHeaderType }
-     * 
-     */
-    public KeyMgmntResponseMutableHeaderType 
createKeyMgmntResponseMutableHeaderType() {
-        return new KeyMgmntResponseMutableHeaderType();
-    }
-
-    /**
-     * Create an instance of {@link HVTOrderFlagsType }
-     * 
-     */
-    public HVTOrderFlagsType createHVTOrderFlagsType() {
-        return new HVTOrderFlagsType();
-    }
-
-    /**
-     * Create an instance of {@link HVUOrderDetailsType }
-     * 
-     */
-    public HVUOrderDetailsType createHVUOrderDetailsType() {
-        return new HVUOrderDetailsType();
-    }
-
-    /**
-     * Create an instance of {@link EncryptionCertificateInfoType }
-     * 
-     */
-    public EncryptionCertificateInfoType createEncryptionCertificateInfoType() 
{
-        return new EncryptionCertificateInfoType();
-    }
-
-    /**
-     * Create an instance of {@link SignatureCertificateInfoType }
-     * 
-     */
-    public SignatureCertificateInfoType createSignatureCertificateInfoType() {
-        return new SignatureCertificateInfoType();
-    }
-
-    /**
-     * Create an instance of {@link CertificateInfoType }
-     * 
-     */
-    public CertificateInfoType createCertificateInfoType() {
-        return new CertificateInfoType();
-    }
-
-    /**
-     * Create an instance of {@link PreValidationRequestType }
-     * 
-     */
-    public PreValidationRequestType createPreValidationRequestType() {
-        return new PreValidationRequestType();
-    }
-
-    /**
-     * Create an instance of {@link PubKeyInfoTypeAtEbicsTypes }
-     * 
-     */
-    public PubKeyInfoTypeAtEbicsTypes createPubKeyInfoTypeAtEbicsTypes() {
-        return new PubKeyInfoTypeAtEbicsTypes();
-    }
-
-    /**
-     * Create an instance of {@link TransferReceiptRequestType }
-     * 
-     */
-    public TransferReceiptRequestType createTransferReceiptRequestType() {
-        return new TransferReceiptRequestType();
-    }
-
-    /**
-     * Create an instance of {@link AuthOrderInfoType }
-     * 
-     */
-    public AuthOrderInfoType createAuthOrderInfoType() {
-        return new AuthOrderInfoType();
-    }
-
-    /**
-     * Create an instance of {@link BankInfoType }
-     * 
-     */
-    public BankInfoType createBankInfoType() {
-        return new BankInfoType();
-    }
-
-    /**
-     * Create an instance of {@link HPDVersionType }
-     * 
-     */
-    public HPDVersionType createHPDVersionType() {
-        return new HPDVersionType();
-    }
-
-    /**
-     * Create an instance of {@link HVUOriginatorInfoType }
-     * 
-     */
-    public HVUOriginatorInfoType createHVUOriginatorInfoType() {
-        return new HVUOriginatorInfoType();
-    }
-
-    /**
-     * Create an instance of {@link HVTAccountInfoType }
-     * 
-     */
-    public HVTAccountInfoType createHVTAccountInfoType() {
-        return new HVTAccountInfoType();
-    }
-
-    /**
-     * Create an instance of {@link TransferReceiptResponseType }
-     * 
-     */
-    public TransferReceiptResponseType createTransferReceiptResponseType() {
-        return new TransferReceiptResponseType();
-    }
-
-    /**
-     * Create an instance of {@link PubKeyValueTypeAtEbicsTypes }
-     * 
-     */
-    public PubKeyValueTypeAtEbicsTypes createPubKeyValueTypeAtEbicsTypes() {
-        return new PubKeyValueTypeAtEbicsTypes();
-    }
-
-    /**
-     * Create an instance of {@link AuthenticationPubKeyInfoType }
-     * 
-     */
-    public AuthenticationPubKeyInfoType createAuthenticationPubKeyInfoType() {
-        return new AuthenticationPubKeyInfoType();
-    }
-
-    /**
-     * Create an instance of {@link AddressInfoType }
-     * 
-     */
-    public AddressInfoType createAddressInfoType() {
-        return new AddressInfoType();
-    }
-
-    /**
-     * Create an instance of {@link DataDigestType }
-     * 
-     */
-    public DataDigestType createDataDigestType() {
-        return new DataDigestType();
-    }
-
-    /**
-     * Create an instance of {@link UserPermissionType }
-     * 
-     */
-    public UserPermissionType createUserPermissionType() {
-        return new UserPermissionType();
-    }
-
-    /**
-     * Create an instance of {@link PreValidationAccountAuthType }
-     * 
-     */
-    public PreValidationAccountAuthType createPreValidationAccountAuthType() {
-        return new PreValidationAccountAuthType();
-    }
-
-    /**
-     * Create an instance of {@link PGPDataType }
-     * 
-     */
-    public PGPDataType createPGPDataType() {
-        return new PGPDataType();
-    }
-
-    /**
-     * Create an instance of {@link KeyValueType }
-     * 
-     */
-    public KeyValueType createKeyValueType() {
-        return new KeyValueType();
-    }
-
-    /**
-     * Create an instance of {@link DSAKeyValueType }
-     * 
-     */
-    public DSAKeyValueType createDSAKeyValueType() {
-        return new DSAKeyValueType();
-    }
-
-    /**
-     * Create an instance of {@link ReferenceType }
-     * 
-     */
-    public ReferenceType createReferenceType() {
-        return new ReferenceType();
-    }
-
-    /**
-     * Create an instance of {@link RetrievalMethodType }
-     * 
-     */
-    public RetrievalMethodType createRetrievalMethodType() {
-        return new RetrievalMethodType();
-    }
-
-    /**
-     * Create an instance of {@link TransformsType }
-     * 
-     */
-    public TransformsType createTransformsType() {
-        return new TransformsType();
-    }
-
-    /**
-     * Create an instance of {@link CanonicalizationMethodType }
-     * 
-     */
-    public CanonicalizationMethodType createCanonicalizationMethodType() {
-        return new CanonicalizationMethodType();
-    }
-
-    /**
-     * Create an instance of {@link DigestMethodType }
-     * 
-     */
-    public DigestMethodType createDigestMethodType() {
-        return new DigestMethodType();
-    }
-
-    /**
-     * Create an instance of {@link ManifestType }
-     * 
-     */
-    public ManifestType createManifestType() {
-        return new ManifestType();
-    }
-
-    /**
-     * Create an instance of {@link SignaturePropertyType }
-     * 
-     */
-    public SignaturePropertyType createSignaturePropertyType() {
-        return new SignaturePropertyType();
-    }
-
-    /**
-     * Create an instance of {@link X509DataType }
-     * 
-     */
-    public X509DataType createX509DataType() {
-        return new X509DataType();
-    }
-
-    /**
-     * Create an instance of {@link SignedInfoType }
-     * 
-     */
-    public SignedInfoType createSignedInfoType() {
-        return new SignedInfoType();
-    }
-
-    /**
-     * Create an instance of {@link RSAKeyValueType }
-     * 
-     */
-    public RSAKeyValueType createRSAKeyValueType() {
-        return new RSAKeyValueType();
-    }
-
-    /**
-     * Create an instance of {@link SPKIDataType }
-     * 
-     */
-    public SPKIDataType createSPKIDataType() {
-        return new SPKIDataType();
-    }
-
-    /**
-     * Create an instance of {@link SignatureValueType }
-     * 
-     */
-    public SignatureValueType createSignatureValueType() {
-        return new SignatureValueType();
-    }
-
-    /**
-     * Create an instance of {@link KeyInfoType }
-     * 
-     */
-    public KeyInfoType createKeyInfoType() {
-        return new KeyInfoType();
-    }
-
-    /**
-     * Create an instance of {@link SignaturePropertiesType }
-     * 
-     */
-    public SignaturePropertiesType createSignaturePropertiesType() {
-        return new SignaturePropertiesType();
-    }
-
-    /**
-     * Create an instance of {@link SignatureMethodType }
-     * 
-     */
-    public SignatureMethodType createSignatureMethodType() {
-        return new SignatureMethodType();
-    }
-
-    /**
-     * Create an instance of {@link ObjectType }
-     * 
-     */
-    public ObjectType createObjectType() {
-        return new ObjectType();
-    }
-
-    /**
-     * Create an instance of {@link TransformType }
-     * 
-     */
-    public TransformType createTransformType() {
-        return new TransformType();
-    }
-
-    /**
-     * Create an instance of {@link X509IssuerSerialType }
-     * 
-     */
-    public X509IssuerSerialType createX509IssuerSerialType() {
-        return new X509IssuerSerialType();
-    }
-
-    /**
-     * Create an instance of {@link SignaturePubKeyInfoType }
-     * 
-     */
-    public SignaturePubKeyInfoType createSignaturePubKeyInfoType() {
-        return new SignaturePubKeyInfoType();
-    }
-
-    /**
-     * Create an instance of {@link SignaturePubKeyOrderDataType }
-     * 
-     */
-    public SignaturePubKeyOrderDataType createSignaturePubKeyOrderDataType() {
-        return new SignaturePubKeyOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link OrderSignatureDataType }
-     * 
-     */
-    public OrderSignatureDataType createOrderSignatureDataType() {
-        return new OrderSignatureDataType();
-    }
-
-    /**
-     * Create an instance of {@link PubKeyInfoTypeAtEbicsSignatures }
-     * 
-     */
-    public PubKeyInfoTypeAtEbicsSignatures 
createPubKeyInfoTypeAtEbicsSignatures() {
-        return new PubKeyInfoTypeAtEbicsSignatures();
-    }
-
-    /**
-     * Create an instance of {@link PubKeyValueTypeAtEbicsSignatures }
-     * 
-     */
-    public PubKeyValueTypeAtEbicsSignatures 
createPubKeyValueTypeAtEbicsSignatures() {
-        return new PubKeyValueTypeAtEbicsSignatures();
-    }
-
-    /**
-     * Create an instance of {@link 
UserSignatureDataSigBookType.OrderSignature }
-     * 
-     */
-    public UserSignatureDataSigBookType.OrderSignature 
createUserSignatureDataSigBookTypeOrderSignature() {
-        return new UserSignatureDataSigBookType.OrderSignature();
-    }
-
-    /**
-     * Create an instance of {@link AccountType.AccountNumber }
-     * 
-     */
-    public AccountType.AccountNumber createAccountTypeAccountNumber() {
-        return new AccountType.AccountNumber();
-    }
-
-    /**
-     * Create an instance of {@link AccountType.NationalAccountNumber }
-     * 
-     */
-    public AccountType.NationalAccountNumber 
createAccountTypeNationalAccountNumber() {
-        return new AccountType.NationalAccountNumber();
-    }
-
-    /**
-     * Create an instance of {@link AccountType.BankCode }
-     * 
-     */
-    public AccountType.BankCode createAccountTypeBankCode() {
-        return new AccountType.BankCode();
-    }
-
-    /**
-     * Create an instance of {@link AccountType.NationalBankCode }
-     * 
-     */
-    public AccountType.NationalBankCode createAccountTypeNationalBankCode() {
-        return new AccountType.NationalBankCode();
-    }
-
-    /**
-     * Create an instance of {@link 
DataTransferResponseType.DataEncryptionInfo }
-     * 
-     */
-    public DataTransferResponseType.DataEncryptionInfo 
createDataTransferResponseTypeDataEncryptionInfo() {
-        return new DataTransferResponseType.DataEncryptionInfo();
-    }
-
-    /**
-     * Create an instance of {@link DataTransferResponseType.SignatureData }
-     * 
-     */
-    public DataTransferResponseType.SignatureData 
createDataTransferResponseTypeSignatureData() {
-        return new DataTransferResponseType.SignatureData();
-    }
-
-    /**
-     * Create an instance of {@link DataTransferResponseType.OrderData }
-     * 
-     */
-    public DataTransferResponseType.OrderData 
createDataTransferResponseTypeOrderData() {
-        return new DataTransferResponseType.OrderData();
-    }
-
-    /**
-     * Create an instance of {@link 
DataEncryptionInfoType.EncryptionPubKeyDigest }
-     * 
-     */
-    public DataEncryptionInfoType.EncryptionPubKeyDigest 
createDataEncryptionInfoTypeEncryptionPubKeyDigest() {
-        return new DataEncryptionInfoType.EncryptionPubKeyDigest();
-    }
-
-    /**
-     * Create an instance of {@link AttributedAccountType.AccountNumber }
-     * 
-     */
-    public AttributedAccountType.AccountNumber 
createAttributedAccountTypeAccountNumber() {
-        return new AttributedAccountType.AccountNumber();
-    }
-
-    /**
-     * Create an instance of {@link 
AttributedAccountType.NationalAccountNumber }
-     * 
-     */
-    public AttributedAccountType.NationalAccountNumber 
createAttributedAccountTypeNationalAccountNumber() {
-        return new AttributedAccountType.NationalAccountNumber();
-    }
-
-    /**
-     * Create an instance of {@link AttributedAccountType.BankCode }
-     * 
-     */
-    public AttributedAccountType.BankCode 
createAttributedAccountTypeBankCode() {
-        return new AttributedAccountType.BankCode();
-    }
-
-    /**
-     * Create an instance of {@link AttributedAccountType.NationalBankCode }
-     * 
-     */
-    public AttributedAccountType.NationalBankCode 
createAttributedAccountTypeNationalBankCode() {
-        return new AttributedAccountType.NationalBankCode();
-    }
-
-    /**
-     * Create an instance of {@link AttributedAccountType.AccountHolder }
-     * 
-     */
-    public AttributedAccountType.AccountHolder 
createAttributedAccountTypeAccountHolder() {
-        return new AttributedAccountType.AccountHolder();
-    }
-
-    /**
-     * Create an instance of {@link UserInfoType.UserID }
-     * 
-     */
-    public UserInfoType.UserID createUserInfoTypeUserID() {
-        return new UserInfoType.UserID();
-    }
-
-    /**
-     * Create an instance of {@link HPDAccessParamsType.URL }
-     * 
-     */
-    public HPDAccessParamsType.URL createHPDAccessParamsTypeURL() {
-        return new HPDAccessParamsType.URL();
-    }
-
-    /**
-     * Create an instance of {@link HVZOrderDetailsType.TotalAmount }
-     * 
-     */
-    public HVZOrderDetailsType.TotalAmount 
createHVZOrderDetailsTypeTotalAmount() {
-        return new HVZOrderDetailsType.TotalAmount();
-    }
-
-    /**
-     * Create an instance of {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.AccountNumber }
-     * 
-     */
-    public HVZOrderDetailsType.FirstOrderInfo.AccountInfo.AccountNumber 
createHVZOrderDetailsTypeFirstOrderInfoAccountInfoAccountNumber() {
-        return new 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.AccountNumber();
-    }
-
-    /**
-     * Create an instance of {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalAccountNumber }
-     * 
-     */
-    public 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalAccountNumber 
createHVZOrderDetailsTypeFirstOrderInfoAccountInfoNationalAccountNumber() {
-        return new 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalAccountNumber();
-    }
-
-    /**
-     * Create an instance of {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.BankCode }
-     * 
-     */
-    public HVZOrderDetailsType.FirstOrderInfo.AccountInfo.BankCode 
createHVZOrderDetailsTypeFirstOrderInfoAccountInfoBankCode() {
-        return new HVZOrderDetailsType.FirstOrderInfo.AccountInfo.BankCode();
-    }
-
-    /**
-     * Create an instance of {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalBankCode }
-     * 
-     */
-    public HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalBankCode 
createHVZOrderDetailsTypeFirstOrderInfoAccountInfoNationalBankCode() {
-        return new 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalBankCode();
-    }
-
-    /**
-     * Create an instance of {@link PartnerInfoType.AccountInfo }
-     * 
-     */
-    public PartnerInfoType.AccountInfo createPartnerInfoTypeAccountInfo() {
-        return new PartnerInfoType.AccountInfo();
-    }
-
-    /**
-     * Create an instance of {@link HVTOrderInfoType.ExecutionDate }
-     * 
-     */
-    public HVTOrderInfoType.ExecutionDate 
createHVTOrderInfoTypeExecutionDate() {
-        return new HVTOrderInfoType.ExecutionDate();
-    }
-
-    /**
-     * Create an instance of {@link HVTOrderInfoType.Amount }
-     * 
-     */
-    public HVTOrderInfoType.Amount createHVTOrderInfoTypeAmount() {
-        return new HVTOrderInfoType.Amount();
-    }
-
-    /**
-     * Create an instance of {@link HVTOrderInfoType.Description }
-     * 
-     */
-    public HVTOrderInfoType.Description createHVTOrderInfoTypeDescription() {
-        return new HVTOrderInfoType.Description();
-    }
-
-    /**
-     * Create an instance of {@link DataTransferRequestType.DataEncryptionInfo 
}
-     * 
-     */
-    public DataTransferRequestType.DataEncryptionInfo 
createDataTransferRequestTypeDataEncryptionInfo() {
-        return new DataTransferRequestType.DataEncryptionInfo();
-    }
-
-    /**
-     * Create an instance of {@link DataTransferRequestType.SignatureData }
-     * 
-     */
-    public DataTransferRequestType.SignatureData 
createDataTransferRequestTypeSignatureData() {
-        return new DataTransferRequestType.SignatureData();
-    }
-
-    /**
-     * Create an instance of {@link DataTransferRequestType.OrderData }
-     * 
-     */
-    public DataTransferRequestType.OrderData 
createDataTransferRequestTypeOrderData() {
-        return new DataTransferRequestType.OrderData();
-    }
-
-    /**
-     * Create an instance of {@link SignerInfoType.Permission }
-     * 
-     */
-    public SignerInfoType.Permission createSignerInfoTypePermission() {
-        return new SignerInfoType.Permission();
-    }
-
-    /**
-     * Create an instance of {@link HPDProtocolParamsType.Recovery }
-     * 
-     */
-    public HPDProtocolParamsType.Recovery 
createHPDProtocolParamsTypeRecovery() {
-        return new HPDProtocolParamsType.Recovery();
-    }
-
-    /**
-     * Create an instance of {@link HPDProtocolParamsType.PreValidation }
-     * 
-     */
-    public HPDProtocolParamsType.PreValidation 
createHPDProtocolParamsTypePreValidation() {
-        return new HPDProtocolParamsType.PreValidation();
-    }
-
-    /**
-     * Create an instance of {@link HPDProtocolParamsType.X509Data }
-     * 
-     */
-    public HPDProtocolParamsType.X509Data 
createHPDProtocolParamsTypeX509Data() {
-        return new HPDProtocolParamsType.X509Data();
-    }
-
-    /**
-     * Create an instance of {@link HPDProtocolParamsType.ClientDataDownload }
-     * 
-     */
-    public HPDProtocolParamsType.ClientDataDownload 
createHPDProtocolParamsTypeClientDataDownload() {
-        return new HPDProtocolParamsType.ClientDataDownload();
-    }
-
-    /**
-     * Create an instance of {@link 
HPDProtocolParamsType.DownloadableOrderData }
-     * 
-     */
-    public HPDProtocolParamsType.DownloadableOrderData 
createHPDProtocolParamsTypeDownloadableOrderData() {
-        return new HPDProtocolParamsType.DownloadableOrderData();
-    }
-
-    /**
-     * Create an instance of {@link EbicsKeyManagementResponse.Body.ReturnCode 
}
-     * 
-     */
-    public EbicsKeyManagementResponse.Body.ReturnCode 
createEbicsKeyManagementResponseBodyReturnCode() {
-        return new EbicsKeyManagementResponse.Body.ReturnCode();
-    }
-
-    /**
-     * Create an instance of {@link 
EbicsKeyManagementResponse.Body.TimestampBankParameter }
-     * 
-     */
-    public EbicsKeyManagementResponse.Body.TimestampBankParameter 
createEbicsKeyManagementResponseBodyTimestampBankParameter() {
-        return new EbicsKeyManagementResponse.Body.TimestampBankParameter();
-    }
-
-    /**
-     * Create an instance of {@link 
EbicsKeyManagementResponse.Body.DataTransfer.DataEncryptionInfo }
-     * 
-     */
-    public EbicsKeyManagementResponse.Body.DataTransfer.DataEncryptionInfo 
createEbicsKeyManagementResponseBodyDataTransferDataEncryptionInfo() {
-        return new 
EbicsKeyManagementResponse.Body.DataTransfer.DataEncryptionInfo();
-    }
-
-    /**
-     * Create an instance of {@link 
EbicsKeyManagementResponse.Body.DataTransfer.OrderData }
-     * 
-     */
-    public EbicsKeyManagementResponse.Body.DataTransfer.OrderData 
createEbicsKeyManagementResponseBodyDataTransferOrderData() {
-        return new EbicsKeyManagementResponse.Body.DataTransfer.OrderData();
-    }
-
-    /**
-     * Create an instance of {@link EbicsKeyManagementResponse.Header.Static }
-     * 
-     */
-    public EbicsKeyManagementResponse.Header.Static 
createEbicsKeyManagementResponseHeaderStatic() {
-        return new EbicsKeyManagementResponse.Header.Static();
-    }
-
-    /**
-     * Create an instance of {@link 
BankSignatureDataSigBookType.OrderSignature }
-     * 
-     */
-    public BankSignatureDataSigBookType.OrderSignature 
createBankSignatureDataSigBookTypeOrderSignature() {
-        return new BankSignatureDataSigBookType.OrderSignature();
-    }
-
-    /**
-     * Create an instance of {@link StandardOrderParamsType.DateRange }
-     * 
-     */
-    public StandardOrderParamsType.DateRange 
createStandardOrderParamsTypeDateRange() {
-        return new StandardOrderParamsType.DateRange();
-    }
-
-    /**
-     * Create an instance of {@link FDLOrderParamsType.DateRange }
-     * 
-     */
-    public FDLOrderParamsType.DateRange createFDLOrderParamsTypeDateRange() {
-        return new FDLOrderParamsType.DateRange();
-    }
-
-    /**
-     * Create an instance of {@link HVTOrderParamsType.OrderFlags }
-     * 
-     */
-    public HVTOrderParamsType.OrderFlags createHVTOrderParamsTypeOrderFlags() {
-        return new HVTOrderParamsType.OrderFlags();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVTResponseOrderData }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HVTResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HVTResponseOrderData> 
createHVTResponseOrderData(HVTResponseOrderData value) {
-        return new 
JAXBElement<HVTResponseOrderData>(_HVTResponseOrderData_QNAME, 
HVTResponseOrderData.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"KeyInfo")
-    public JAXBElement<KeyInfoType> createKeyInfo(KeyInfoType value) {
-        return new JAXBElement<KeyInfoType>(_KeyInfo_QNAME, KeyInfoType.class, 
null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HPBResponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HPBResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HPBResponseOrderDataType> 
createHPBResponseOrderData(HPBResponseOrderDataType value) {
-        return new 
JAXBElement<HPBResponseOrderDataType>(_HPBResponseOrderData_QNAME, 
HPBResponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
GenericOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"GenericOrderParams", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "OrderParams")
-    public JAXBElement<GenericOrderParamsType> 
createGenericOrderParams(GenericOrderParamsType value) {
-        return new 
JAXBElement<GenericOrderParamsType>(_GenericOrderParams_QNAME, 
GenericOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HSARequestOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HSARequestOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HSARequestOrderDataType> 
createHSARequestOrderData(HSARequestOrderDataType value) {
-        return new 
JAXBElement<HSARequestOrderDataType>(_HSARequestOrderData_QNAME, 
HSARequestOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Object 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"EBICSSignatureData")
-    public JAXBElement<Object> createebicsSignatureDataAtEbicsOrders(Object 
value) {
-        return new JAXBElement<Object>(_ebicsSignatureDataAtEbicsOrders_QNAME, 
Object.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVDResponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HVDResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HVDResponseOrderDataType> 
createHVDResponseOrderData(HVDResponseOrderDataType value) {
-        return new 
JAXBElement<HVDResponseOrderDataType>(_HVDResponseOrderData_QNAME, 
HVDResponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HCARequestOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HCARequestOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HCARequestOrderDataType> 
createHCARequestOrderData(HCARequestOrderDataType value) {
-        return new 
JAXBElement<HCARequestOrderDataType>(_HCARequestOrderData_QNAME, 
HCARequestOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
SignaturePropertyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"SignatureProperty")
-    public JAXBElement<SignaturePropertyType> 
createSignatureProperty(SignaturePropertyType value) {
-        return new 
JAXBElement<SignaturePropertyType>(_SignatureProperty_QNAME, 
SignaturePropertyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVEOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "HVEOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<HVEOrderParamsType> 
createHVEOrderParams(HVEOrderParamsType value) {
-        return new JAXBElement<HVEOrderParamsType>(_HVEOrderParams_QNAME, 
HVEOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Object 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "EBICSOrderData")
-    public JAXBElement<Object> createEBICSOrderData(Object value) {
-        return new JAXBElement<Object>(_EBICSOrderData_QNAME, Object.class, 
null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
RSAKeyValueType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"RSAKeyValue")
-    public JAXBElement<RSAKeyValueType> createRSAKeyValue(RSAKeyValueType 
value) {
-        return new JAXBElement<RSAKeyValueType>(_RSAKeyValue_QNAME, 
RSAKeyValueType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HCSRequestOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HCSRequestOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HCSRequestOrderDataType> 
createHCSRequestOrderData(HCSRequestOrderDataType value) {
-        return new 
JAXBElement<HCSRequestOrderDataType>(_HCSRequestOrderData_QNAME, 
HCSRequestOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVSOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "HVSOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<HVSOrderParamsType> 
createHVSOrderParams(HVSOrderParamsType value) {
-        return new JAXBElement<HVSOrderParamsType>(_HVSOrderParams_QNAME, 
HVSOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
SignatureMethodType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"SignatureMethod")
-    public JAXBElement<SignatureMethodType> 
createSignatureMethod(SignatureMethodType value) {
-        return new JAXBElement<SignatureMethodType>(_SignatureMethod_QNAME, 
SignatureMethodType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"Object")
-    public JAXBElement<ObjectType> createObject(ObjectType value) {
-        return new JAXBElement<ObjectType>(_Object_QNAME, ObjectType.class, 
null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
BankSignatureDataSigBookType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"BankSignatureData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSSignatureData")
-    public JAXBElement<BankSignatureDataSigBookType> 
createBankSignatureData(BankSignatureDataSigBookType value) {
-        return new 
JAXBElement<BankSignatureDataSigBookType>(_BankSignatureData_QNAME, 
BankSignatureDataSigBookType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
FDLOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "FDLOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<FDLOrderParamsType> 
createFDLOrderParams(FDLOrderParamsType value) {
-        return new JAXBElement<FDLOrderParamsType>(_FDLOrderParams_QNAME, 
FDLOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"PGPData")
-    public JAXBElement<PGPDataType> createPGPData(PGPDataType value) {
-        return new JAXBElement<PGPDataType>(_PGPData_QNAME, PGPDataType.class, 
null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
RetrievalMethodType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"RetrievalMethod")
-    public JAXBElement<RetrievalMethodType> 
createRetrievalMethod(RetrievalMethodType value) {
-        return new JAXBElement<RetrievalMethodType>(_RetrievalMethod_QNAME, 
RetrievalMethodType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
SignaturePubKeyOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.ebics.org/S001";, name = 
"SignaturePubKeyOrderData")
-    public JAXBElement<SignaturePubKeyOrderDataType> 
createSignaturePubKeyOrderData(SignaturePubKeyOrderDataType value) {
-        return new 
JAXBElement<SignaturePubKeyOrderDataType>(_SignaturePubKeyOrderData_QNAME, 
SignaturePubKeyOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
DSAKeyValueType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"DSAKeyValue")
-    public JAXBElement<DSAKeyValueType> createDSAKeyValue(DSAKeyValueType 
value) {
-        return new JAXBElement<DSAKeyValueType>(_DSAKeyValue_QNAME, 
DSAKeyValueType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVSRequestOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HVSRequestOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HVSRequestOrderDataType> 
createHVSRequestOrderData(HVSRequestOrderDataType value) {
-        return new 
JAXBElement<HVSRequestOrderDataType>(_HVSRequestOrderData_QNAME, 
HVSRequestOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
OrderSignatureDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.ebics.org/S001";, name = 
"OrderSignatureData")
-    public JAXBElement<OrderSignatureDataType> 
createOrderSignatureData(OrderSignatureDataType value) {
-        return new 
JAXBElement<OrderSignatureDataType>(_OrderSignatureData_QNAME, 
OrderSignatureDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
H3KRequestOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"H3KRequestOrderData")
-    public JAXBElement<H3KRequestOrderDataType> 
createH3KRequestOrderData(H3KRequestOrderDataType value) {
-        return new 
JAXBElement<H3KRequestOrderDataType>(_H3KRequestOrderData_QNAME, 
H3KRequestOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HTDReponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HTDResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HTDReponseOrderDataType> 
createHTDResponseOrderData(HTDReponseOrderDataType value) {
-        return new 
JAXBElement<HTDReponseOrderDataType>(_HTDResponseOrderData_QNAME, 
HTDReponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SPKIDataType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"SPKIData")
-    public JAXBElement<SPKIDataType> createSPKIData(SPKIDataType value) {
-        return new JAXBElement<SPKIDataType>(_SPKIData_QNAME, 
SPKIDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HIARequestOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HIARequestOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HIARequestOrderDataType> 
createHIARequestOrderData(HIARequestOrderDataType value) {
-        return new 
JAXBElement<HIARequestOrderDataType>(_HIARequestOrderData_QNAME, 
HIARequestOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVZResponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HVZResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HVZResponseOrderDataType> 
createHVZResponseOrderData(HVZResponseOrderDataType value) {
-        return new 
JAXBElement<HVZResponseOrderDataType>(_HVZResponseOrderData_QNAME, 
HVZResponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
SignatureValueType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"SignatureValue")
-    public JAXBElement<SignatureValueType> 
createSignatureValue(SignatureValueType value) {
-        return new JAXBElement<SignatureValueType>(_SignatureValue_QNAME, 
SignatureValueType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
UserSignatureDataSigBookType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.ebics.org/S001";, name = 
"UserSignatureData", substitutionHeadNamespace = "http://www.ebics.org/S001";, 
substitutionHeadName = "EBICSSignatureData")
-    public JAXBElement<UserSignatureDataSigBookType> 
createUserSignatureData(UserSignatureDataSigBookType value) {
-        return new 
JAXBElement<UserSignatureDataSigBookType>(_UserSignatureData_QNAME, 
UserSignatureDataSigBookType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Object 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "OrderParams")
-    public JAXBElement<Object> createOrderParams(Object value) {
-        return new JAXBElement<Object>(_OrderParams_QNAME, Object.class, null, 
value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"KeyValue")
-    public JAXBElement<KeyValueType> createKeyValue(KeyValueType value) {
-        return new JAXBElement<KeyValueType>(_KeyValue_QNAME, 
KeyValueType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
TransformsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"Transforms")
-    public JAXBElement<TransformsType> createTransforms(TransformsType value) {
-        return new JAXBElement<TransformsType>(_Transforms_QNAME, 
TransformsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVUResponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HVUResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HVUResponseOrderDataType> 
createHVUResponseOrderData(HVUResponseOrderDataType value) {
-        return new 
JAXBElement<HVUResponseOrderDataType>(_HVUResponseOrderData_QNAME, 
HVUResponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
SignaturePubKeyInfoType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.ebics.org/S001";, name = 
"SignaturePubKeyInfo")
-    public JAXBElement<SignaturePubKeyInfoType> 
createSignaturePubKeyInfo(SignaturePubKeyInfoType value) {
-        return new 
JAXBElement<SignaturePubKeyInfoType>(_SignaturePubKeyInfo_QNAME, 
SignaturePubKeyInfoType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVUOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "HVUOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<HVUOrderParamsType> 
createHVUOrderParams(HVUOrderParamsType value) {
-        return new JAXBElement<HVUOrderParamsType>(_HVUOrderParams_QNAME, 
HVUOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
DigestMethodType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"DigestMethod")
-    public JAXBElement<DigestMethodType> createDigestMethod(DigestMethodType 
value) {
-        return new JAXBElement<DigestMethodType>(_DigestMethod_QNAME, 
DigestMethodType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"X509Data")
-    public JAXBElement<X509DataType> createX509Data(X509DataType value) {
-        return new JAXBElement<X509DataType>(_X509Data_QNAME, 
X509DataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "AuthSignature")
-    public JAXBElement<SignatureType> createAuthSignature(SignatureType value) 
{
-        return new JAXBElement<SignatureType>(_AuthSignature_QNAME, 
SignatureType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"KeyName")
-    public JAXBElement<String> createKeyName(String value) {
-        return new JAXBElement<String>(_KeyName_QNAME, String.class, null, 
value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"Signature")
-    public JAXBElement<SignatureType> createSignature(SignatureType value) {
-        return new JAXBElement<SignatureType>(_Signature_QNAME, 
SignatureType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"MgmtData")
-    public JAXBElement<String> createMgmtData(String value) {
-        return new JAXBElement<String>(_MgmtData_QNAME, String.class, null, 
value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HAAResponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HAAResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HAAResponseOrderDataType> 
createHAAResponseOrderData(HAAResponseOrderDataType value) {
-        return new 
JAXBElement<HAAResponseOrderDataType>(_HAAResponseOrderData_QNAME, 
HAAResponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVZOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "HVZOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<HVZOrderParamsType> 
createHVZOrderParams(HVZOrderParamsType value) {
-        return new JAXBElement<HVZOrderParamsType>(_HVZOrderParams_QNAME, 
HVZOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
SignaturePropertiesType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"SignatureProperties")
-    public JAXBElement<SignaturePropertiesType> 
createSignatureProperties(SignaturePropertiesType value) {
-        return new 
JAXBElement<SignaturePropertiesType>(_SignatureProperties_QNAME, 
SignaturePropertiesType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HPDResponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HPDResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HPDResponseOrderDataType> 
createHPDResponseOrderData(HPDResponseOrderDataType value) {
-        return new 
JAXBElement<HPDResponseOrderDataType>(_HPDResponseOrderData_QNAME, 
HPDResponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
FULOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "FULOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<FULOrderParamsType> 
createFULOrderParams(FULOrderParamsType value) {
-        return new JAXBElement<FULOrderParamsType>(_FULOrderParams_QNAME, 
FULOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TransformType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"Transform")
-    public JAXBElement<TransformType> createTransform(TransformType value) {
-        return new JAXBElement<TransformType>(_Transform_QNAME, 
TransformType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HKDResponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HKDResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HKDResponseOrderDataType> 
createHKDResponseOrderData(HKDResponseOrderDataType value) {
-        return new 
JAXBElement<HKDResponseOrderDataType>(_HKDResponseOrderData_QNAME, 
HKDResponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVDOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "HVDOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<HVDOrderParamsType> 
createHVDOrderParams(HVDOrderParamsType value) {
-        return new JAXBElement<HVDOrderParamsType>(_HVDOrderParams_QNAME, 
HVDOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
StandardOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"StandardOrderParams", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "OrderParams")
-    public JAXBElement<StandardOrderParamsType> 
createStandardOrderParams(StandardOrderParamsType value) {
-        return new 
JAXBElement<StandardOrderParamsType>(_StandardOrderParams_QNAME, 
StandardOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"Reference")
-    public JAXBElement<ReferenceType> createReference(ReferenceType value) {
-        return new JAXBElement<ReferenceType>(_Reference_QNAME, 
ReferenceType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code 
>}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"DigestValue")
-    public JAXBElement<byte[]> createDigestValue(byte[] value) {
-        return new JAXBElement<byte[]>(_DigestValue_QNAME, byte[].class, null, 
((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVTOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "HVTOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<HVTOrderParamsType> 
createHVTOrderParams(HVTOrderParamsType value) {
-        return new JAXBElement<HVTOrderParamsType>(_HVTOrderParams_QNAME, 
HVTOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
CanonicalizationMethodType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"CanonicalizationMethod")
-    public JAXBElement<CanonicalizationMethodType> 
createCanonicalizationMethod(CanonicalizationMethodType value) {
-        return new 
JAXBElement<CanonicalizationMethodType>(_CanonicalizationMethod_QNAME, 
CanonicalizationMethodType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
SignedInfoType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"SignedInfo")
-    public JAXBElement<SignedInfoType> createSignedInfo(SignedInfoType value) {
-        return new JAXBElement<SignedInfoType>(_SignedInfo_QNAME, 
SignedInfoType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Object 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.ebics.org/S001";, name = 
"EBICSSignatureData")
-    public JAXBElement<Object> 
createebicsSignatureDataAtEbicsSignatures(Object value) {
-        return new 
JAXBElement<Object>(_ebicsSignatureDataAtEbicsSignatures_QNAME, Object.class, 
null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"Manifest")
-    public JAXBElement<ManifestType> createManifest(ManifestType value) {
-        return new JAXBElement<ManifestType>(_Manifest_QNAME, 
ManifestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code 
>}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"PGPKeyID", scope = PGPDataType.class)
-    public JAXBElement<byte[]> createPGPDataTypePGPKeyID(byte[] value) {
-        return new JAXBElement<byte[]>(_PGPDataTypePGPKeyID_QNAME, 
byte[].class, PGPDataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code 
>}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"PGPKeyPacket", scope = PGPDataType.class)
-    public JAXBElement<byte[]> createPGPDataTypePGPKeyPacket(byte[] value) {
-        return new JAXBElement<byte[]>(_PGPDataTypePGPKeyPacket_QNAME, 
byte[].class, PGPDataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
X509IssuerSerialType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"X509IssuerSerial", scope = X509DataType.class)
-    public JAXBElement<X509IssuerSerialType> 
createX509DataTypeX509IssuerSerial(X509IssuerSerialType value) {
-        return new 
JAXBElement<X509IssuerSerialType>(_X509DataTypeX509IssuerSerial_QNAME, 
X509IssuerSerialType.class, X509DataType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code 
>}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"X509CRL", scope = X509DataType.class)
-    public JAXBElement<byte[]> createX509DataTypeX509CRL(byte[] value) {
-        return new JAXBElement<byte[]>(_X509DataTypeX509CRL_QNAME, 
byte[].class, X509DataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"X509SubjectName", scope = X509DataType.class)
-    public JAXBElement<String> createX509DataTypeX509SubjectName(String value) 
{
-        return new JAXBElement<String>(_X509DataTypeX509SubjectName_QNAME, 
String.class, X509DataType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code 
>}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"X509SKI", scope = X509DataType.class)
-    public JAXBElement<byte[]> createX509DataTypeX509SKI(byte[] value) {
-        return new JAXBElement<byte[]>(_X509DataTypeX509SKI_QNAME, 
byte[].class, X509DataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code 
>}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"X509Certificate", scope = X509DataType.class)
-    public JAXBElement<byte[]> createX509DataTypeX509Certificate(byte[] value) 
{
-        return new JAXBElement<byte[]>(_X509DataTypeX509Certificate_QNAME, 
byte[].class, X509DataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"HMACOutputLength", scope = SignatureMethodType.class)
-    public JAXBElement<BigInteger> 
createSignatureMethodTypeHMACOutputLength(BigInteger value) {
-        return new 
JAXBElement<BigInteger>(_SignatureMethodTypeHMACOutputLength_QNAME, 
BigInteger.class, SignatureMethodType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"XPath", scope = TransformType.class)
-    public JAXBElement<String> createTransformTypeXPath(String value) {
-        return new JAXBElement<String>(_TransformTypeXPath_QNAME, 
String.class, TransformType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code 
>}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"SPKISexp", scope = SPKIDataType.class)
-    public JAXBElement<byte[]> createSPKIDataTypeSPKISexp(byte[] value) {
-        return new JAXBElement<byte[]>(_SPKIDataTypeSPKISexp_QNAME, 
byte[].class, SPKIDataType.class, ((byte[]) value));
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/ObjectType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/ObjectType.java
deleted file mode 100644
index d9ab60c..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/ObjectType.java
+++ /dev/null
@@ -1,171 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for ObjectType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="ObjectType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence maxOccurs="unbounded" minOccurs="0">
- *         &lt;any processContents='lax'/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *       &lt;attribute name="MimeType" 
type="{http://www.w3.org/2001/XMLSchema}string"; />
- *       &lt;attribute name="Encoding" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ObjectType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class ObjectType {
-
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-    @XmlAttribute(name = "MimeType")
-    protected String mimeType;
-    @XmlAttribute(name = "Encoding")
-    @XmlSchemaType(name = "anyURI")
-    protected String encoding;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the mimeType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMimeType() {
-        return mimeType;
-    }
-
-    /**
-     * Sets the value of the mimeType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMimeType(String value) {
-        this.mimeType = value;
-    }
-
-    /**
-     * Gets the value of the encoding property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getEncoding() {
-        return encoding;
-    }
-
-    /**
-     * Sets the value of the encoding property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setEncoding(String value) {
-        this.encoding = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/OrderAttributeType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/OrderAttributeType.java
deleted file mode 100644
index d49bbf8..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/OrderAttributeType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for OrderAttributeType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="OrderAttributeType">
- *   &lt;restriction base="{urn:org:ebics:H004}OrderAttributeBaseType">
- *     &lt;enumeration value="OZHNN"/>
- *     &lt;enumeration value="UZHNN"/>
- *     &lt;enumeration value="DZHNN"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "OrderAttributeType")
-@XmlEnum
-public enum OrderAttributeType {
-
-
-    /**
-     * Auftragsdaten mit Unterschrift, ZIP-komprimiert, hybrid verschlüsselt
-     * 
-     */
-    OZHNN,
-
-    /**
-     * Unterschrift, ZIP-komprimiert, hybrid verschlüsselt
-     * 
-     */
-    UZHNN,
-
-    /**
-     * Auftragsdaten ohne Unterschrift, ZIP-komprimiert, hybrid verschlüsselt
-     * 
-     */
-    DZHNN;
-
-    public String value() {
-        return name();
-    }
-
-    public static OrderAttributeType fromValue(String v) {
-        return valueOf(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/OrderSignatureDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/OrderSignatureDataType.java
deleted file mode 100644
index 555eec4..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/OrderSignatureDataType.java
+++ /dev/null
@@ -1,190 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Data type according for a digital signature (either autorising an order or 
applied for transportation), structured format.
- * 
- * <p>Java class for OrderSignatureDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="OrderSignatureDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="SignatureVersion" 
type="{http://www.ebics.org/S001}SignatureVersionType"/>
- *         &lt;element name="SignatureValue" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         &lt;element name="PartnerID" 
type="{http://www.ebics.org/S001}PartnerIDType"/>
- *         &lt;element name="UserID" 
type="{http://www.ebics.org/S001}UserIDType"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"; 
minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OrderSignatureDataType", namespace = 
"http://www.ebics.org/S001";, propOrder = {
-    "signatureVersion",
-    "signatureValue",
-    "partnerID",
-    "userID",
-    "x509Data"
-})
-public class OrderSignatureDataType {
-
-    @XmlElement(name = "SignatureVersion", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String signatureVersion;
-    @XmlElement(name = "SignatureValue", required = true)
-    protected byte[] signatureValue;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlElement(name = "X509Data", namespace = 
"http://www.w3.org/2000/09/xmldsig#";)
-    protected X509DataType x509Data;
-
-    /**
-     * Gets the value of the signatureVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSignatureVersion() {
-        return signatureVersion;
-    }
-
-    /**
-     * Sets the value of the signatureVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSignatureVersion(String value) {
-        this.signatureVersion = value;
-    }
-
-    /**
-     * Gets the value of the signatureValue property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getSignatureValue() {
-        return signatureValue;
-    }
-
-    /**
-     * Sets the value of the signatureValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setSignatureValue(byte[] value) {
-        this.signatureValue = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Parameter for X509Data
-     * 
-     * @return
-     *     possible object is
-     *     {@link X509DataType }
-     *     
-     */
-    public X509DataType getX509Data() {
-        return x509Data;
-    }
-
-    /**
-     * Sets the value of the x509Data property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link X509DataType }
-     *     
-     */
-    public void setX509Data(X509DataType value) {
-        this.x509Data = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/OrderTType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/OrderTType.java
deleted file mode 100644
index 7aadbab..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/OrderTType.java
+++ /dev/null
@@ -1,723 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for OrderTType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="OrderTType">
- *   &lt;restriction base="{urn:org:ebics:H004}OrderTBaseType">
- *     &lt;length value="3"/>
- *     &lt;enumeration value="HSA"/>
- *     &lt;enumeration value="HIA"/>
- *     &lt;enumeration value="HPB"/>
- *     &lt;enumeration value="HCA"/>
- *     &lt;enumeration value="HPD"/>
- *     &lt;enumeration value="HVU"/>
- *     &lt;enumeration value="HVD"/>
- *     &lt;enumeration value="HVT"/>
- *     &lt;enumeration value="HVE"/>
- *     &lt;enumeration value="HVS"/>
- *     &lt;enumeration value="HKD"/>
- *     &lt;enumeration value="HAA"/>
- *     &lt;enumeration value="HVU"/>
- *     &lt;enumeration value="HVD"/>
- *     &lt;enumeration value="HVT"/>
- *     &lt;enumeration value="HVE"/>
- *     &lt;enumeration value="HVS"/>
- *     &lt;enumeration value="AAE"/>
- *     &lt;enumeration value="AEA"/>
- *     &lt;enumeration value="AIA"/>
- *     &lt;enumeration value="AKA"/>
- *     &lt;enumeration value="AWV"/>
- *     &lt;enumeration value="AZM"/>
- *     &lt;enumeration value="AZV"/>
- *     &lt;enumeration value="AZ2"/>
- *     &lt;enumeration value="AZ4"/>
- *     &lt;enumeration value="DDG"/>
- *     &lt;enumeration value="DHB"/>
- *     &lt;enumeration value="DTE"/>
- *     &lt;enumeration value="DTI"/>
- *     &lt;enumeration value="DTM"/>
- *     &lt;enumeration value="DTV"/>
- *     &lt;enumeration value="DT2"/>
- *     &lt;enumeration value="DT4"/>
- *     &lt;enumeration value="EAB"/>
- *     &lt;enumeration value="ECS"/>
- *     &lt;enumeration value="EDC"/>
- *     &lt;enumeration value="EEA"/>
- *     &lt;enumeration value="EEZ"/>
- *     &lt;enumeration value="EIB"/>
- *     &lt;enumeration value="EIK"/>
- *     &lt;enumeration value="ESA"/>
- *     &lt;enumeration value="ESM"/>
- *     &lt;enumeration value="ESR"/>
- *     &lt;enumeration value="ESZ"/>
- *     &lt;enumeration value="ESU"/>
- *     &lt;enumeration value="EUE"/>
- *     &lt;enumeration value="GAB"/>
- *     &lt;enumeration value="GAK"/>
- *     &lt;enumeration value="GKT"/>
- *     &lt;enumeration value="IDD"/>
- *     &lt;enumeration value="IIB"/>
- *     &lt;enumeration value="IIK"/>
- *     &lt;enumeration value="INT"/>
- *     &lt;enumeration value="IZG"/>
- *     &lt;enumeration value="IZL"/>
- *     &lt;enumeration value="IZV"/>
- *     &lt;enumeration value="MAO"/>
- *     &lt;enumeration value="MCV"/>
- *     &lt;enumeration value="MC2"/>
- *     &lt;enumeration value="MC4"/>
- *     &lt;enumeration value="POZ"/>
- *     &lt;enumeration value="RDT"/>
- *     &lt;enumeration value="RFT"/>
- *     &lt;enumeration value="STA"/>
- *     &lt;enumeration value="VMK"/>
- *     &lt;enumeration value="WPA"/>
- *     &lt;enumeration value="WPB"/>
- *     &lt;enumeration value="WPC"/>
- *     &lt;enumeration value="WPD"/>
- *     &lt;enumeration value="INI"/>
- *     &lt;enumeration value="PTK"/>
- *     &lt;enumeration value="PUB"/>
- *     &lt;enumeration value="HCA"/>
- *     &lt;enumeration value="SPR"/>
- *     &lt;enumeration value="VPB"/>
- *     &lt;enumeration value="FIN"/>
- *     &lt;enumeration value="IZS"/>
- *     &lt;enumeration value="SSP"/>
- *     &lt;enumeration value="ATA"/>
- *     &lt;enumeration value="BKA"/>
- *     &lt;enumeration value="BZK"/>
- *     &lt;enumeration value="DKI"/>
- *     &lt;enumeration value="DMI"/>
- *     &lt;enumeration value="DSW"/>
- *     &lt;enumeration value="ESG"/>
- *     &lt;enumeration value="ESP"/>
- *     &lt;enumeration value="FTB"/>
- *     &lt;enumeration value="FTD"/>
- *     &lt;enumeration value="IBK"/>
- *     &lt;enumeration value="IBW"/>
- *     &lt;enumeration value="IBU"/>
- *     &lt;enumeration value="IKK"/>
- *     &lt;enumeration value="IKU"/>
- *     &lt;enumeration value="IKW"/>
- *     &lt;enumeration value="KTH"/>
- *     &lt;enumeration value="KTR"/>
- *     &lt;enumeration value="KKZ"/>
- *     &lt;enumeration value="TST"/>
- *     &lt;enumeration value="UPD"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "OrderTType")
-@XmlEnum
-public enum OrderTType {
-
-
-    /**
-     * Senden der Public Keys für Authentifikation und Verschlüsselung, 
bankfachlich signiert mit FTAM-Signaturschlüssel
-     * 
-     */
-    HSA("HSA"),
-
-    /**
-     * Senden der Public Keys zur Authentifikation und zur Verschlüsselung
-     * 
-     */
-    HIA("HIA"),
-
-    /**
-     * Abholen der Public Keys der Bank
-     * 
-     */
-    HPB("HPB"),
-
-    /**
-     * Ändern der Public Keys zur Authentifikation und zur Verschlüsselung
-     * 
-     */
-    HCA("HCA"),
-
-    /**
-     * Abholen Bankparameter für internetbasierten Standard
-     * 
-     */
-    HPD("HPD"),
-
-    /**
-     * Abholen VEU Übersicht
-     * 
-     */
-    HVU("HVU"),
-
-    /**
-     * Abholen VEU Auftragsdaten (Daten-trägerbegleitzettel)
-     * 
-     */
-    HVD("HVD"),
-
-    /**
-     * Abholen VEU Auftragsdaten ( Transakti-onsdetails gemäß Parametervorgabe)
-     * 
-     */
-    HVT("HVT"),
-
-    /**
-     * Senden EU zu bestehendem VEU-Auftrag
-     * 
-     */
-    HVE("HVE"),
-
-    /**
-     * Senden Stornierung für bestehenden VEU-Auftrag
-     * 
-     */
-    HVS("HVS"),
-
-    /**
-     * Abholen Konfigurationsdaten des Teilnehmers
-     * 
-     */
-    HKD("HKD"),
-
-    /**
-     * Abholen Übersicht zu abrufbaren Aufträgen
-     * 
-     */
-    HAA("HAA"),
-
-    /**
-     * Senden Importakkreditiv Änderung
-     * 
-     */
-    AAE("AAE"),
-
-    /**
-     * Senden Exportakkreditive
-     * 
-     */
-    AEA("AEA"),
-
-    /**
-     * Senden Import-Akkreditive Avisierung
-     * 
-     */
-    AIA("AIA"),
-
-    /**
-     * Abholen Import-Akkreditive
-     * 
-     */
-    AKA("AKA"),
-
-    /**
-     * AWV-Meldung senden
-     * 
-     */
-    AWV("AWV"),
-
-    /**
-     * AZV im Magnetbandformat senden (Satzlänge variabel)
-     * 
-     */
-    AZM("AZM"),
-
-    /**
-     * AZV im Diskettenformat senden
-     * 
-     */
-    AZV("AZV"),
-
-    /**
-     * AZV im Magnetbandformat senden (Satzlängenfeld 2 Bytes)
-     * 
-     */
-    @XmlEnumValue("AZ2")
-    AZ_2("AZ2"),
-
-    /**
-     * AZV im Magnetbandformat senden (Satzlängenfeld 4 Bytes)
-     * 
-     */
-    @XmlEnumValue("AZ4")
-    AZ_4("AZ4"),
-
-    /**
-     * Abholen Devisenhandelsbestätigung
-     * 
-     */
-    DDG("DDG"),
-
-    /**
-     * Senden Devisenhandelsbestätigung
-     * 
-     */
-    DHB("DHB"),
-
-    /**
-     * Eilauftrag (IZV im DTAUS0-Format) senden
-     * 
-     */
-    DTE("DTE"),
-
-    /**
-     * IZV-Datei abholen
-     * 
-     */
-    DTI("DTI"),
-
-    /**
-     * MCV-Datei abholen (Format analog MCV)
-     * 
-     */
-    DTM("DTM"),
-
-    /**
-     * Zahlungsverkehrsdateien von Service-Rechenzentren senden
-     * 
-     */
-    DTV("DTV"),
-
-    /**
-     * MC2-Datei abholen (Format analog MC2)
-     * 
-     */
-    @XmlEnumValue("DT2")
-    DT_2("DT2"),
-
-    /**
-     * MC4-Datei abholen (Format analog MC4)
-     * 
-     */
-    @XmlEnumValue("DT4")
-    DT_4("DT4"),
-
-    /**
-     * Exportakkreditive abholen
-     * 
-     */
-    EAB("EAB"),
-
-    /**
-     * Senden electronic-cash Lastschriftdatei
-     * 
-     */
-    ECS("ECS"),
-
-    /**
-     * Senden Maestro-Lastschriftdatei
-     * 
-     */
-    EDC("EDC"),
-
-    /**
-     * EDIFACT abholen ASCII
-     * 
-     */
-    EEA("EEA"),
-
-    /**
-     * EDIFACT abholen EBCDIC
-     * 
-     */
-    EEZ("EEZ"),
-
-    /**
-     * Ausführungsanzeige (Exportinkasso) Bank an Kunde abholen
-     * 
-     */
-    EIB("EIB"),
-
-    /**
-     * Senden Exportinkassi
-     * 
-     */
-    EIK("EIK"),
-
-    /**
-     * EDIFACT senden ASCII
-     * 
-     */
-    ESA("ESA"),
-
-    /**
-     * EU-Standardüberweisung (Zahlungsart 13) im Magnetbandformat 
(Satzlängenfeld 4 Bytes)
-     * 
-     */
-    ESM("ESM"),
-
-    /**
-     * Einreichung von EDIFACT-Lastschriften
-     * 
-     */
-    ESR("ESR"),
-
-    /**
-     * EDIFACT senden EBCDIC
-     * 
-     */
-    ESZ("ESZ"),
-
-    /**
-     * EU-Standardüberweisung (Zahlungsart 13)
-     * 
-     */
-    ESU("ESU"),
-
-    /**
-     * Taggleiche grenzüberschreitende Euro-Eilzahlung
-     * 
-     */
-    EUE("EUE"),
-
-    /**
-     * Abholen Garantien
-     * 
-     */
-    GAB("GAB"),
-
-    /**
-     * Senden Garantien
-     * 
-     */
-    GAK("GAK"),
-
-    /**
-     * GeldKarte-Umsatz senden (Datenaufbau gemäß GeldKarte-Spezifikation)
-     * 
-     */
-    GKT("GKT"),
-
-    /**
-     * Internationale Lastschriften
-     * 
-     */
-    IDD("IDD"),
-
-    /**
-     * Abholen Importinkassi
-     * 
-     */
-    IIB("IIB"),
-
-    /**
-     * Senden Importinkassi
-     * 
-     */
-    IIK("IIK"),
-
-    /**
-     * Internationaler Zahlungsverkehr
-     * 
-     */
-    INT("INT"),
-
-    /**
-     * Inlandszahlungsverkehrsauftrag senden (nur Gutschriften)
-     * 
-     */
-    IZG("IZG"),
-
-    /**
-     * Inlandszahlungsverkehrsauftrag senden (nur Lastschriften)
-     * 
-     */
-    IZL("IZL"),
-
-    /**
-     * Inlandszahlungsverkehrsauftrag senden
-     * 
-     */
-    IZV("IZV"),
-
-    /**
-     * Abholen Magnetband-Datei aus optischer Beleglesung
-     * 
-     */
-    MAO("MAO"),
-
-    /**
-     * Senden IZV-Magnetbandformat (Satzlängenfeld 4 Bytes)
-     * 
-     */
-    MCV("MCV"),
-
-    /**
-     * Senden IZV-Magnetbandformat (Satzlängenfeld 2 Bytes)
-     * 
-     */
-    @XmlEnumValue("MC2")
-    MC_2("MC2"),
-
-    /**
-     * Senden IZV-Magnetbandformat (Satzlänge variabel)
-     * 
-     */
-    @XmlEnumValue("MC4")
-    MC_4("MC4"),
-
-    /**
-     * Senden POZ-Datei
-     * 
-     */
-    POZ("POZ"),
-
-    /**
-     * Rücklastschrift an Kunde
-     * 
-     */
-    RDT("RDT"),
-
-    /**
-     * Request for Transfer
-     * 
-     */
-    RFT("RFT"),
-
-    /**
-     * Abholen Swift-Tagesauszüge
-     * 
-     */
-    STA("STA"),
-
-    /**
-     * Abholen kurzfristige Vormerkposten
-     * 
-     */
-    VMK("VMK"),
-
-    /**
-     * Abholen Wertpapierabrechnung
-     * 
-     */
-    WPA("WPA"),
-
-    /**
-     * Abholen Wertpapierausführungsanzeige
-     * 
-     */
-    WPB("WPB"),
-
-    /**
-     * Abholen Depotaufstellung
-     * 
-     */
-    WPC("WPC"),
-
-    /**
-     * Abholen sonstige WP-Umsätze
-     * 
-     */
-    WPD("WPD"),
-
-    /**
-     * Initialisierung der bankfachlichen EU des Teilnehmers.
-     * 
-     */
-    INI("INI"),
-
-    /**
-     * Abholen Kundenprotokoll
-     * 
-     */
-    PTK("PTK"),
-
-    /**
-     * Senden Public Key zur Unterschriftenverifizierung
-     * 
-     */
-    PUB("PUB"),
-
-    /**
-     * Sperren der Zugangsberechtigung
-     * 
-     */
-    SPR("SPR"),
-
-    /**
-     * Abholen Public Key der Bank zur Verschlüsselung
-     * 
-     */
-    VPB("VPB"),
-
-    /**
-     * EDIFACT-FINPAY senden
-     * 
-     */
-    FIN("FIN"),
-
-    /**
-     * Informationen von Zentralstellen
-     * 
-     */
-    IZS("IZS"),
-
-    /**
-     * ec-Karten-Sperrdatei
-     * 
-     */
-    SSP("SSP"),
-
-    /**
-     * Teilausnutzung Importakkreditiv (Kreditinstitut an Kunde)
-     * 
-     */
-    ATA("ATA"),
-
-    /**
-     * Auftragsart für elektronische Kontoauszüge
-     * 
-     */
-    BKA("BKA"),
-
-    /**
-     * Barzahlungskarte
-     * 
-     */
-    BZK("BZK"),
-
-    /**
-     * Devisenkursinformationen abholen (Euro)
-     * 
-     */
-    DKI("DKI"),
-
-    /**
-     * Abholen Devisenmarktinformationen
-     * 
-     */
-    DMI("DMI"),
-
-    /**
-     * Abholen Devisenswapinformationen
-     * 
-     */
-    DSW("DSW"),
-
-    /**
-     * ESG-Datei für Elektronische Zweitunterschrift abholen
-     * 
-     */
-    ESG("ESG"),
-
-    /**
-     * ESP-Datei für Elektronische Zweitunterschrift senden
-     * 
-     */
-    ESP("ESP"),
-
-    /**
-     * Abholen/Senden beliebige Datei
-     * 
-     */
-    FTB("FTB"),
-
-    /**
-     * Freie Textdatei senden/abholen
-     * 
-     */
-    FTD("FTD"),
-
-    /**
-     * Abholen Institutsbestätigungsdatei (Komplettbestand)
-     * 
-     */
-    IBK("IBK"),
-
-    /**
-     * Abholen Institutsbestätigungsdatei (Komplettbestand weitere Datei)
-     * 
-     */
-    IBW("IBW"),
-
-    /**
-     * Abholen Institutsbestätigungsdatei (tägliches Update)
-     * 
-     */
-    IBU("IBU"),
-
-    /**
-     * Senden Institutskonten (Komplettbestand begrenzt auf 170 MB)
-     * 
-     */
-    IKK("IKK"),
-
-    /**
-     * Senden Institutskonten (tägliches Update)
-     * 
-     */
-    IKU("IKU"),
-
-    /**
-     * Senden Institutskonten (Komplettbestand weitere Datei)
-     * 
-     */
-    IKW("IKW"),
-
-    /**
-     * KTOHIN: Automatisiertes Verfahren für die Änderung von Kontonummern und 
Bankleitzahlen
-     * 
-     */
-    KTH("KTH"),
-
-    /**
-     * KTORUECK: Automatisiertes Verfahren für die Änderung von Kontonummern 
und Bankleitzahlen 
-     * 
-     */
-    KTR("KTR"),
-
-    /**
-     * Kontenkonzentration und Saldenausgleich
-     * 
-     */
-    KKZ("KKZ"),
-
-    /**
-     * Senden/Abholen Testdatei (ASCII)
-     * 
-     */
-    TST("TST"),
-
-    /**
-     * Updates abholen
-     * 
-     */
-    UPD("UPD");
-    private final String value;
-
-    OrderTType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static OrderTType fromValue(String v) {
-        for (OrderTType c: OrderTType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PGPDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PGPDataType.java
deleted file mode 100644
index fc05be7..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PGPDataType.java
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for PGPDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PGPDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;choice>
- *         &lt;sequence>
- *           &lt;element name="PGPKeyID" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           &lt;element name="PGPKeyPacket" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"; minOccurs="0"/>
- *           &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;/sequence>
- *         &lt;sequence>
- *           &lt;element name="PGPKeyPacket" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;/sequence>
- *       &lt;/choice>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PGPDataType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class PGPDataType {
-
-    @XmlElementRefs({
-        @XmlElementRef(name = "PGPKeyPacket", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "PGPKeyID", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false)
-    })
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-
-    /**
-     * Gets the rest of the content model. 
-     * 
-     * <p>
-     * You are getting this "catch-all" property because of the following 
reason: 
-     * The field name "PGPKeyPacket" is used by two different parts of a 
schema. See: 
-     * line 218 of 
file:/home/marcello/prog/libeufin/libeufin/sandbox/src/main/resources/xmldsig-core-schema.xsd
-     * line 213 of 
file:/home/marcello/prog/libeufin/libeufin/sandbox/src/main/resources/xmldsig-core-schema.xsd
-     * <p>
-     * To get rid of this property, apply a property customization to one 
-     * of both of the following declarations to change their names: 
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/Parameter.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/Parameter.java
deleted file mode 100644
index 61ca80f..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/Parameter.java
+++ /dev/null
@@ -1,196 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="Name" 
type="{http://www.w3.org/2001/XMLSchema}token"/>
- *         &lt;element name="Value">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension 
base="&lt;http://www.w3.org/2001/XMLSchema>anySimpleType">
- *                 &lt;attribute name="Type" use="required" 
type="{http://www.w3.org/2001/XMLSchema}NCName"; />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "name",
-    "value"
-})
-@XmlRootElement(name = "Parameter")
-public class Parameter {
-
-    @XmlElement(name = "Name", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String name;
-    @XmlElement(name = "Value", required = true)
-    protected Parameter.Value value;
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Parameter.Value }
-     *     
-     */
-    public Parameter.Value getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Parameter.Value }
-     *     
-     */
-    public void setValue(Parameter.Value value) {
-        this.value = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension 
base="&lt;http://www.w3.org/2001/XMLSchema>anySimpleType">
-     *       &lt;attribute name="Type" use="required" 
type="{http://www.w3.org/2001/XMLSchema}NCName"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Value {
-
-        @XmlValue
-        @XmlSchemaType(name = "anySimpleType")
-        protected Object value;
-        @XmlAttribute(name = "Type", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        @XmlSchemaType(name = "NCName")
-        protected String type;
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Object }
-         *     
-         */
-        public Object getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Object }
-         *     
-         */
-        public void setValue(Object value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the type property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getType() {
-            return type;
-        }
-
-        /**
-         * Sets the value of the type property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setType(String value) {
-            this.type = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PartnerInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PartnerInfoType.java
deleted file mode 100644
index 6ea0459..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PartnerInfoType.java
+++ /dev/null
@@ -1,310 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for customer data with regard to distributed signatures (order 
types HKD, HTD).
- * 
- * <p>Java class for PartnerInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PartnerInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="AddressInfo" 
type="{urn:org:ebics:H004}AddressInfoType"/>
- *         &lt;element name="BankInfo" 
type="{urn:org:ebics:H004}BankInfoType"/>
- *         &lt;element name="AccountInfo" maxOccurs="unbounded" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;extension base="{urn:org:ebics:H004}AccountType">
- *                 &lt;sequence>
- *                   &lt;element name="UsageOrderTypes" 
type="{urn:org:ebics:H004}OrderTListType" minOccurs="0"/>
- *                   &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *                 &lt;/sequence>
- *                 &lt;attribute name="ID" use="required" 
type="{urn:org:ebics:H004}AccountIDType" />
- *               &lt;/extension>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="OrderInfo" 
type="{urn:org:ebics:H004}AuthOrderInfoType" maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PartnerInfoType", propOrder = {
-    "addressInfo",
-    "bankInfo",
-    "accountInfo",
-    "orderInfo"
-})
-public class PartnerInfoType {
-
-    @XmlElement(name = "AddressInfo", required = true)
-    protected AddressInfoType addressInfo;
-    @XmlElement(name = "BankInfo", required = true)
-    protected BankInfoType bankInfo;
-    @XmlElement(name = "AccountInfo")
-    protected List<PartnerInfoType.AccountInfo> accountInfo;
-    @XmlElement(name = "OrderInfo", required = true)
-    protected List<AuthOrderInfoType> orderInfo;
-
-    /**
-     * Gets the value of the addressInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AddressInfoType }
-     *     
-     */
-    public AddressInfoType getAddressInfo() {
-        return addressInfo;
-    }
-
-    /**
-     * Sets the value of the addressInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AddressInfoType }
-     *     
-     */
-    public void setAddressInfo(AddressInfoType value) {
-        this.addressInfo = value;
-    }
-
-    /**
-     * Gets the value of the bankInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BankInfoType }
-     *     
-     */
-    public BankInfoType getBankInfo() {
-        return bankInfo;
-    }
-
-    /**
-     * Sets the value of the bankInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BankInfoType }
-     *     
-     */
-    public void setBankInfo(BankInfoType value) {
-        this.bankInfo = value;
-    }
-
-    /**
-     * Gets the value of the accountInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the accountInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAccountInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link PartnerInfoType.AccountInfo }
-     * 
-     * 
-     */
-    public List<PartnerInfoType.AccountInfo> getAccountInfo() {
-        if (accountInfo == null) {
-            accountInfo = new ArrayList<PartnerInfoType.AccountInfo>();
-        }
-        return this.accountInfo;
-    }
-
-    /**
-     * Gets the value of the orderInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AuthOrderInfoType }
-     * 
-     * 
-     */
-    public List<AuthOrderInfoType> getOrderInfo() {
-        if (orderInfo == null) {
-            orderInfo = new ArrayList<AuthOrderInfoType>();
-        }
-        return this.orderInfo;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:org:ebics:H004}AccountType">
-     *       &lt;sequence>
-     *         &lt;element name="UsageOrderTypes" 
type="{urn:org:ebics:H004}OrderTListType" minOccurs="0"/>
-     *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
-     *       &lt;/sequence>
-     *       &lt;attribute name="ID" use="required" 
type="{urn:org:ebics:H004}AccountIDType" />
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "usageOrderTypes",
-        "any"
-    })
-    public static class AccountInfo
-        extends AccountType
-    {
-
-        @XmlList
-        @XmlElement(name = "UsageOrderTypes")
-        protected List<String> usageOrderTypes;
-        @XmlAnyElement(lax = true)
-        protected List<Object> any;
-        @XmlAttribute(name = "ID", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String id;
-
-        /**
-         * Gets the value of the usageOrderTypes property.
-         * 
-         * <p>
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a <CODE>set</CODE> method for the 
usageOrderTypes property.
-         * 
-         * <p>
-         * For example, to add a new item, do as follows:
-         * <pre>
-         *    getUsageOrderTypes().add(newItem);
-         * </pre>
-         * 
-         * 
-         * <p>
-         * Objects of the following type(s) are allowed in the list
-         * {@link String }
-         * 
-         * 
-         */
-        public List<String> getUsageOrderTypes() {
-            if (usageOrderTypes == null) {
-                usageOrderTypes = new ArrayList<String>();
-            }
-            return this.usageOrderTypes;
-        }
-
-        /**
-         * Gets the value of the any property.
-         * 
-         * <p>
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a <CODE>set</CODE> method for the any 
property.
-         * 
-         * <p>
-         * For example, to add a new item, do as follows:
-         * <pre>
-         *    getAny().add(newItem);
-         * </pre>
-         * 
-         * 
-         * <p>
-         * Objects of the following type(s) are allowed in the list
-         * {@link Element }
-         * {@link Object }
-         * 
-         * 
-         */
-        public List<Object> getAny() {
-            if (any == null) {
-                any = new ArrayList<Object>();
-            }
-            return this.any;
-        }
-
-        /**
-         * Gets the value of the id property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getID() {
-            return id;
-        }
-
-        /**
-         * Sets the value of the id property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setID(String value) {
-            this.id = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PreValidationAccountAuthType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PreValidationAccountAuthType.java
deleted file mode 100644
index 02a53dd..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PreValidationAccountAuthType.java
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für Kontenberechtigungsdaten zur Vorabprüfung.
- * 
- * <p>Java class for PreValidationAccountAuthType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PreValidationAccountAuthType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}AccountType">
- *       &lt;sequence>
- *         &lt;element name="Amount" type="{urn:org:ebics:H004}AmountType" 
minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PreValidationAccountAuthType", propOrder = {
-    "amount"
-})
-public class PreValidationAccountAuthType
-    extends AccountType
-{
-
-    @XmlElement(name = "Amount")
-    protected AmountType amount;
-
-    /**
-     * Gets the value of the amount property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AmountType }
-     *     
-     */
-    public AmountType getAmount() {
-        return amount;
-    }
-
-    /**
-     * Sets the value of the amount property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AmountType }
-     *     
-     */
-    public void setAmount(AmountType value) {
-        this.amount = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PreValidationRequestType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PreValidationRequestType.java
deleted file mode 100644
index 770613f..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PreValidationRequestType.java
+++ /dev/null
@@ -1,147 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for pre-validation (request).
- * 
- * <p>Java class for PreValidationRequestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PreValidationRequestType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="DataDigest" 
type="{urn:org:ebics:H004}DataDigestType" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="AccountAuthorisation" 
type="{urn:org:ebics:H004}PreValidationAccountAuthType" maxOccurs="unbounded" 
minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PreValidationRequestType", propOrder = {
-    "dataDigest",
-    "accountAuthorisation",
-    "any"
-})
-public class PreValidationRequestType {
-
-    @XmlElement(name = "DataDigest")
-    protected List<DataDigestType> dataDigest;
-    @XmlElement(name = "AccountAuthorisation")
-    protected List<PreValidationAccountAuthType> accountAuthorisation;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the dataDigest property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the dataDigest 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getDataDigest().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link DataDigestType }
-     * 
-     * 
-     */
-    public List<DataDigestType> getDataDigest() {
-        if (dataDigest == null) {
-            dataDigest = new ArrayList<DataDigestType>();
-        }
-        return this.dataDigest;
-    }
-
-    /**
-     * Gets the value of the accountAuthorisation property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
accountAuthorisation property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAccountAuthorisation().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link PreValidationAccountAuthType }
-     * 
-     * 
-     */
-    public List<PreValidationAccountAuthType> getAccountAuthorisation() {
-        if (accountAuthorisation == null) {
-            accountAuthorisation = new 
ArrayList<PreValidationAccountAuthType>();
-        }
-        return this.accountAuthorisation;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PubKeyDigestType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PubKeyDigestType.java
deleted file mode 100644
index b6dd6b6..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PubKeyDigestType.java
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-
-
-/**
- * Datentyp für Hashwerte und Attribute von öffentlichen Schlüsseln.
- * 
- * <p>Java class for PubKeyDigestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PubKeyDigestType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;urn:org:ebics:H004>DigestType">
- *       &lt;attribute name="Algorithm" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PubKeyDigestType", propOrder = {
-    "value"
-})
-@XmlSeeAlso({
-    
tech.libeufin.messages.ebics.keyresponse.DataEncryptionInfoType.EncryptionPubKeyDigest.class
-})
-public class PubKeyDigestType {
-
-    @XmlValue
-    protected byte[] value;
-    @XmlAttribute(name = "Algorithm", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String algorithm;
-
-    /**
-     * Datentyp für Hashwerte.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setValue(byte[] value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the algorithm property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAlgorithm() {
-        return algorithm;
-    }
-
-    /**
-     * Sets the value of the algorithm property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAlgorithm(String value) {
-        this.algorithm = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PubKeyInfoTypeAtEbicsSignatures.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PubKeyInfoTypeAtEbicsSignatures.java
deleted file mode 100644
index 1c974a9..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PubKeyInfoTypeAtEbicsSignatures.java
+++ /dev/null
@@ -1,143 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für die Darstellung eines öffentlichen RSA-Schlüssels als 
Exponent-Modulus-Kombination oder als X509-Zertifikat.
- * 
- * <p>Java class for PubKeyInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PubKeyInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;sequence>
- *           &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"; 
minOccurs="0"/>
- *           &lt;element name="PubKeyValue" 
type="{http://www.ebics.org/S001}PubKeyValueType"/>
- *         &lt;/sequence>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PubKeyInfoType", namespace = "http://www.ebics.org/S001";, 
propOrder = {
-    "x509Data",
-    "pubKeyValue",
-    "any"
-})
-@XmlSeeAlso({
-    SignaturePubKeyInfoType.class
-})
-public class PubKeyInfoTypeAtEbicsSignatures {
-
-    @XmlElement(name = "X509Data", namespace = 
"http://www.w3.org/2000/09/xmldsig#";)
-    protected X509DataType x509Data;
-    @XmlElement(name = "PubKeyValue", required = true)
-    protected PubKeyValueTypeAtEbicsSignatures pubKeyValue;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the x509Data property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link X509DataType }
-     *     
-     */
-    public X509DataType getX509Data() {
-        return x509Data;
-    }
-
-    /**
-     * Sets the value of the x509Data property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link X509DataType }
-     *     
-     */
-    public void setX509Data(X509DataType value) {
-        this.x509Data = value;
-    }
-
-    /**
-     * Gets the value of the pubKeyValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PubKeyValueTypeAtEbicsSignatures }
-     *     
-     */
-    public PubKeyValueTypeAtEbicsSignatures getPubKeyValue() {
-        return pubKeyValue;
-    }
-
-    /**
-     * Sets the value of the pubKeyValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PubKeyValueTypeAtEbicsSignatures }
-     *     
-     */
-    public void setPubKeyValue(PubKeyValueTypeAtEbicsSignatures value) {
-        this.pubKeyValue = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PubKeyInfoTypeAtEbicsTypes.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PubKeyInfoTypeAtEbicsTypes.java
deleted file mode 100644
index b76e9ed..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PubKeyInfoTypeAtEbicsTypes.java
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für die Darstellung eines öffentlichen RSA-Schlüssels als 
Exponent-Modulus-Kombination oder als X509-Zertifikat.
- * 
- * <p>Java class for PubKeyInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PubKeyInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;sequence>
- *           &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"; 
minOccurs="0"/>
- *           &lt;element name="PubKeyValue" 
type="{urn:org:ebics:H004}PubKeyValueType"/>
- *         &lt;/sequence>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PubKeyInfoType", propOrder = {
-    "x509Data",
-    "pubKeyValue",
-    "any"
-})
-@XmlSeeAlso({
-    EncryptionPubKeyInfoType.class,
-    AuthenticationPubKeyInfoType.class
-})
-public class PubKeyInfoTypeAtEbicsTypes {
-
-    @XmlElement(name = "X509Data", namespace = 
"http://www.w3.org/2000/09/xmldsig#";)
-    protected X509DataType x509Data;
-    @XmlElement(name = "PubKeyValue", required = true)
-    protected PubKeyValueTypeAtEbicsTypes pubKeyValue;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the x509Data property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link X509DataType }
-     *     
-     */
-    public X509DataType getX509Data() {
-        return x509Data;
-    }
-
-    /**
-     * Sets the value of the x509Data property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link X509DataType }
-     *     
-     */
-    public void setX509Data(X509DataType value) {
-        this.x509Data = value;
-    }
-
-    /**
-     * Gets the value of the pubKeyValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PubKeyValueTypeAtEbicsTypes }
-     *     
-     */
-    public PubKeyValueTypeAtEbicsTypes getPubKeyValue() {
-        return pubKeyValue;
-    }
-
-    /**
-     * Sets the value of the pubKeyValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PubKeyValueTypeAtEbicsTypes }
-     *     
-     */
-    public void setPubKeyValue(PubKeyValueTypeAtEbicsTypes value) {
-        this.pubKeyValue = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PubKeyValueTypeAtEbicsSignatures.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PubKeyValueTypeAtEbicsSignatures.java
deleted file mode 100644
index 298ba6c..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PubKeyValueTypeAtEbicsSignatures.java
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für die Exponent-Modulus-Darstellung eines öffentlichen 
RSA-Schlüssels.
- * 
- * <p>Java class for PubKeyValueType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PubKeyValueType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
- *         &lt;element name="TimeStamp" 
type="{http://www.ebics.org/S001}TimestampType"; minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PubKeyValueType", namespace = "http://www.ebics.org/S001";, 
propOrder = {
-    "rsaKeyValue",
-    "timeStamp",
-    "any"
-})
-public class PubKeyValueTypeAtEbicsSignatures {
-
-    @XmlElement(name = "RSAKeyValue", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, required = true)
-    protected RSAKeyValueType rsaKeyValue;
-    @XmlElement(name = "TimeStamp")
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar timeStamp;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the rsaKeyValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RSAKeyValueType }
-     *     
-     */
-    public RSAKeyValueType getRSAKeyValue() {
-        return rsaKeyValue;
-    }
-
-    /**
-     * Sets the value of the rsaKeyValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RSAKeyValueType }
-     *     
-     */
-    public void setRSAKeyValue(RSAKeyValueType value) {
-        this.rsaKeyValue = value;
-    }
-
-    /**
-     * Gets the value of the timeStamp property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getTimeStamp() {
-        return timeStamp;
-    }
-
-    /**
-     * Sets the value of the timeStamp property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setTimeStamp(XMLGregorianCalendar value) {
-        this.timeStamp = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PubKeyValueTypeAtEbicsTypes.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PubKeyValueTypeAtEbicsTypes.java
deleted file mode 100644
index 05251d6..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/PubKeyValueTypeAtEbicsTypes.java
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für die Exponent-Modulus-Darstellung eines öffentlichen 
RSA-Schlüssels.
- * 
- * <p>Java class for PubKeyValueType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PubKeyValueType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
- *         &lt;element name="TimeStamp" 
type="{urn:org:ebics:H004}TimestampType" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PubKeyValueType", propOrder = {
-    "rsaKeyValue",
-    "timeStamp",
-    "any"
-})
-public class PubKeyValueTypeAtEbicsTypes {
-
-    @XmlElement(name = "RSAKeyValue", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, required = true)
-    protected RSAKeyValueType rsaKeyValue;
-    @XmlElement(name = "TimeStamp")
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar timeStamp;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the rsaKeyValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RSAKeyValueType }
-     *     
-     */
-    public RSAKeyValueType getRSAKeyValue() {
-        return rsaKeyValue;
-    }
-
-    /**
-     * Sets the value of the rsaKeyValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RSAKeyValueType }
-     *     
-     */
-    public void setRSAKeyValue(RSAKeyValueType value) {
-        this.rsaKeyValue = value;
-    }
-
-    /**
-     * Gets the value of the timeStamp property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getTimeStamp() {
-        return timeStamp;
-    }
-
-    /**
-     * Sets the value of the timeStamp property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setTimeStamp(XMLGregorianCalendar value) {
-        this.timeStamp = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/RSAKeyValueType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/RSAKeyValueType.java
deleted file mode 100644
index 964d8fa..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/RSAKeyValueType.java
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for RSAKeyValueType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="RSAKeyValueType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="Modulus" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         &lt;element name="Exponent" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RSAKeyValueType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "modulus",
-    "exponent"
-})
-public class RSAKeyValueType {
-
-    @XmlElement(name = "Modulus", required = true)
-    protected byte[] modulus;
-    @XmlElement(name = "Exponent", required = true)
-    protected byte[] exponent;
-
-    /**
-     * Gets the value of the modulus property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getModulus() {
-        return modulus;
-    }
-
-    /**
-     * Sets the value of the modulus property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setModulus(byte[] value) {
-        this.modulus = value;
-    }
-
-    /**
-     * Gets the value of the exponent property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getExponent() {
-        return exponent;
-    }
-
-    /**
-     * Sets the value of the exponent property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setExponent(byte[] value) {
-        this.exponent = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/ReferenceType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/ReferenceType.java
deleted file mode 100644
index d4db63b..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/ReferenceType.java
+++ /dev/null
@@ -1,214 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for ReferenceType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="ReferenceType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms"; 
minOccurs="0"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *       &lt;attribute name="URI" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *       &lt;attribute name="Type" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ReferenceType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "transforms",
-    "digestMethod",
-    "digestValue"
-})
-public class ReferenceType {
-
-    @XmlElement(name = "Transforms")
-    protected TransformsType transforms;
-    @XmlElement(name = "DigestMethod", required = true)
-    protected DigestMethodType digestMethod;
-    @XmlElement(name = "DigestValue", required = true)
-    protected byte[] digestValue;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-    @XmlAttribute(name = "URI")
-    @XmlSchemaType(name = "anyURI")
-    protected String uri;
-    @XmlAttribute(name = "Type")
-    @XmlSchemaType(name = "anyURI")
-    protected String type;
-
-    /**
-     * Gets the value of the transforms property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TransformsType }
-     *     
-     */
-    public TransformsType getTransforms() {
-        return transforms;
-    }
-
-    /**
-     * Sets the value of the transforms property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TransformsType }
-     *     
-     */
-    public void setTransforms(TransformsType value) {
-        this.transforms = value;
-    }
-
-    /**
-     * Gets the value of the digestMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DigestMethodType }
-     *     
-     */
-    public DigestMethodType getDigestMethod() {
-        return digestMethod;
-    }
-
-    /**
-     * Sets the value of the digestMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DigestMethodType }
-     *     
-     */
-    public void setDigestMethod(DigestMethodType value) {
-        this.digestMethod = value;
-    }
-
-    /**
-     * Gets the value of the digestValue property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getDigestValue() {
-        return digestValue;
-    }
-
-    /**
-     * Sets the value of the digestValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setDigestValue(byte[] value) {
-        this.digestValue = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the uri property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getURI() {
-        return uri;
-    }
-
-    /**
-     * Sets the value of the uri property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setURI(String value) {
-        this.uri = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/RetrievalMethodType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/RetrievalMethodType.java
deleted file mode 100644
index c960ad4..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/RetrievalMethodType.java
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for RetrievalMethodType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="RetrievalMethodType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms"; 
minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="URI" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *       &lt;attribute name="Type" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RetrievalMethodType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "transforms"
-})
-public class RetrievalMethodType {
-
-    @XmlElement(name = "Transforms")
-    protected TransformsType transforms;
-    @XmlAttribute(name = "URI")
-    @XmlSchemaType(name = "anyURI")
-    protected String uri;
-    @XmlAttribute(name = "Type")
-    @XmlSchemaType(name = "anyURI")
-    protected String type;
-
-    /**
-     * Gets the value of the transforms property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TransformsType }
-     *     
-     */
-    public TransformsType getTransforms() {
-        return transforms;
-    }
-
-    /**
-     * Sets the value of the transforms property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TransformsType }
-     *     
-     */
-    public void setTransforms(TransformsType value) {
-        this.transforms = value;
-    }
-
-    /**
-     * Gets the value of the uri property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getURI() {
-        return uri;
-    }
-
-    /**
-     * Sets the value of the uri property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setURI(String value) {
-        this.uri = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SPKIDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SPKIDataType.java
deleted file mode 100644
index 6ca3f58..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SPKIDataType.java
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for SPKIDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SPKIDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence maxOccurs="unbounded">
- *         &lt;element name="SPKISexp" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         &lt;any processContents='lax' namespace='##other' minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SPKIDataType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "spkiSexpAndAny"
-})
-public class SPKIDataType {
-
-    @XmlElementRef(name = "SPKISexp", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class)
-    @XmlAnyElement(lax = true)
-    protected List<Object> spkiSexpAndAny;
-
-    /**
-     * Gets the value of the spkiSexpAndAny property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
spkiSexpAndAny property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSPKISexpAndAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getSPKISexpAndAny() {
-        if (spkiSexpAndAny == null) {
-            spkiSexpAndAny = new ArrayList<Object>();
-        }
-        return this.spkiSexpAndAny;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignatureCertificateInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignatureCertificateInfoType.java
deleted file mode 100644
index 8ad8c17..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignatureCertificateInfoType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Data type for public authorisation (ES) key.
- * 
- * <p>Java class for SignatureCertificateInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignatureCertificateInfoType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}CertificateInfoType">
- *       &lt;sequence>
- *         &lt;element name="SignatureVersion" 
type="{urn:org:ebics:H004}SignatureVersionType"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignatureCertificateInfoType", propOrder = {
-    "signatureVersion"
-})
-public class SignatureCertificateInfoType
-    extends CertificateInfoType
-{
-
-    @XmlElement(name = "SignatureVersion", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String signatureVersion;
-
-    /**
-     * Gets the value of the signatureVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSignatureVersion() {
-        return signatureVersion;
-    }
-
-    /**
-     * Sets the value of the signatureVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSignatureVersion(String value) {
-        this.signatureVersion = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignatureMethodType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignatureMethodType.java
deleted file mode 100644
index e9342a8..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignatureMethodType.java
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for SignatureMethodType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignatureMethodType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="HMACOutputLength" 
type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType"; minOccurs="0"/>
- *         &lt;any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Algorithm" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignatureMethodType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class SignatureMethodType {
-
-    @XmlElementRef(name = "HMACOutputLength", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false)
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Algorithm", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String algorithm;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-    /**
-     * Gets the value of the algorithm property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAlgorithm() {
-        return algorithm;
-    }
-
-    /**
-     * Sets the value of the algorithm property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAlgorithm(String value) {
-        this.algorithm = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignaturePropertiesType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignaturePropertiesType.java
deleted file mode 100644
index 295d54e..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignaturePropertiesType.java
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for SignaturePropertiesType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignaturePropertiesType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element 
ref="{http://www.w3.org/2000/09/xmldsig#}SignatureProperty"; 
maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignaturePropertiesType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "signatureProperty"
-})
-public class SignaturePropertiesType {
-
-    @XmlElement(name = "SignatureProperty", required = true)
-    protected List<SignaturePropertyType> signatureProperty;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the signatureProperty property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
signatureProperty property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSignatureProperty().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SignaturePropertyType }
-     * 
-     * 
-     */
-    public List<SignaturePropertyType> getSignatureProperty() {
-        if (signatureProperty == null) {
-            signatureProperty = new ArrayList<SignaturePropertyType>();
-        }
-        return this.signatureProperty;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignaturePropertyType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignaturePropertyType.java
deleted file mode 100644
index 12c2993..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignaturePropertyType.java
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for SignaturePropertyType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignaturePropertyType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;choice maxOccurs="unbounded">
- *         &lt;any processContents='lax' namespace='##other'/>
- *       &lt;/choice>
- *       &lt;attribute name="Target" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignaturePropertyType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class SignaturePropertyType {
-
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Target", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String target;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-    /**
-     * Gets the value of the target property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTarget() {
-        return target;
-    }
-
-    /**
-     * Sets the value of the target property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTarget(String value) {
-        this.target = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignaturePubKeyInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignaturePubKeyInfoType.java
deleted file mode 100644
index 223e595..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignaturePubKeyInfoType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für öffentliche bankfachliche Schlüssel.
- * 
- * <p>Java class for SignaturePubKeyInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignaturePubKeyInfoType">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.ebics.org/S001}PubKeyInfoType";>
- *       &lt;sequence>
- *         &lt;element name="SignatureVersion" 
type="{http://www.ebics.org/S001}SignatureVersionType"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignaturePubKeyInfoType", namespace = 
"http://www.ebics.org/S001";, propOrder = {
-    "signatureVersion"
-})
-public class SignaturePubKeyInfoType
-    extends PubKeyInfoTypeAtEbicsSignatures
-{
-
-    @XmlElement(name = "SignatureVersion", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String signatureVersion;
-
-    /**
-     * Gets the value of the signatureVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSignatureVersion() {
-        return signatureVersion;
-    }
-
-    /**
-     * Sets the value of the signatureVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSignatureVersion(String value) {
-        this.signatureVersion = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignaturePubKeyOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignaturePubKeyOrderDataType.java
deleted file mode 100644
index 0c74a74..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignaturePubKeyOrderDataType.java
+++ /dev/null
@@ -1,172 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Public Key Dateien unabhängig von der Auftragsart / 
Geschäftsvorfall.
- * 
- * <p>Java class for SignaturePubKeyOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignaturePubKeyOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="SignaturePubKeyInfo" 
type="{http://www.ebics.org/S001}SignaturePubKeyInfoType"/>
- *         &lt;element name="PartnerID" 
type="{http://www.ebics.org/S001}PartnerIDType"/>
- *         &lt;element name="UserID" 
type="{http://www.ebics.org/S001}UserIDType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignaturePubKeyOrderDataType", namespace = 
"http://www.ebics.org/S001";, propOrder = {
-    "signaturePubKeyInfo",
-    "partnerID",
-    "userID",
-    "any"
-})
-public class SignaturePubKeyOrderDataType {
-
-    @XmlElement(name = "SignaturePubKeyInfo", required = true)
-    protected SignaturePubKeyInfoType signaturePubKeyInfo;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the signaturePubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignaturePubKeyInfoType }
-     *     
-     */
-    public SignaturePubKeyInfoType getSignaturePubKeyInfo() {
-        return signaturePubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the signaturePubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignaturePubKeyInfoType }
-     *     
-     */
-    public void setSignaturePubKeyInfo(SignaturePubKeyInfoType value) {
-        this.signaturePubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignatureType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignatureType.java
deleted file mode 100644
index 782abec..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignatureType.java
+++ /dev/null
@@ -1,195 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for SignatureType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignatureType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SignedInfo"/>
- *         &lt;element 
ref="{http://www.w3.org/2000/09/xmldsig#}SignatureValue"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo"; 
minOccurs="0"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Object"; 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignatureType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "signedInfo",
-    "signatureValue",
-    "keyInfo",
-    "object"
-})
-public class SignatureType {
-
-    @XmlElement(name = "SignedInfo", required = true)
-    protected SignedInfoType signedInfo;
-    @XmlElement(name = "SignatureValue", required = true)
-    protected SignatureValueType signatureValue;
-    @XmlElement(name = "KeyInfo")
-    protected KeyInfoType keyInfo;
-    @XmlElement(name = "Object")
-    protected List<ObjectType> object;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the signedInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignedInfoType }
-     *     
-     */
-    public SignedInfoType getSignedInfo() {
-        return signedInfo;
-    }
-
-    /**
-     * Sets the value of the signedInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignedInfoType }
-     *     
-     */
-    public void setSignedInfo(SignedInfoType value) {
-        this.signedInfo = value;
-    }
-
-    /**
-     * Gets the value of the signatureValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignatureValueType }
-     *     
-     */
-    public SignatureValueType getSignatureValue() {
-        return signatureValue;
-    }
-
-    /**
-     * Sets the value of the signatureValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignatureValueType }
-     *     
-     */
-    public void setSignatureValue(SignatureValueType value) {
-        this.signatureValue = value;
-    }
-
-    /**
-     * Gets the value of the keyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link KeyInfoType }
-     *     
-     */
-    public KeyInfoType getKeyInfo() {
-        return keyInfo;
-    }
-
-    /**
-     * Sets the value of the keyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link KeyInfoType }
-     *     
-     */
-    public void setKeyInfo(KeyInfoType value) {
-        this.keyInfo = value;
-    }
-
-    /**
-     * Gets the value of the object property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the object 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getObject().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ObjectType }
-     * 
-     * 
-     */
-    public List<ObjectType> getObject() {
-        if (object == null) {
-            object = new ArrayList<ObjectType>();
-        }
-        return this.object;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignatureValueType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignatureValueType.java
deleted file mode 100644
index 4438975..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignatureValueType.java
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for SignatureValueType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignatureValueType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>base64Binary">
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignatureValueType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "value"
-})
-public class SignatureValueType {
-
-    @XmlValue
-    protected byte[] value;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setValue(byte[] value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignedInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignedInfoType.java
deleted file mode 100644
index 6f9e1ed..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignedInfoType.java
+++ /dev/null
@@ -1,167 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for SignedInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignedInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element 
ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod"/>
- *         &lt;element 
ref="{http://www.w3.org/2000/09/xmldsig#}SignatureMethod"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Reference"; 
maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignedInfoType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "canonicalizationMethod",
-    "signatureMethod",
-    "reference"
-})
-public class SignedInfoType {
-
-    @XmlElement(name = "CanonicalizationMethod", required = true)
-    protected CanonicalizationMethodType canonicalizationMethod;
-    @XmlElement(name = "SignatureMethod", required = true)
-    protected SignatureMethodType signatureMethod;
-    @XmlElement(name = "Reference", required = true)
-    protected List<ReferenceType> reference;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the canonicalizationMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CanonicalizationMethodType }
-     *     
-     */
-    public CanonicalizationMethodType getCanonicalizationMethod() {
-        return canonicalizationMethod;
-    }
-
-    /**
-     * Sets the value of the canonicalizationMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CanonicalizationMethodType }
-     *     
-     */
-    public void setCanonicalizationMethod(CanonicalizationMethodType value) {
-        this.canonicalizationMethod = value;
-    }
-
-    /**
-     * Gets the value of the signatureMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignatureMethodType }
-     *     
-     */
-    public SignatureMethodType getSignatureMethod() {
-        return signatureMethod;
-    }
-
-    /**
-     * Sets the value of the signatureMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignatureMethodType }
-     *     
-     */
-    public void setSignatureMethod(SignatureMethodType value) {
-        this.signatureMethod = value;
-    }
-
-    /**
-     * Gets the value of the reference property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the reference 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getReference().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ReferenceType }
-     * 
-     * 
-     */
-    public List<ReferenceType> getReference() {
-        if (reference == null) {
-            reference = new ArrayList<ReferenceType>();
-        }
-        return this.reference;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignerInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignerInfoType.java
deleted file mode 100644
index 5b8237e..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/SignerInfoType.java
+++ /dev/null
@@ -1,319 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Informationen zu einem Unterzeichner eines VEU-Auftrags (HVU, 
HVD).
- * 
- * <p>Java class for SignerInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignerInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;element name="Name" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;element name="Timestamp" 
type="{urn:org:ebics:H004}TimestampType"/>
- *         &lt;element name="Permission">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;attGroup ref="{urn:org:ebics:H004}SignerPermission"/>
- *                 &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignerInfoType", propOrder = {
-    "partnerID",
-    "userID",
-    "name",
-    "timestamp",
-    "permission",
-    "any"
-})
-public class SignerInfoType {
-
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlElement(name = "Name")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String name;
-    @XmlElement(name = "Timestamp", required = true)
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar timestamp;
-    @XmlElement(name = "Permission", required = true)
-    protected SignerInfoType.Permission permission;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the timestamp property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getTimestamp() {
-        return timestamp;
-    }
-
-    /**
-     * Sets the value of the timestamp property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setTimestamp(XMLGregorianCalendar value) {
-        this.timestamp = value;
-    }
-
-    /**
-     * Gets the value of the permission property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignerInfoType.Permission }
-     *     
-     */
-    public SignerInfoType.Permission getPermission() {
-        return permission;
-    }
-
-    /**
-     * Sets the value of the permission property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignerInfoType.Permission }
-     *     
-     */
-    public void setPermission(SignerInfoType.Permission value) {
-        this.permission = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}SignerPermission"/>
-     *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Permission {
-
-        @XmlAttribute(name = "AuthorisationLevel", required = true)
-        protected AuthorisationLevelType authorisationLevel;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Gets the value of the authorisationLevel property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link AuthorisationLevelType }
-         *     
-         */
-        public AuthorisationLevelType getAuthorisationLevel() {
-            return authorisationLevel;
-        }
-
-        /**
-         * Sets the value of the authorisationLevel property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link AuthorisationLevelType }
-         *     
-         */
-        public void setAuthorisationLevel(AuthorisationLevelType value) {
-            this.authorisationLevel = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/StandardOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/StandardOrderParamsType.java
deleted file mode 100644
index f8d1f9a..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/StandardOrderParamsType.java
+++ /dev/null
@@ -1,169 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter bei Standard-Auftragsarten.
- * 
- * <p>Java class for StandardOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="StandardOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="DateRange" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;sequence>
- *                   &lt;element name="Start" 
type="{urn:org:ebics:H004}DateType"/>
- *                   &lt;element name="End" 
type="{urn:org:ebics:H004}DateType"/>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "StandardOrderParamsType", propOrder = {
-    "dateRange"
-})
-public class StandardOrderParamsType {
-
-    @XmlElement(name = "DateRange")
-    protected StandardOrderParamsType.DateRange dateRange;
-
-    /**
-     * Gets the value of the dateRange property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link StandardOrderParamsType.DateRange }
-     *     
-     */
-    public StandardOrderParamsType.DateRange getDateRange() {
-        return dateRange;
-    }
-
-    /**
-     * Sets the value of the dateRange property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link StandardOrderParamsType.DateRange }
-     *     
-     */
-    public void setDateRange(StandardOrderParamsType.DateRange value) {
-        this.dateRange = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;sequence>
-     *         &lt;element name="Start" type="{urn:org:ebics:H004}DateType"/>
-     *         &lt;element name="End" type="{urn:org:ebics:H004}DateType"/>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "start",
-        "end"
-    })
-    public static class DateRange {
-
-        @XmlElement(name = "Start", required = true)
-        @XmlSchemaType(name = "date")
-        protected XMLGregorianCalendar start;
-        @XmlElement(name = "End", required = true)
-        @XmlSchemaType(name = "date")
-        protected XMLGregorianCalendar end;
-
-        /**
-         * Gets the value of the start property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public XMLGregorianCalendar getStart() {
-            return start;
-        }
-
-        /**
-         * Sets the value of the start property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public void setStart(XMLGregorianCalendar value) {
-            this.start = value;
-        }
-
-        /**
-         * Gets the value of the end property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public XMLGregorianCalendar getEnd() {
-            return end;
-        }
-
-        /**
-         * Sets the value of the end property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public void setEnd(XMLGregorianCalendar value) {
-            this.end = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/TransactionPhaseType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/TransactionPhaseType.java
deleted file mode 100644
index 065db63..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/TransactionPhaseType.java
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for TransactionPhaseType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="TransactionPhaseType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token";>
- *     &lt;enumeration value="Initialisation"/>
- *     &lt;enumeration value="Transfer"/>
- *     &lt;enumeration value="Receipt"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "TransactionPhaseType")
-@XmlEnum
-public enum TransactionPhaseType {
-
-
-    /**
-     * Transaktionsinitialisierung
-     * 
-     */
-    @XmlEnumValue("Initialisation")
-    INITIALISATION("Initialisation"),
-
-    /**
-     * Auftragsdatentransfer
-     * 
-     */
-    @XmlEnumValue("Transfer")
-    TRANSFER("Transfer"),
-
-    /**
-     * Quittungstransfer
-     * 
-     */
-    @XmlEnumValue("Receipt")
-    RECEIPT("Receipt");
-    private final String value;
-
-    TransactionPhaseType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static TransactionPhaseType fromValue(String v) {
-        for (TransactionPhaseType c: TransactionPhaseType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/TransferReceiptRequestType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/TransferReceiptRequestType.java
deleted file mode 100644
index 008ec43..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/TransferReceiptRequestType.java
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für den Transfer von Transferquittungen.
- * 
- * <p>Java class for TransferReceiptRequestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="TransferReceiptRequestType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="ReceiptCode" 
type="{urn:org:ebics:H004}ReceiptCodeType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TransferReceiptRequestType", propOrder = {
-    "receiptCode",
-    "any"
-})
-public class TransferReceiptRequestType {
-
-    @XmlElement(name = "ReceiptCode")
-    @XmlSchemaType(name = "nonNegativeInteger")
-    protected int receiptCode;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the receiptCode property.
-     * 
-     */
-    public int getReceiptCode() {
-        return receiptCode;
-    }
-
-    /**
-     * Sets the value of the receiptCode property.
-     * 
-     */
-    public void setReceiptCode(int value) {
-        this.receiptCode = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/TransferReceiptResponseType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/TransferReceiptResponseType.java
deleted file mode 100644
index d575020..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/TransferReceiptResponseType.java
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.datatype.XMLGregorianCalendar;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für den Transfer von Antwortcodes.
- * 
- * <p>Java class for TransferReceiptResponseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="TransferReceiptResponseType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="ReturnCodeReceipt" 
type="{urn:org:ebics:H004}ReturnCodeType"/>
- *         &lt;element name="TimestampBankParameter" 
type="{urn:org:ebics:H004}TimestampType" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TransferReceiptResponseType", propOrder = {
-    "returnCodeReceipt",
-    "timestampBankParameter",
-    "any"
-})
-public class TransferReceiptResponseType {
-
-    @XmlElement(name = "ReturnCodeReceipt", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String returnCodeReceipt;
-    @XmlElement(name = "TimestampBankParameter")
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar timestampBankParameter;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the returnCodeReceipt property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getReturnCodeReceipt() {
-        return returnCodeReceipt;
-    }
-
-    /**
-     * Sets the value of the returnCodeReceipt property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setReturnCodeReceipt(String value) {
-        this.returnCodeReceipt = value;
-    }
-
-    /**
-     * Gets the value of the timestampBankParameter property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getTimestampBankParameter() {
-        return timestampBankParameter;
-    }
-
-    /**
-     * Sets the value of the timestampBankParameter property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setTimestampBankParameter(XMLGregorianCalendar value) {
-        this.timestampBankParameter = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/TransferType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/TransferType.java
deleted file mode 100644
index 656cece..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/TransferType.java
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for TransferType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="TransferType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token";>
- *     &lt;enumeration value="Upload"/>
- *     &lt;enumeration value="Download"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "TransferType")
-@XmlEnum
-public enum TransferType {
-
-
-    /**
-     * Auftragsdaten werden bei der Anfrage transferiert.
-     * 
-     */
-    @XmlEnumValue("Upload")
-    UPLOAD("Upload"),
-
-    /**
-     * Auftragsdaten werden bei der Antwort transferiert.
-     * 
-     */
-    @XmlEnumValue("Download")
-    DOWNLOAD("Download");
-    private final String value;
-
-    TransferType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static TransferType fromValue(String v) {
-        for (TransferType c: TransferType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/TransformType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/TransformType.java
deleted file mode 100644
index 1b63f07..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/TransformType.java
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for TransformType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="TransformType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;any processContents='lax' namespace='##other'/>
- *         &lt;element name="XPath" 
type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       &lt;/choice>
- *       &lt;attribute name="Algorithm" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TransformType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class TransformType {
-
-    @XmlElementRef(name = "XPath", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false)
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Algorithm", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String algorithm;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * {@link Element }
-     * {@link Object }
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-    /**
-     * Gets the value of the algorithm property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAlgorithm() {
-        return algorithm;
-    }
-
-    /**
-     * Sets the value of the algorithm property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAlgorithm(String value) {
-        this.algorithm = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/TransformsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/TransformsType.java
deleted file mode 100644
index 9ee7bf7..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/TransformsType.java
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for TransformsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="TransformsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Transform"; 
maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TransformsType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "transform"
-})
-public class TransformsType {
-
-    @XmlElement(name = "Transform", required = true)
-    protected List<TransformType> transform;
-
-    /**
-     * Gets the value of the transform property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the transform 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getTransform().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link TransformType }
-     * 
-     * 
-     */
-    public List<TransformType> getTransform() {
-        if (transform == null) {
-            transform = new ArrayList<TransformType>();
-        }
-        return this.transform;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/UserInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/UserInfoType.java
deleted file mode 100644
index da98061..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/UserInfoType.java
+++ /dev/null
@@ -1,258 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für VEU-Teilnehmerinformationen (HKD, HTD).
- * 
- * <p>Java class for UserInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="UserInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="UserID">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension base="&lt;urn:org:ebics:H004>UserIDType">
- *                 &lt;attribute name="Status" use="required" 
type="{urn:org:ebics:H004}UserStatusType" />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="Name" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;element name="Permission" 
type="{urn:org:ebics:H004}UserPermissionType" maxOccurs="unbounded"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "UserInfoType", propOrder = {
-    "userID",
-    "name",
-    "permission",
-    "any"
-})
-public class UserInfoType {
-
-    @XmlElement(name = "UserID", required = true)
-    protected UserInfoType.UserID userID;
-    @XmlElement(name = "Name")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String name;
-    @XmlElement(name = "Permission", required = true)
-    protected List<UserPermissionType> permission;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link UserInfoType.UserID }
-     *     
-     */
-    public UserInfoType.UserID getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link UserInfoType.UserID }
-     *     
-     */
-    public void setUserID(UserInfoType.UserID value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the permission property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the permission 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getPermission().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link UserPermissionType }
-     * 
-     * 
-     */
-    public List<UserPermissionType> getPermission() {
-        if (permission == null) {
-            permission = new ArrayList<UserPermissionType>();
-        }
-        return this.permission;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>UserIDType">
-     *       &lt;attribute name="Status" use="required" 
type="{urn:org:ebics:H004}UserStatusType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class UserID {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "Status", required = true)
-        protected int status;
-
-        /**
-         * Datentyp für eine Teilnehmer-ID.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the status property.
-         * 
-         */
-        public int getStatus() {
-            return status;
-        }
-
-        /**
-         * Sets the value of the status property.
-         * 
-         */
-        public void setStatus(int value) {
-            this.status = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/UserPermissionType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/UserPermissionType.java
deleted file mode 100644
index bb12d26..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/UserPermissionType.java
+++ /dev/null
@@ -1,258 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für VEU-Berechtigungsinformationen des Teilnehmers (HKD, HTD).
- * 
- * <p>Java class for UserPermissionType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="UserPermissionType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderTypes" 
type="{urn:org:ebics:H004}OrderTListType"/>
- *         &lt;element name="FileFormat" 
type="{urn:org:ebics:H004}FileFormatType" minOccurs="0"/>
- *         &lt;element name="AccountID" 
type="{urn:org:ebics:H004}AccountIDType" minOccurs="0"/>
- *         &lt;element name="MaxAmount" type="{urn:org:ebics:H004}AmountType" 
minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="AuthorisationLevel" 
type="{urn:org:ebics:H004}AuthorisationLevelType" />
- *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "UserPermissionType", propOrder = {
-    "orderTypes",
-    "fileFormat",
-    "accountID",
-    "maxAmount",
-    "any"
-})
-public class UserPermissionType {
-
-    @XmlList
-    @XmlElement(name = "OrderTypes", required = true)
-    protected List<String> orderTypes;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "AccountID")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String accountID;
-    @XmlElement(name = "MaxAmount")
-    protected AmountType maxAmount;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-    @XmlAttribute(name = "AuthorisationLevel")
-    protected AuthorisationLevelType authorisationLevel;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-    /**
-     * Gets the value of the orderTypes property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderTypes 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderTypes().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getOrderTypes() {
-        if (orderTypes == null) {
-            orderTypes = new ArrayList<String>();
-        }
-        return this.orderTypes;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the accountID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAccountID() {
-        return accountID;
-    }
-
-    /**
-     * Sets the value of the accountID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAccountID(String value) {
-        this.accountID = value;
-    }
-
-    /**
-     * Gets the value of the maxAmount property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AmountType }
-     *     
-     */
-    public AmountType getMaxAmount() {
-        return maxAmount;
-    }
-
-    /**
-     * Sets the value of the maxAmount property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AmountType }
-     *     
-     */
-    public void setMaxAmount(AmountType value) {
-        this.maxAmount = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-    /**
-     * Gets the value of the authorisationLevel property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthorisationLevelType }
-     *     
-     */
-    public AuthorisationLevelType getAuthorisationLevel() {
-        return authorisationLevel;
-    }
-
-    /**
-     * Sets the value of the authorisationLevel property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthorisationLevelType }
-     *     
-     */
-    public void setAuthorisationLevel(AuthorisationLevelType value) {
-        this.authorisationLevel = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/UserSignatureDataSigBookType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/UserSignatureDataSigBookType.java
deleted file mode 100644
index 8b5ef79..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/UserSignatureDataSigBookType.java
+++ /dev/null
@@ -1,211 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for digital signature data transferred using EBICS.
- * 
- * <p>Java class for UserSignatureDataSigBookType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="UserSignatureDataSigBookType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;choice maxOccurs="unbounded">
- *           &lt;element name="OrderSignature">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;http://www.ebics.org/S001>OrderSignatureType">
- *                   &lt;attribute name="PartnerID" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anySimpleType"; />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *           &lt;element name="OrderSignatureData" 
type="{http://www.ebics.org/S001}OrderSignatureDataType"/>
- *         &lt;/choice>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "UserSignatureDataSigBookType", namespace = 
"http://www.ebics.org/S001";, propOrder = {
-    "orderSignatureOrOrderSignatureData",
-    "any"
-})
-public class UserSignatureDataSigBookType {
-
-    @XmlElements({
-        @XmlElement(name = "OrderSignature", type = 
UserSignatureDataSigBookType.OrderSignature.class),
-        @XmlElement(name = "OrderSignatureData", type = 
OrderSignatureDataType.class)
-    })
-    protected List<Object> orderSignatureOrOrderSignatureData;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderSignatureOrOrderSignatureData property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
orderSignatureOrOrderSignatureData property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderSignatureOrOrderSignatureData().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link UserSignatureDataSigBookType.OrderSignature }
-     * {@link OrderSignatureDataType }
-     * 
-     * 
-     */
-    public List<Object> getOrderSignatureOrOrderSignatureData() {
-        if (orderSignatureOrOrderSignatureData == null) {
-            orderSignatureOrOrderSignatureData = new ArrayList<Object>();
-        }
-        return this.orderSignatureOrOrderSignatureData;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension 
base="&lt;http://www.ebics.org/S001>OrderSignatureType">
-     *       &lt;attribute name="PartnerID" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anySimpleType"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class OrderSignature {
-
-        @XmlValue
-        protected byte[] value;
-        @XmlAttribute(name = "PartnerID", required = true)
-        @XmlSchemaType(name = "anySimpleType")
-        protected String partnerID;
-
-        /**
-         * Datentyp für kryptographische Unterschriften.
-         * 
-         * @return
-         *     possible object is
-         *     byte[]
-         */
-        public byte[] getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     byte[]
-         */
-        public void setValue(byte[] value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the partnerID property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getPartnerID() {
-            return partnerID;
-        }
-
-        /**
-         * Sets the value of the partnerID property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setPartnerID(String value) {
-            this.partnerID = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/X509DataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/X509DataType.java
deleted file mode 100644
index 8c7ab0a..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/X509DataType.java
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for X509DataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="X509DataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence maxOccurs="unbounded">
- *         &lt;choice>
- *           &lt;element name="X509IssuerSerial" 
type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
- *           &lt;element name="X509SKI" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           &lt;element name="X509SubjectName" 
type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           &lt;element name="X509Certificate" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           &lt;element name="X509CRL" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           &lt;any processContents='lax' namespace='##other'/>
- *         &lt;/choice>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "X509DataType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "x509IssuerSerialOrX509SKIOrX509SubjectName"
-})
-public class X509DataType {
-
-    @XmlElementRefs({
-        @XmlElementRef(name = "X509IssuerSerial", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "X509CRL", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "X509SKI", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "X509Certificate", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "X509SubjectName", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false)
-    })
-    @XmlAnyElement(lax = true)
-    protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName;
-
-    /**
-     * Gets the value of the x509IssuerSerialOrX509SKIOrX509SubjectName 
property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
x509IssuerSerialOrX509SKIOrX509SubjectName property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getX509IssuerSerialOrX509SKIOrX509SubjectName().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link Object }
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link Element }
-     * 
-     * 
-     */
-    public List<Object> getX509IssuerSerialOrX509SKIOrX509SubjectName() {
-        if (x509IssuerSerialOrX509SKIOrX509SubjectName == null) {
-            x509IssuerSerialOrX509SKIOrX509SubjectName = new 
ArrayList<Object>();
-        }
-        return this.x509IssuerSerialOrX509SKIOrX509SubjectName;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/X509IssuerSerialType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/X509IssuerSerialType.java
deleted file mode 100644
index 867dd8b..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/X509IssuerSerialType.java
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.keyresponse;
-
-import java.math.BigInteger;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for X509IssuerSerialType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="X509IssuerSerialType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="X509IssuerName" 
type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="X509SerialNumber" 
type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "X509IssuerSerialType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "x509IssuerName",
-    "x509SerialNumber"
-})
-public class X509IssuerSerialType {
-
-    @XmlElement(name = "X509IssuerName", required = true)
-    protected String x509IssuerName;
-    @XmlElement(name = "X509SerialNumber", required = true)
-    protected BigInteger x509SerialNumber;
-
-    /**
-     * Gets the value of the x509IssuerName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getX509IssuerName() {
-        return x509IssuerName;
-    }
-
-    /**
-     * Sets the value of the x509IssuerName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setX509IssuerName(String value) {
-        this.x509IssuerName = value;
-    }
-
-    /**
-     * Gets the value of the x509SerialNumber property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getX509SerialNumber() {
-        return x509SerialNumber;
-    }
-
-    /**
-     * Sets the value of the x509SerialNumber property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setX509SerialNumber(BigInteger value) {
-        this.x509SerialNumber = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/package-info.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/package-info.java
deleted file mode 100644
index b83c617..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/keyresponse/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.18 at 06:44:54 PM CEST 
-//
-
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:org:ebics:H004", 
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package tech.libeufin.messages.ebics.keyresponse;
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AccountHolderRoleType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AccountHolderRoleType.java
deleted file mode 100644
index a751939..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AccountHolderRoleType.java
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for AccountHolderRoleType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="AccountHolderRoleType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token";>
- *     &lt;enumeration value="Originator"/>
- *     &lt;enumeration value="Recipient"/>
- *     &lt;enumeration value="Presenter"/>
- *     &lt;enumeration value="Other"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "AccountHolderRoleType")
-@XmlEnum
-public enum AccountHolderRoleType {
-
-
-    /**
-     * Auftraggeber
-     * 
-     */
-    @XmlEnumValue("Originator")
-    ORIGINATOR("Originator"),
-
-    /**
-     * Empfänger
-     * 
-     */
-    @XmlEnumValue("Recipient")
-    RECIPIENT("Recipient"),
-
-    /**
-     * Überbringer, Einreicher
-     * 
-     */
-    @XmlEnumValue("Presenter")
-    PRESENTER("Presenter"),
-
-    /**
-     * andere Rolle
-     * 
-     */
-    @XmlEnumValue("Other")
-    OTHER("Other");
-    private final String value;
-
-    AccountHolderRoleType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static AccountHolderRoleType fromValue(String v) {
-        for (AccountHolderRoleType c: AccountHolderRoleType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AccountNumberRoleType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AccountNumberRoleType.java
deleted file mode 100644
index cc78bda..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AccountNumberRoleType.java
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for AccountNumberRoleType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="AccountNumberRoleType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token";>
- *     &lt;enumeration value="Originator"/>
- *     &lt;enumeration value="Recipient"/>
- *     &lt;enumeration value="Charges"/>
- *     &lt;enumeration value="Other"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "AccountNumberRoleType")
-@XmlEnum
-public enum AccountNumberRoleType {
-
-
-    /**
-     * Auftraggeberkonto
-     * 
-     */
-    @XmlEnumValue("Originator")
-    ORIGINATOR("Originator"),
-
-    /**
-     * Empfängerkonto
-     * 
-     */
-    @XmlEnumValue("Recipient")
-    RECIPIENT("Recipient"),
-
-    /**
-     * Gebührenkonto
-     * 
-     */
-    @XmlEnumValue("Charges")
-    CHARGES("Charges"),
-
-    /**
-     * andere Kontorolle
-     * 
-     */
-    @XmlEnumValue("Other")
-    OTHER("Other");
-    private final String value;
-
-    AccountNumberRoleType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static AccountNumberRoleType fromValue(String v) {
-        for (AccountNumberRoleType c: AccountNumberRoleType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AccountType.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AccountType.java
deleted file mode 100644
index cf6db40..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AccountType.java
+++ /dev/null
@@ -1,620 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für Kontoinformationen.
- * 
- * <p>Java class for AccountType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="AccountType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;choice maxOccurs="2">
- *           &lt;element name="AccountNumber">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;urn:org:ebics:H004>AccountNumberType">
- *                   &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *           &lt;element name="NationalAccountNumber">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;urn:org:ebics:H004>NationalAccountNumberType">
- *                   &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="2">
- *           &lt;element name="BankCode">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension base="&lt;urn:org:ebics:H004>BankCodeType">
- *                   &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
- *                   &lt;attribute name="Prefix" 
type="{urn:org:ebics:H004}BankCodePrefixType" />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *           &lt;element name="NationalBankCode">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;urn:org:ebics:H004>NationalBankCodeType">
- *                   &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *         &lt;/choice>
- *         &lt;element name="AccountHolder" 
type="{urn:org:ebics:H004}AccountHolderType" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Currency" 
type="{urn:org:ebics:H004}CurrencyBaseType" default="EUR" />
- *       &lt;attribute name="Description" 
type="{urn:org:ebics:H004}AccountDescriptionType" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AccountType", propOrder = {
-    "accountNumberOrNationalAccountNumber",
-    "bankCodeOrNationalBankCode",
-    "accountHolder"
-})
-@XmlSeeAlso({
-    tech.libeufin.messages.ebics.response.PartnerInfoType.AccountInfo.class,
-    PreValidationAccountAuthType.class
-})
-public class AccountType {
-
-    @XmlElements({
-        @XmlElement(name = "AccountNumber", type = 
AccountType.AccountNumber.class),
-        @XmlElement(name = "NationalAccountNumber", type = 
AccountType.NationalAccountNumber.class)
-    })
-    protected List<Object> accountNumberOrNationalAccountNumber;
-    @XmlElements({
-        @XmlElement(name = "BankCode", type = AccountType.BankCode.class),
-        @XmlElement(name = "NationalBankCode", type = 
AccountType.NationalBankCode.class)
-    })
-    protected List<Object> bankCodeOrNationalBankCode;
-    @XmlElement(name = "AccountHolder")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String accountHolder;
-    @XmlAttribute(name = "Currency")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String currency;
-    @XmlAttribute(name = "Description")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    protected String description;
-
-    /**
-     * Gets the value of the accountNumberOrNationalAccountNumber property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
accountNumberOrNationalAccountNumber property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAccountNumberOrNationalAccountNumber().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AccountType.AccountNumber }
-     * {@link AccountType.NationalAccountNumber }
-     * 
-     * 
-     */
-    public List<Object> getAccountNumberOrNationalAccountNumber() {
-        if (accountNumberOrNationalAccountNumber == null) {
-            accountNumberOrNationalAccountNumber = new ArrayList<Object>();
-        }
-        return this.accountNumberOrNationalAccountNumber;
-    }
-
-    /**
-     * Gets the value of the bankCodeOrNationalBankCode property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
bankCodeOrNationalBankCode property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getBankCodeOrNationalBankCode().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AccountType.BankCode }
-     * {@link AccountType.NationalBankCode }
-     * 
-     * 
-     */
-    public List<Object> getBankCodeOrNationalBankCode() {
-        if (bankCodeOrNationalBankCode == null) {
-            bankCodeOrNationalBankCode = new ArrayList<Object>();
-        }
-        return this.bankCodeOrNationalBankCode;
-    }
-
-    /**
-     * Gets the value of the accountHolder property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAccountHolder() {
-        return accountHolder;
-    }
-
-    /**
-     * Sets the value of the accountHolder property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAccountHolder(String value) {
-        this.accountHolder = value;
-    }
-
-    /**
-     * Gets the value of the currency property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCurrency() {
-        if (currency == null) {
-            return "EUR";
-        } else {
-            return currency;
-        }
-    }
-
-    /**
-     * Sets the value of the currency property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCurrency(String value) {
-        this.currency = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>AccountNumberType">
-     *       &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class AccountNumber {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "international")
-        protected Boolean international;
-
-        /**
-         * Datentyp für eine Kontonummer (national/international).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the international property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isInternational() {
-            if (international == null) {
-                return false;
-            } else {
-                return international;
-            }
-        }
-
-        /**
-         * Sets the value of the international property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setInternational(Boolean value) {
-            this.international = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>BankCodeType">
-     *       &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-     *       &lt;attribute name="Prefix" 
type="{urn:org:ebics:H004}BankCodePrefixType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class BankCode {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "international")
-        protected Boolean international;
-        @XmlAttribute(name = "Prefix")
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String prefix;
-
-        /**
-         * Datentyp für eine Bankleitzahl (national/international).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the international property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isInternational() {
-            if (international == null) {
-                return false;
-            } else {
-                return international;
-            }
-        }
-
-        /**
-         * Sets the value of the international property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setInternational(Boolean value) {
-            this.international = value;
-        }
-
-        /**
-         * Gets the value of the prefix property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getPrefix() {
-            return prefix;
-        }
-
-        /**
-         * Sets the value of the prefix property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setPrefix(String value) {
-            this.prefix = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension 
base="&lt;urn:org:ebics:H004>NationalAccountNumberType">
-     *       &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class NationalAccountNumber {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "format", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        @XmlSchemaType(name = "token")
-        protected String format;
-
-        /**
-         * Datentyp für eine Kontonummer (freies Format).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the format property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getFormat() {
-            return format;
-        }
-
-        /**
-         * Sets the value of the format property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setFormat(String value) {
-            this.format = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>NationalBankCodeType">
-     *       &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class NationalBankCode {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "format", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        @XmlSchemaType(name = "token")
-        protected String format;
-
-        /**
-         * Datentyp für eine Bankleitzahl (freies Format).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the format property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getFormat() {
-            return format;
-        }
-
-        /**
-         * Sets the value of the format property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setFormat(String value) {
-            this.format = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AddressInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AddressInfoType.java
deleted file mode 100644
index 1c5c628..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AddressInfoType.java
+++ /dev/null
@@ -1,265 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for address information with regard to distributed signature 
(order types HKD, HTD).
- * 
- * <p>Java class for AddressInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="AddressInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="Name" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;element name="Street" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;element name="PostCode" 
type="{http://www.w3.org/2001/XMLSchema}token"; minOccurs="0"/>
- *         &lt;element name="City" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;element name="Region" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;element name="Country" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AddressInfoType", propOrder = {
-    "name",
-    "street",
-    "postCode",
-    "city",
-    "region",
-    "country",
-    "any"
-})
-public class AddressInfoType {
-
-    @XmlElement(name = "Name")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String name;
-    @XmlElement(name = "Street")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String street;
-    @XmlElement(name = "PostCode")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String postCode;
-    @XmlElement(name = "City")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String city;
-    @XmlElement(name = "Region")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String region;
-    @XmlElement(name = "Country")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String country;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the street property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStreet() {
-        return street;
-    }
-
-    /**
-     * Sets the value of the street property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStreet(String value) {
-        this.street = value;
-    }
-
-    /**
-     * Gets the value of the postCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPostCode() {
-        return postCode;
-    }
-
-    /**
-     * Sets the value of the postCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPostCode(String value) {
-        this.postCode = value;
-    }
-
-    /**
-     * Gets the value of the city property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCity() {
-        return city;
-    }
-
-    /**
-     * Sets the value of the city property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCity(String value) {
-        this.city = value;
-    }
-
-    /**
-     * Gets the value of the region property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRegion() {
-        return region;
-    }
-
-    /**
-     * Sets the value of the region property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRegion(String value) {
-        this.region = value;
-    }
-
-    /**
-     * Gets the value of the country property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCountry() {
-        return country;
-    }
-
-    /**
-     * Sets the value of the country property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCountry(String value) {
-        this.country = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AmountType.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AmountType.java
deleted file mode 100644
index 9781cc8..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AmountType.java
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.math.BigDecimal;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für einen Betrag inkl. Währungscode-Attribut (Default = "EUR").
- * 
- * <p>Java class for AmountType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="AmountType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;urn:org:ebics:H004>AmountValueType">
- *       &lt;attribute name="Currency" 
type="{urn:org:ebics:H004}CurrencyBaseType" default="EUR" />
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AmountType", propOrder = {
-    "value"
-})
-public class AmountType {
-
-    @XmlValue
-    protected BigDecimal value;
-    @XmlAttribute(name = "Currency")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String currency;
-
-    /**
-     * Datentyp für einen Betragswert (ohne Währung).
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setValue(BigDecimal value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the currency property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCurrency() {
-        if (currency == null) {
-            return "EUR";
-        } else {
-            return currency;
-        }
-    }
-
-    /**
-     * Sets the value of the currency property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCurrency(String value) {
-        this.currency = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AttributedAccountType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AttributedAccountType.java
deleted file mode 100644
index 25f6dfd..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AttributedAccountType.java
+++ /dev/null
@@ -1,967 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für Kontoinformationen inkl. der Eigenschaftszuordnung innerhalb 
einer Zahlungstransaktion.
- * 
- * <p>Java class for AttributedAccountType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="AttributedAccountType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;choice maxOccurs="2">
- *           &lt;element name="AccountNumber">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;urn:org:ebics:H004>AccountNumberType">
- *                   &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}AccountNumberRoleType" />
- *                   &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
- *                   &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *           &lt;element name="NationalAccountNumber">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;urn:org:ebics:H004>NationalAccountNumberType">
- *                   &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}AccountNumberRoleType" />
- *                   &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
- *                   &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *         &lt;/choice>
- *         &lt;choice maxOccurs="2">
- *           &lt;element name="BankCode">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension base="&lt;urn:org:ebics:H004>BankCodeType">
- *                   &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}BankCodeRoleType" />
- *                   &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
- *                   &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
- *                   &lt;attribute name="Prefix" 
type="{urn:org:ebics:H004}BankCodePrefixType" />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *           &lt;element name="NationalBankCode">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;urn:org:ebics:H004>NationalBankCodeType">
- *                   &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}BankCodeRoleType" />
- *                   &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
- *                   &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *         &lt;/choice>
- *         &lt;element name="AccountHolder" minOccurs="0">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension base="&lt;urn:org:ebics:H004>AccountHolderType">
- *                 &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}AccountHolderRoleType" />
- *                 &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *       &lt;attribute name="Currency" 
type="{urn:org:ebics:H004}CurrencyBaseType" default="EUR" />
- *       &lt;attribute name="Description" 
type="{urn:org:ebics:H004}AccountDescriptionType" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttributedAccountType", propOrder = {
-    "accountNumberOrNationalAccountNumber",
-    "bankCodeOrNationalBankCode",
-    "accountHolder"
-})
-@XmlSeeAlso({
-    HVTAccountInfoType.class
-})
-public class AttributedAccountType {
-
-    @XmlElements({
-        @XmlElement(name = "AccountNumber", type = 
AttributedAccountType.AccountNumber.class),
-        @XmlElement(name = "NationalAccountNumber", type = 
AttributedAccountType.NationalAccountNumber.class)
-    })
-    protected List<Object> accountNumberOrNationalAccountNumber;
-    @XmlElements({
-        @XmlElement(name = "BankCode", type = 
AttributedAccountType.BankCode.class),
-        @XmlElement(name = "NationalBankCode", type = 
AttributedAccountType.NationalBankCode.class)
-    })
-    protected List<Object> bankCodeOrNationalBankCode;
-    @XmlElement(name = "AccountHolder")
-    protected AttributedAccountType.AccountHolder accountHolder;
-    @XmlAttribute(name = "Currency")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String currency;
-    @XmlAttribute(name = "Description")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    protected String description;
-
-    /**
-     * Gets the value of the accountNumberOrNationalAccountNumber property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
accountNumberOrNationalAccountNumber property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAccountNumberOrNationalAccountNumber().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AttributedAccountType.AccountNumber }
-     * {@link AttributedAccountType.NationalAccountNumber }
-     * 
-     * 
-     */
-    public List<Object> getAccountNumberOrNationalAccountNumber() {
-        if (accountNumberOrNationalAccountNumber == null) {
-            accountNumberOrNationalAccountNumber = new ArrayList<Object>();
-        }
-        return this.accountNumberOrNationalAccountNumber;
-    }
-
-    /**
-     * Gets the value of the bankCodeOrNationalBankCode property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
bankCodeOrNationalBankCode property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getBankCodeOrNationalBankCode().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AttributedAccountType.BankCode }
-     * {@link AttributedAccountType.NationalBankCode }
-     * 
-     * 
-     */
-    public List<Object> getBankCodeOrNationalBankCode() {
-        if (bankCodeOrNationalBankCode == null) {
-            bankCodeOrNationalBankCode = new ArrayList<Object>();
-        }
-        return this.bankCodeOrNationalBankCode;
-    }
-
-    /**
-     * Gets the value of the accountHolder property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributedAccountType.AccountHolder }
-     *     
-     */
-    public AttributedAccountType.AccountHolder getAccountHolder() {
-        return accountHolder;
-    }
-
-    /**
-     * Sets the value of the accountHolder property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributedAccountType.AccountHolder }
-     *     
-     */
-    public void setAccountHolder(AttributedAccountType.AccountHolder value) {
-        this.accountHolder = value;
-    }
-
-    /**
-     * Gets the value of the currency property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCurrency() {
-        if (currency == null) {
-            return "EUR";
-        } else {
-            return currency;
-        }
-    }
-
-    /**
-     * Sets the value of the currency property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCurrency(String value) {
-        this.currency = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>AccountHolderType">
-     *       &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}AccountHolderRoleType" />
-     *       &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class AccountHolder {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "Role", required = true)
-        protected AccountHolderRoleType role;
-        @XmlAttribute(name = "Description")
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        @XmlSchemaType(name = "normalizedString")
-        protected String description;
-
-        /**
-         * Datentyp für den Namen des Kontoinhabers.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the role property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link AccountHolderRoleType }
-         *     
-         */
-        public AccountHolderRoleType getRole() {
-            return role;
-        }
-
-        /**
-         * Sets the value of the role property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link AccountHolderRoleType }
-         *     
-         */
-        public void setRole(AccountHolderRoleType value) {
-            this.role = value;
-        }
-
-        /**
-         * Gets the value of the description property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getDescription() {
-            return description;
-        }
-
-        /**
-         * Sets the value of the description property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setDescription(String value) {
-            this.description = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>AccountNumberType">
-     *       &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}AccountNumberRoleType" />
-     *       &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
-     *       &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class AccountNumber {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "Role", required = true)
-        protected AccountNumberRoleType role;
-        @XmlAttribute(name = "Description")
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        @XmlSchemaType(name = "normalizedString")
-        protected String description;
-        @XmlAttribute(name = "international")
-        protected Boolean international;
-
-        /**
-         * Datentyp für eine Kontonummer (national/international).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the role property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link AccountNumberRoleType }
-         *     
-         */
-        public AccountNumberRoleType getRole() {
-            return role;
-        }
-
-        /**
-         * Sets the value of the role property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link AccountNumberRoleType }
-         *     
-         */
-        public void setRole(AccountNumberRoleType value) {
-            this.role = value;
-        }
-
-        /**
-         * Gets the value of the description property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getDescription() {
-            return description;
-        }
-
-        /**
-         * Sets the value of the description property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setDescription(String value) {
-            this.description = value;
-        }
-
-        /**
-         * Gets the value of the international property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isInternational() {
-            if (international == null) {
-                return false;
-            } else {
-                return international;
-            }
-        }
-
-        /**
-         * Sets the value of the international property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setInternational(Boolean value) {
-            this.international = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>BankCodeType">
-     *       &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}BankCodeRoleType" />
-     *       &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
-     *       &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-     *       &lt;attribute name="Prefix" 
type="{urn:org:ebics:H004}BankCodePrefixType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class BankCode {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "Role", required = true)
-        protected BankCodeRoleType role;
-        @XmlAttribute(name = "Description")
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        @XmlSchemaType(name = "normalizedString")
-        protected String description;
-        @XmlAttribute(name = "international")
-        protected Boolean international;
-        @XmlAttribute(name = "Prefix")
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String prefix;
-
-        /**
-         * Datentyp für eine Bankleitzahl (national/international).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the role property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link BankCodeRoleType }
-         *     
-         */
-        public BankCodeRoleType getRole() {
-            return role;
-        }
-
-        /**
-         * Sets the value of the role property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BankCodeRoleType }
-         *     
-         */
-        public void setRole(BankCodeRoleType value) {
-            this.role = value;
-        }
-
-        /**
-         * Gets the value of the description property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getDescription() {
-            return description;
-        }
-
-        /**
-         * Sets the value of the description property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setDescription(String value) {
-            this.description = value;
-        }
-
-        /**
-         * Gets the value of the international property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isInternational() {
-            if (international == null) {
-                return false;
-            } else {
-                return international;
-            }
-        }
-
-        /**
-         * Sets the value of the international property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setInternational(Boolean value) {
-            this.international = value;
-        }
-
-        /**
-         * Gets the value of the prefix property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getPrefix() {
-            return prefix;
-        }
-
-        /**
-         * Sets the value of the prefix property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setPrefix(String value) {
-            this.prefix = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension 
base="&lt;urn:org:ebics:H004>NationalAccountNumberType">
-     *       &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}AccountNumberRoleType" />
-     *       &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
-     *       &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class NationalAccountNumber {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "Role", required = true)
-        protected AccountNumberRoleType role;
-        @XmlAttribute(name = "Description")
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        @XmlSchemaType(name = "normalizedString")
-        protected String description;
-        @XmlAttribute(name = "format", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        @XmlSchemaType(name = "token")
-        protected String format;
-
-        /**
-         * Datentyp für eine Kontonummer (freies Format).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the role property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link AccountNumberRoleType }
-         *     
-         */
-        public AccountNumberRoleType getRole() {
-            return role;
-        }
-
-        /**
-         * Sets the value of the role property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link AccountNumberRoleType }
-         *     
-         */
-        public void setRole(AccountNumberRoleType value) {
-            this.role = value;
-        }
-
-        /**
-         * Gets the value of the description property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getDescription() {
-            return description;
-        }
-
-        /**
-         * Sets the value of the description property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setDescription(String value) {
-            this.description = value;
-        }
-
-        /**
-         * Gets the value of the format property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getFormat() {
-            return format;
-        }
-
-        /**
-         * Sets the value of the format property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setFormat(String value) {
-            this.format = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>NationalBankCodeType">
-     *       &lt;attribute name="Role" use="required" 
type="{urn:org:ebics:H004}BankCodeRoleType" />
-     *       &lt;attribute name="Description" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; />
-     *       &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class NationalBankCode {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "Role", required = true)
-        protected BankCodeRoleType role;
-        @XmlAttribute(name = "Description")
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        @XmlSchemaType(name = "normalizedString")
-        protected String description;
-        @XmlAttribute(name = "format", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        @XmlSchemaType(name = "token")
-        protected String format;
-
-        /**
-         * Datentyp für eine Bankleitzahl (freies Format).
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the role property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link BankCodeRoleType }
-         *     
-         */
-        public BankCodeRoleType getRole() {
-            return role;
-        }
-
-        /**
-         * Sets the value of the role property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BankCodeRoleType }
-         *     
-         */
-        public void setRole(BankCodeRoleType value) {
-            this.role = value;
-        }
-
-        /**
-         * Gets the value of the description property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getDescription() {
-            return description;
-        }
-
-        /**
-         * Sets the value of the description property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setDescription(String value) {
-            this.description = value;
-        }
-
-        /**
-         * Gets the value of the format property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getFormat() {
-            return format;
-        }
-
-        /**
-         * Sets the value of the format property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setFormat(String value) {
-            this.format = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AuthOrderInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AuthOrderInfoType.java
deleted file mode 100644
index a483f91..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AuthOrderInfoType.java
+++ /dev/null
@@ -1,262 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for user permissions with regard to distributed signatures (order 
types HKD, HTD).
- * 
- * <p>Java class for AuthOrderInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="AuthOrderInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderType" 
type="{urn:org:ebics:H004}OrderTBaseType"/>
- *         &lt;element name="FileFormat" 
type="{urn:org:ebics:H004}FileFormatType" minOccurs="0"/>
- *         &lt;element name="TransferType" 
type="{urn:org:ebics:H004}TransferType"/>
- *         &lt;element name="OrderFormat" 
type="{urn:org:ebics:H004}OrderFormatType" minOccurs="0"/>
- *         &lt;element name="Description" 
type="{urn:org:ebics:H004}OrderDescriptionType"/>
- *         &lt;element name="NumSigRequired" 
type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"; minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AuthOrderInfoType", propOrder = {
-    "orderType",
-    "fileFormat",
-    "transferType",
-    "orderFormat",
-    "description",
-    "numSigRequired",
-    "any"
-})
-public class AuthOrderInfoType {
-
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "TransferType", required = true)
-    @XmlSchemaType(name = "token")
-    protected TransferType transferType;
-    @XmlElement(name = "OrderFormat")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderFormat;
-    @XmlElement(name = "Description", required = true)
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String description;
-    @XmlElement(name = "NumSigRequired", defaultValue = "0")
-    @XmlSchemaType(name = "nonNegativeInteger")
-    protected BigInteger numSigRequired;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the transferType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TransferType }
-     *     
-     */
-    public TransferType getTransferType() {
-        return transferType;
-    }
-
-    /**
-     * Sets the value of the transferType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TransferType }
-     *     
-     */
-    public void setTransferType(TransferType value) {
-        this.transferType = value;
-    }
-
-    /**
-     * Gets the value of the orderFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderFormat() {
-        return orderFormat;
-    }
-
-    /**
-     * Sets the value of the orderFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderFormat(String value) {
-        this.orderFormat = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the numSigRequired property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getNumSigRequired() {
-        return numSigRequired;
-    }
-
-    /**
-     * Sets the value of the numSigRequired property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setNumSigRequired(BigInteger value) {
-        this.numSigRequired = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AuthenticationCertificateInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AuthenticationCertificateInfoType.java
deleted file mode 100644
index d655cd4..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AuthenticationCertificateInfoType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Data type for public for identification and authentication.
- * 
- * <p>Java class for AuthenticationCertificateInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="AuthenticationCertificateInfoType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}CertificateInfoType">
- *       &lt;sequence>
- *         &lt;element name="AuthenticationVersion" 
type="{urn:org:ebics:H004}AuthenticationVersionType"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AuthenticationCertificateInfoType", propOrder = {
-    "authenticationVersion"
-})
-public class AuthenticationCertificateInfoType
-    extends CertificateInfoType
-{
-
-    @XmlElement(name = "AuthenticationVersion", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String authenticationVersion;
-
-    /**
-     * Gets the value of the authenticationVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAuthenticationVersion() {
-        return authenticationVersion;
-    }
-
-    /**
-     * Sets the value of the authenticationVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAuthenticationVersion(String value) {
-        this.authenticationVersion = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AuthenticationPubKeyInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AuthenticationPubKeyInfoType.java
deleted file mode 100644
index ab73e65..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AuthenticationPubKeyInfoType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für öffentlichen Authentfikationsschlüssel.
- * 
- * <p>Java class for AuthenticationPubKeyInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="AuthenticationPubKeyInfoType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}PubKeyInfoType">
- *       &lt;sequence>
- *         &lt;element name="AuthenticationVersion" 
type="{urn:org:ebics:H004}AuthenticationVersionType"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AuthenticationPubKeyInfoType", propOrder = {
-    "authenticationVersion"
-})
-public class AuthenticationPubKeyInfoType
-    extends PubKeyInfoTypeAtEbicsTypes
-{
-
-    @XmlElement(name = "AuthenticationVersion", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String authenticationVersion;
-
-    /**
-     * Gets the value of the authenticationVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAuthenticationVersion() {
-        return authenticationVersion;
-    }
-
-    /**
-     * Sets the value of the authenticationVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAuthenticationVersion(String value) {
-        this.authenticationVersion = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AuthorisationLevelType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AuthorisationLevelType.java
deleted file mode 100644
index 2495baf..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/AuthorisationLevelType.java
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for AuthorisationLevelType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="AuthorisationLevelType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token";>
- *     &lt;length value="1"/>
- *     &lt;enumeration value="E"/>
- *     &lt;enumeration value="A"/>
- *     &lt;enumeration value="B"/>
- *     &lt;enumeration value="T"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "AuthorisationLevelType")
-@XmlEnum
-public enum AuthorisationLevelType {
-
-
-    /**
-     * Einzelunterschrift
-     * 
-     */
-    E,
-
-    /**
-     * Erstunterschrift
-     * 
-     */
-    A,
-
-    /**
-     * Zweitunterschrift
-     * 
-     */
-    B,
-
-    /**
-     * Transportunterschrift
-     * 
-     */
-    T;
-
-    public String value() {
-        return name();
-    }
-
-    public static AuthorisationLevelType fromValue(String v) {
-        return valueOf(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/BankCodeRoleType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/BankCodeRoleType.java
deleted file mode 100644
index f11b4dd..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/BankCodeRoleType.java
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for BankCodeRoleType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="BankCodeRoleType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token";>
- *     &lt;enumeration value="Originator"/>
- *     &lt;enumeration value="Recipient"/>
- *     &lt;enumeration value="Correspondent"/>
- *     &lt;enumeration value="Other"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "BankCodeRoleType")
-@XmlEnum
-public enum BankCodeRoleType {
-
-
-    /**
-     * Auftraggeberbank
-     * 
-     */
-    @XmlEnumValue("Originator")
-    ORIGINATOR("Originator"),
-
-    /**
-     * Empfängerbank
-     * 
-     */
-    @XmlEnumValue("Recipient")
-    RECIPIENT("Recipient"),
-
-    /**
-     * Korrespondenzbank
-     * 
-     */
-    @XmlEnumValue("Correspondent")
-    CORRESPONDENT("Correspondent"),
-
-    /**
-     * andere Bankrolle
-     * 
-     */
-    @XmlEnumValue("Other")
-    OTHER("Other");
-    private final String value;
-
-    BankCodeRoleType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static BankCodeRoleType fromValue(String v) {
-        for (BankCodeRoleType c: BankCodeRoleType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/BankInfoType.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/BankInfoType.java
deleted file mode 100644
index e3c8973..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/BankInfoType.java
+++ /dev/null
@@ -1,147 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für VEU-Kreditinstitutsinformationen (HKD, HTD).
- * 
- * <p>Java class for BankInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="BankInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="HostID" type="{urn:org:ebics:H004}HostIDType"/>
- *         &lt;element ref="{urn:org:ebics:H004}Parameter" 
maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BankInfoType", propOrder = {
-    "hostID",
-    "parameter",
-    "any"
-})
-public class BankInfoType {
-
-    @XmlElement(name = "HostID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String hostID;
-    @XmlElement(name = "Parameter")
-    protected List<Parameter> parameter;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the hostID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getHostID() {
-        return hostID;
-    }
-
-    /**
-     * Sets the value of the hostID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setHostID(String value) {
-        this.hostID = value;
-    }
-
-    /**
-     * Gets the value of the parameter property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the parameter 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getParameter().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Parameter }
-     * 
-     * 
-     */
-    public List<Parameter> getParameter() {
-        if (parameter == null) {
-            parameter = new ArrayList<Parameter>();
-        }
-        return this.parameter;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/BankSignatureDataSigBookType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/BankSignatureDataSigBookType.java
deleted file mode 100644
index fc94afb..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/BankSignatureDataSigBookType.java
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for digital signature data transferred using EBICS.
- * 
- * <p>Java class for BankSignatureDataSigBookType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="BankSignatureDataSigBookType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderSignature" maxOccurs="0" minOccurs="0">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension base="&lt;urn:org:ebics:H004>SignatureType">
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BankSignatureDataSigBookType", propOrder = {
-    "any"
-})
-public class BankSignatureDataSigBookType {
-
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>SignatureType">
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class OrderSignature {
-
-        @XmlValue
-        protected byte[] value;
-
-        /**
-         * Datentyp für kryptographische Unterschriften.
-         * 
-         * @return
-         *     possible object is
-         *     byte[]
-         */
-        public byte[] getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     byte[]
-         */
-        public void setValue(byte[] value) {
-            this.value = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/CanonicalizationMethodType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/CanonicalizationMethodType.java
deleted file mode 100644
index 75b5b1a..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/CanonicalizationMethodType.java
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CanonicalizationMethodType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="CanonicalizationMethodType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;any maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Algorithm" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CanonicalizationMethodType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class CanonicalizationMethodType {
-
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Algorithm", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String algorithm;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-    /**
-     * Gets the value of the algorithm property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAlgorithm() {
-        return algorithm;
-    }
-
-    /**
-     * Sets the value of the algorithm property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAlgorithm(String value) {
-        this.algorithm = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/CertificateInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/CertificateInfoType.java
deleted file mode 100644
index ed35317..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/CertificateInfoType.java
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Data Type for Certificates for the bank-technical signature for 
authorisation (ES)
- * 
- * <p>Java class for CertificateInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="CertificateInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CertificateInfoType", propOrder = {
-    "x509Data",
-    "any"
-})
-@XmlSeeAlso({
-    AuthenticationCertificateInfoType.class,
-    EncryptionCertificateInfoType.class,
-    SignatureCertificateInfoType.class
-})
-public class CertificateInfoType {
-
-    @XmlElement(name = "X509Data", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, required = true)
-    protected X509DataType x509Data;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the x509Data property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link X509DataType }
-     *     
-     */
-    public X509DataType getX509Data() {
-        return x509Data;
-    }
-
-    /**
-     * Sets the value of the x509Data property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link X509DataType }
-     *     
-     */
-    public void setX509Data(X509DataType value) {
-        this.x509Data = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/CurrencyCode.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/CurrencyCode.java
deleted file mode 100644
index cbf6d1b..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/CurrencyCode.java
+++ /dev/null
@@ -1,1183 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CurrencyCode.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="CurrencyCode">
- *   &lt;restriction base="{urn:org:ebics:H004}CurrencyBaseType">
- *     &lt;length value="3"/>
- *     &lt;enumeration value="AFN"/>
- *     &lt;enumeration value="ALL"/>
- *     &lt;enumeration value="AMD"/>
- *     &lt;enumeration value="ANG"/>
- *     &lt;enumeration value="AOA"/>
- *     &lt;enumeration value="ARS"/>
- *     &lt;enumeration value="AUD"/>
- *     &lt;enumeration value="AWG"/>
- *     &lt;enumeration value="AZM"/>
- *     &lt;enumeration value="BAM"/>
- *     &lt;enumeration value="BBD"/>
- *     &lt;enumeration value="BDT"/>
- *     &lt;enumeration value="BGN"/>
- *     &lt;enumeration value="BHD"/>
- *     &lt;enumeration value="BMD"/>
- *     &lt;enumeration value="BND"/>
- *     &lt;enumeration value="BOB"/>
- *     &lt;enumeration value="BRL"/>
- *     &lt;enumeration value="BSD"/>
- *     &lt;enumeration value="BTN"/>
- *     &lt;enumeration value="BWP"/>
- *     &lt;enumeration value="BYR"/>
- *     &lt;enumeration value="BZD"/>
- *     &lt;enumeration value="CAD"/>
- *     &lt;enumeration value="CDF"/>
- *     &lt;enumeration value="CHF"/>
- *     &lt;enumeration value="CLP"/>
- *     &lt;enumeration value="CNY"/>
- *     &lt;enumeration value="COP"/>
- *     &lt;enumeration value="CRC"/>
- *     &lt;enumeration value="CSD"/>
- *     &lt;enumeration value="CUP"/>
- *     &lt;enumeration value="CVE"/>
- *     &lt;enumeration value="CYP"/>
- *     &lt;enumeration value="CZK"/>
- *     &lt;enumeration value="DJV"/>
- *     &lt;enumeration value="DKK"/>
- *     &lt;enumeration value="DOP"/>
- *     &lt;enumeration value="DZD"/>
- *     &lt;enumeration value="ECS"/>
- *     &lt;enumeration value="EEK"/>
- *     &lt;enumeration value="EGP"/>
- *     &lt;enumeration value="ETB"/>
- *     &lt;enumeration value="EUR"/>
- *     &lt;enumeration value="FJD"/>
- *     &lt;enumeration value="FKP"/>
- *     &lt;enumeration value="GBP"/>
- *     &lt;enumeration value="GEL"/>
- *     &lt;enumeration value="GHC"/>
- *     &lt;enumeration value="GIP"/>
- *     &lt;enumeration value="GMD"/>
- *     &lt;enumeration value="GNF"/>
- *     &lt;enumeration value="GTQ"/>
- *     &lt;enumeration value="GYD"/>
- *     &lt;enumeration value="HKD"/>
- *     &lt;enumeration value="HNL"/>
- *     &lt;enumeration value="HRK"/>
- *     &lt;enumeration value="HTG"/>
- *     &lt;enumeration value="HUF"/>
- *     &lt;enumeration value="IDR"/>
- *     &lt;enumeration value="ILS"/>
- *     &lt;enumeration value="INR"/>
- *     &lt;enumeration value="IQD"/>
- *     &lt;enumeration value="IRR"/>
- *     &lt;enumeration value="ISK"/>
- *     &lt;enumeration value="JMD"/>
- *     &lt;enumeration value="JOD"/>
- *     &lt;enumeration value="JPY"/>
- *     &lt;enumeration value="KES"/>
- *     &lt;enumeration value="KGS"/>
- *     &lt;enumeration value="KHR"/>
- *     &lt;enumeration value="KMF"/>
- *     &lt;enumeration value="KPW"/>
- *     &lt;enumeration value="KRW"/>
- *     &lt;enumeration value="KWD"/>
- *     &lt;enumeration value="KYD"/>
- *     &lt;enumeration value="KZT"/>
- *     &lt;enumeration value="LAK"/>
- *     &lt;enumeration value="LBP"/>
- *     &lt;enumeration value="LKR"/>
- *     &lt;enumeration value="LRD"/>
- *     &lt;enumeration value="LSL"/>
- *     &lt;enumeration value="LTL"/>
- *     &lt;enumeration value="LVL"/>
- *     &lt;enumeration value="LYD"/>
- *     &lt;enumeration value="MAD"/>
- *     &lt;enumeration value="MDL"/>
- *     &lt;enumeration value="MGF"/>
- *     &lt;enumeration value="MKD"/>
- *     &lt;enumeration value="MMK"/>
- *     &lt;enumeration value="MNT"/>
- *     &lt;enumeration value="MOP"/>
- *     &lt;enumeration value="MRO"/>
- *     &lt;enumeration value="MTL"/>
- *     &lt;enumeration value="MUR"/>
- *     &lt;enumeration value="MVR"/>
- *     &lt;enumeration value="MWK"/>
- *     &lt;enumeration value="MXN"/>
- *     &lt;enumeration value="MYR"/>
- *     &lt;enumeration value="MZM"/>
- *     &lt;enumeration value="NAD"/>
- *     &lt;enumeration value="NGN"/>
- *     &lt;enumeration value="NIO"/>
- *     &lt;enumeration value="NOK"/>
- *     &lt;enumeration value="NPR"/>
- *     &lt;enumeration value="NZD"/>
- *     &lt;enumeration value="OMR"/>
- *     &lt;enumeration value="PAB"/>
- *     &lt;enumeration value="PEN"/>
- *     &lt;enumeration value="PGK"/>
- *     &lt;enumeration value="PHP"/>
- *     &lt;enumeration value="PKR"/>
- *     &lt;enumeration value="PLN"/>
- *     &lt;enumeration value="PYG"/>
- *     &lt;enumeration value="QAR"/>
- *     &lt;enumeration value="ROL"/>
- *     &lt;enumeration value="RUB"/>
- *     &lt;enumeration value="RWF"/>
- *     &lt;enumeration value="SAR"/>
- *     &lt;enumeration value="SBD"/>
- *     &lt;enumeration value="SCR"/>
- *     &lt;enumeration value="SDD"/>
- *     &lt;enumeration value="SEK"/>
- *     &lt;enumeration value="SGD"/>
- *     &lt;enumeration value="SHP"/>
- *     &lt;enumeration value="SIT"/>
- *     &lt;enumeration value="SKK"/>
- *     &lt;enumeration value="SLL"/>
- *     &lt;enumeration value="SOS"/>
- *     &lt;enumeration value="SRD"/>
- *     &lt;enumeration value="STD"/>
- *     &lt;enumeration value="SVC"/>
- *     &lt;enumeration value="SYP"/>
- *     &lt;enumeration value="SZL"/>
- *     &lt;enumeration value="THB"/>
- *     &lt;enumeration value="TJS"/>
- *     &lt;enumeration value="TMM"/>
- *     &lt;enumeration value="TND"/>
- *     &lt;enumeration value="TOP"/>
- *     &lt;enumeration value="TRL"/>
- *     &lt;enumeration value="TRY"/>
- *     &lt;enumeration value="TTD"/>
- *     &lt;enumeration value="TWD"/>
- *     &lt;enumeration value="TZS"/>
- *     &lt;enumeration value="UAH"/>
- *     &lt;enumeration value="UGX"/>
- *     &lt;enumeration value="USD"/>
- *     &lt;enumeration value="UYU"/>
- *     &lt;enumeration value="UZS"/>
- *     &lt;enumeration value="VEB"/>
- *     &lt;enumeration value="VND"/>
- *     &lt;enumeration value="VUV"/>
- *     &lt;enumeration value="WST"/>
- *     &lt;enumeration value="XAF"/>
- *     &lt;enumeration value="XCD"/>
- *     &lt;enumeration value="XOF"/>
- *     &lt;enumeration value="XPF"/>
- *     &lt;enumeration value="XTS"/>
- *     &lt;enumeration value="XXX"/>
- *     &lt;enumeration value="YER"/>
- *     &lt;enumeration value="ZAR"/>
- *     &lt;enumeration value="ZMK"/>
- *     &lt;enumeration value="ZWD"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "CurrencyCode")
-@XmlEnum
-public enum CurrencyCode {
-
-
-    /**
-     * Afghanistan: Afghani
-     * 
-     */
-    AFN,
-
-    /**
-     * Albanien: Lek
-     * 
-     */
-    ALL,
-
-    /**
-     * Armenien: Dram
-     * 
-     */
-    AMD,
-
-    /**
-     * Niederländische Antillen: Gulden
-     * 
-     */
-    ANG,
-
-    /**
-     * Angola: Kwanza
-     * 
-     */
-    AOA,
-
-    /**
-     * Argentinien: Peso
-     * 
-     */
-    ARS,
-
-    /**
-     * Australien: Dollar
-     * 
-     */
-    AUD,
-
-    /**
-     * Aruba: Florin
-     * 
-     */
-    AWG,
-
-    /**
-     * Aserbaidschan: Manat
-     * 
-     */
-    AZM,
-
-    /**
-     * Bosnien und Herzegowina: Konvertible Mark
-     * 
-     */
-    BAM,
-
-    /**
-     * Barbados: Dollar
-     * 
-     */
-    BBD,
-
-    /**
-     * Bangladesch: Taka
-     * 
-     */
-    BDT,
-
-    /**
-     * Bulgarien: Lew
-     * 
-     */
-    BGN,
-
-    /**
-     * Bahrain: Dinar
-     * 
-     */
-    BHD,
-
-    /**
-     * Bermuda: Dollar
-     * 
-     */
-    BMD,
-
-    /**
-     * Brunei: Dollar
-     * 
-     */
-    BND,
-
-    /**
-     * Bolivien: Boliviano
-     * 
-     */
-    BOB,
-
-    /**
-     * Brasilien: Real
-     * 
-     */
-    BRL,
-
-    /**
-     * Bahamas: Dollar
-     * 
-     */
-    BSD,
-
-    /**
-     * Bhutan: Ngultrum
-     * 
-     */
-    BTN,
-
-    /**
-     * Botswana: Pula
-     * 
-     */
-    BWP,
-
-    /**
-     * Weißrussland (Belarus): Rubel
-     * 
-     */
-    BYR,
-
-    /**
-     * Belize: Dollar
-     * 
-     */
-    BZD,
-
-    /**
-     * Kanada: Dollar
-     * 
-     */
-    CAD,
-
-    /**
-     * Demokratische Republik Kongo: Franc
-     * 
-     */
-    CDF,
-
-    /**
-     * Schweiz: Franken
-     * 
-     */
-    CHF,
-
-    /**
-     * Chile: Peso
-     * 
-     */
-    CLP,
-
-    /**
-     * China (Volksrepublik): Renminbi Yuan
-     * 
-     */
-    CNY,
-
-    /**
-     * Kolumbien: Peso
-     * 
-     */
-    COP,
-
-    /**
-     * Costa Rica: Colón
-     * 
-     */
-    CRC,
-
-    /**
-     * Serbien: Dinar
-     * 
-     */
-    CSD,
-
-    /**
-     * Kuba: Peso
-     * 
-     */
-    CUP,
-
-    /**
-     * Kap Verde: Escudo
-     * 
-     */
-    CVE,
-
-    /**
-     * Zypern (griechischer Teil): Pfund
-     * 
-     */
-    CYP,
-
-    /**
-     * Tschechien: Krone
-     * 
-     */
-    CZK,
-
-    /**
-     * Dschibuti: Franc
-     * 
-     */
-    DJV,
-
-    /**
-     * Dänemark: Krone
-     * 
-     */
-    DKK,
-
-    /**
-     * Dominikanische Republik: Peso
-     * 
-     */
-    DOP,
-
-    /**
-     * Algerien: Dinar
-     * 
-     */
-    DZD,
-
-    /**
-     * Ecuador (bis 2000): Sucre
-     * 
-     */
-    ECS,
-
-    /**
-     * Estland: Krone
-     * 
-     */
-    EEK,
-
-    /**
-     * Ägypten: Pfund
-     * 
-     */
-    EGP,
-
-    /**
-     * Äthiopien: Birr
-     * 
-     */
-    ETB,
-
-    /**
-     * Europäische Währungsunion: Euro
-     * 
-     */
-    EUR,
-
-    /**
-     * Fidschi: Dollar
-     * 
-     */
-    FJD,
-
-    /**
-     * Falklandinseln: Pfund
-     * 
-     */
-    FKP,
-
-    /**
-     * Vereinigtes Königreich: Pfund
-     * 
-     */
-    GBP,
-
-    /**
-     * Georgien: Lari
-     * 
-     */
-    GEL,
-
-    /**
-     * Ghana: Cedi
-     * 
-     */
-    GHC,
-
-    /**
-     * Gibraltar: Pfund
-     * 
-     */
-    GIP,
-
-    /**
-     * Gambia: Dalasi
-     * 
-     */
-    GMD,
-
-    /**
-     * Guinea: Franc
-     * 
-     */
-    GNF,
-
-    /**
-     * Guatemala: Quetzal
-     * 
-     */
-    GTQ,
-
-    /**
-     * Guyana: Dollar
-     * 
-     */
-    GYD,
-
-    /**
-     * Hongkong: Dollar
-     * 
-     */
-    HKD,
-
-    /**
-     * Honduras: Lempira
-     * 
-     */
-    HNL,
-
-    /**
-     * Kroatien: Kuna
-     * 
-     */
-    HRK,
-
-    /**
-     * Haiti: Gourde
-     * 
-     */
-    HTG,
-
-    /**
-     * Ungarn: Forint
-     * 
-     */
-    HUF,
-
-    /**
-     * Indonesien: Rupiah
-     * 
-     */
-    IDR,
-
-    /**
-     * Israel: Schekel
-     * 
-     */
-    ILS,
-
-    /**
-     * Indien: Rupie
-     * 
-     */
-    INR,
-
-    /**
-     * Irak: Dinar
-     * 
-     */
-    IQD,
-
-    /**
-     * Iran: Rial
-     * 
-     */
-    IRR,
-
-    /**
-     * Island: Krone
-     * 
-     */
-    ISK,
-
-    /**
-     * Jamaika: Dollar
-     * 
-     */
-    JMD,
-
-    /**
-     * Jordanien: Dinar
-     * 
-     */
-    JOD,
-
-    /**
-     * Japan: Yen
-     * 
-     */
-    JPY,
-
-    /**
-     * Kenia: Schilling
-     * 
-     */
-    KES,
-
-    /**
-     * Kirgisistan: Som
-     * 
-     */
-    KGS,
-
-    /**
-     * Kambodscha: Riel
-     * 
-     */
-    KHR,
-
-    /**
-     * Komoren: Franc
-     * 
-     */
-    KMF,
-
-    /**
-     * Nordkorea: Won
-     * 
-     */
-    KPW,
-
-    /**
-     * Südkorea: Won
-     * 
-     */
-    KRW,
-
-    /**
-     * Kuwait: Dinar
-     * 
-     */
-    KWD,
-
-    /**
-     * Kaimaninseln: Dollar
-     * 
-     */
-    KYD,
-
-    /**
-     * Kasachstan: Tenge
-     * 
-     */
-    KZT,
-
-    /**
-     * Laos: Kip
-     * 
-     */
-    LAK,
-
-    /**
-     * Libanon: Pfund
-     * 
-     */
-    LBP,
-
-    /**
-     * Sri Lanka: Rupie
-     * 
-     */
-    LKR,
-
-    /**
-     * Liberia: Dollar
-     * 
-     */
-    LRD,
-
-    /**
-     * Lesotho: Loti
-     * 
-     */
-    LSL,
-
-    /**
-     * Litauen: Litas
-     * 
-     */
-    LTL,
-
-    /**
-     * Lettland: Lats
-     * 
-     */
-    LVL,
-
-    /**
-     * Libyen: Dinar
-     * 
-     */
-    LYD,
-
-    /**
-     * Marokko: Dirham
-     * 
-     */
-    MAD,
-
-    /**
-     * Moldawien: Leu
-     * 
-     */
-    MDL,
-
-    /**
-     * Madagaskar: Franc
-     * 
-     */
-    MGF,
-
-    /**
-     * Mazedonien: Denar
-     * 
-     */
-    MKD,
-
-    /**
-     * Myanmar: Kyat
-     * 
-     */
-    MMK,
-
-    /**
-     * Mongolei: Tugrik
-     * 
-     */
-    MNT,
-
-    /**
-     * Macau: Pataca
-     * 
-     */
-    MOP,
-
-    /**
-     * Mauretanien: Ouguiya
-     * 
-     */
-    MRO,
-
-    /**
-     * Malta: Lira
-     * 
-     */
-    MTL,
-
-    /**
-     * Mauritius: Rupie
-     * 
-     */
-    MUR,
-
-    /**
-     * Malediven: Rufiyaa
-     * 
-     */
-    MVR,
-
-    /**
-     * Malawi: Kwacha
-     * 
-     */
-    MWK,
-
-    /**
-     * Mexiko: Peso
-     * 
-     */
-    MXN,
-
-    /**
-     * Malaysia: Ringgit
-     * 
-     */
-    MYR,
-
-    /**
-     * Mosambik: Metical
-     * 
-     */
-    MZM,
-
-    /**
-     * Namibia: Dollar
-     * 
-     */
-    NAD,
-
-    /**
-     * Nigeria: Naira
-     * 
-     */
-    NGN,
-
-    /**
-     * Nicaragua: Cordoba Oro
-     * 
-     */
-    NIO,
-
-    /**
-     * Norwegen: Krone
-     * 
-     */
-    NOK,
-
-    /**
-     * Nepal: Rupie
-     * 
-     */
-    NPR,
-
-    /**
-     * Neuseeland: Dollar
-     * 
-     */
-    NZD,
-
-    /**
-     * Oman: Rial
-     * 
-     */
-    OMR,
-
-    /**
-     * Panama: Balboa
-     * 
-     */
-    PAB,
-
-    /**
-     * Peru: Nuevo Sol
-     * 
-     */
-    PEN,
-
-    /**
-     * Papua-Neuguinea: Kina
-     * 
-     */
-    PGK,
-
-    /**
-     * Philippinen: Peso
-     * 
-     */
-    PHP,
-
-    /**
-     * Pakistan: Rupie
-     * 
-     */
-    PKR,
-
-    /**
-     * Polen: Zloty
-     * 
-     */
-    PLN,
-
-    /**
-     * Paraguay: Guaraní
-     * 
-     */
-    PYG,
-
-    /**
-     * Katar: Riyal
-     * 
-     */
-    QAR,
-
-    /**
-     * Rumänien: Leu
-     * 
-     */
-    ROL,
-
-    /**
-     * Russland: Rubel
-     * 
-     */
-    RUB,
-
-    /**
-     * Ruanda: Franc
-     * 
-     */
-    RWF,
-
-    /**
-     * Saudi-Arabien: Riyal
-     * 
-     */
-    SAR,
-
-    /**
-     * Salomonen: Dollar
-     * 
-     */
-    SBD,
-
-    /**
-     * Seychellen: Rupie
-     * 
-     */
-    SCR,
-
-    /**
-     * Sudan: Dinar
-     * 
-     */
-    SDD,
-
-    /**
-     * Schweden: Krone
-     * 
-     */
-    SEK,
-
-    /**
-     * Singapur: Dollar
-     * 
-     */
-    SGD,
-
-    /**
-     * St. Helena: Pfund
-     * 
-     */
-    SHP,
-
-    /**
-     * Slowenien: Tolar
-     * 
-     */
-    SIT,
-
-    /**
-     * Slowakei: Krone
-     * 
-     */
-    SKK,
-
-    /**
-     * Sierra Leone: Leone
-     * 
-     */
-    SLL,
-
-    /**
-     * Somalia: Schilling
-     * 
-     */
-    SOS,
-
-    /**
-     * Suriname: Dollar
-     * 
-     */
-    SRD,
-
-    /**
-     * São Tomé und Príncipe: Dobra
-     * 
-     */
-    STD,
-
-    /**
-     * El Salvador: Colón
-     * 
-     */
-    SVC,
-
-    /**
-     * Syrien: Pfund
-     * 
-     */
-    SYP,
-
-    /**
-     * Swasiland: Lilangeni
-     * 
-     */
-    SZL,
-
-    /**
-     * Thailand: Baht
-     * 
-     */
-    THB,
-
-    /**
-     * Tadschikistan: Somoni
-     * 
-     */
-    TJS,
-
-    /**
-     * Turkmenistan: Manat
-     * 
-     */
-    TMM,
-
-    /**
-     * Tunesien: Dinar
-     * 
-     */
-    TND,
-
-    /**
-     * Tonga: Pa'anga
-     * 
-     */
-    TOP,
-
-    /**
-     * Türkei: Lira
-     * 
-     */
-    TRL,
-
-    /**
-     * Türkei: Neue Lira (ab 2005)
-     * 
-     */
-    TRY,
-
-    /**
-     * Trinidad und Tobago: Dollar
-     * 
-     */
-    TTD,
-
-    /**
-     * Taiwan: Dollar
-     * 
-     */
-    TWD,
-
-    /**
-     * Tansania: Schilling
-     * 
-     */
-    TZS,
-
-    /**
-     * Ukraine: Hrywnja
-     * 
-     */
-    UAH,
-
-    /**
-     * Uganda: Shilling
-     * 
-     */
-    UGX,
-
-    /**
-     * USA: Dollar
-     * 
-     */
-    USD,
-
-    /**
-     * Uruguay: Peso
-     * 
-     */
-    UYU,
-
-    /**
-     * Usbekistan: Sum
-     * 
-     */
-    UZS,
-
-    /**
-     * Venezuela: Bolivar
-     * 
-     */
-    VEB,
-
-    /**
-     * Vietnam: Dong
-     * 
-     */
-    VND,
-
-    /**
-     * Vanuatu: Vatu
-     * 
-     */
-    VUV,
-
-    /**
-     * Samoa: Tala
-     * 
-     */
-    WST,
-
-    /**
-     * Zentralafrikanische Wirtschafts- und Währungsunion: CFA-Franc
-     * 
-     */
-    XAF,
-
-    /**
-     * Ostkaribische Währungsunion: Dollar
-     * 
-     */
-    XCD,
-
-    /**
-     * Westafrikanische Wirtschafts- und Währungsunion: CFA-Franc
-     * 
-     */
-    XOF,
-
-    /**
-     * Neukaledonien: CFP-Franc
-     * 
-     */
-    XPF,
-
-    /**
-     * Spezialcode für Testzwecke; keine existierende Währung
-     * 
-     */
-    XTS,
-
-    /**
-     * keine Währung
-     * 
-     */
-    XXX,
-
-    /**
-     * Jemen: Rial
-     * 
-     */
-    YER,
-
-    /**
-     * Südafrika: Rand
-     * 
-     */
-    ZAR,
-
-    /**
-     * Sambia: Kwacha
-     * 
-     */
-    ZMK,
-
-    /**
-     * Simbabwe: Dollar
-     * 
-     */
-    ZWD;
-
-    public String value() {
-        return name();
-    }
-
-    public static CurrencyCode fromValue(String v) {
-        return valueOf(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/DSAKeyValueType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/DSAKeyValueType.java
deleted file mode 100644
index ce8d06b..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/DSAKeyValueType.java
+++ /dev/null
@@ -1,227 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for DSAKeyValueType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="DSAKeyValueType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;sequence minOccurs="0">
- *           &lt;element name="P" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *           &lt;element name="Q" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         &lt;/sequence>
- *         &lt;element name="G" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"; minOccurs="0"/>
- *         &lt;element name="Y" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         &lt;element name="J" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"; minOccurs="0"/>
- *         &lt;sequence minOccurs="0">
- *           &lt;element name="Seed" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *           &lt;element name="PgenCounter" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         &lt;/sequence>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DSAKeyValueType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "p",
-    "q",
-    "g",
-    "y",
-    "j",
-    "seed",
-    "pgenCounter"
-})
-public class DSAKeyValueType {
-
-    @XmlElement(name = "P")
-    protected byte[] p;
-    @XmlElement(name = "Q")
-    protected byte[] q;
-    @XmlElement(name = "G")
-    protected byte[] g;
-    @XmlElement(name = "Y", required = true)
-    protected byte[] y;
-    @XmlElement(name = "J")
-    protected byte[] j;
-    @XmlElement(name = "Seed")
-    protected byte[] seed;
-    @XmlElement(name = "PgenCounter")
-    protected byte[] pgenCounter;
-
-    /**
-     * Gets the value of the p property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getP() {
-        return p;
-    }
-
-    /**
-     * Sets the value of the p property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setP(byte[] value) {
-        this.p = value;
-    }
-
-    /**
-     * Gets the value of the q property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getQ() {
-        return q;
-    }
-
-    /**
-     * Sets the value of the q property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setQ(byte[] value) {
-        this.q = value;
-    }
-
-    /**
-     * Gets the value of the g property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getG() {
-        return g;
-    }
-
-    /**
-     * Sets the value of the g property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setG(byte[] value) {
-        this.g = value;
-    }
-
-    /**
-     * Gets the value of the y property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getY() {
-        return y;
-    }
-
-    /**
-     * Sets the value of the y property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setY(byte[] value) {
-        this.y = value;
-    }
-
-    /**
-     * Gets the value of the j property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getJ() {
-        return j;
-    }
-
-    /**
-     * Sets the value of the j property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setJ(byte[] value) {
-        this.j = value;
-    }
-
-    /**
-     * Gets the value of the seed property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getSeed() {
-        return seed;
-    }
-
-    /**
-     * Sets the value of the seed property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setSeed(byte[] value) {
-        this.seed = value;
-    }
-
-    /**
-     * Gets the value of the pgenCounter property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getPgenCounter() {
-        return pgenCounter;
-    }
-
-    /**
-     * Sets the value of the pgenCounter property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setPgenCounter(byte[] value) {
-        this.pgenCounter = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/DataDigestType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/DataDigestType.java
deleted file mode 100644
index f7d2a0a..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/DataDigestType.java
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for DataDigestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="DataDigestType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;urn:org:ebics:H004>DigestType">
- *       &lt;attribute name="SignatureVersion" 
type="{urn:org:ebics:H004}SignatureVersionType" default="A004" />
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DataDigestType", propOrder = {
-    "value"
-})
-public class DataDigestType {
-
-    @XmlValue
-    protected byte[] value;
-    @XmlAttribute(name = "SignatureVersion")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String signatureVersion;
-
-    /**
-     * Datentyp für Hashwerte.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setValue(byte[] value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the signatureVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSignatureVersion() {
-        if (signatureVersion == null) {
-            return "A004";
-        } else {
-            return signatureVersion;
-        }
-    }
-
-    /**
-     * Sets the value of the signatureVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSignatureVersion(String value) {
-        this.signatureVersion = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/DataEncryptionInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/DataEncryptionInfoType.java
deleted file mode 100644
index 0505d15..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/DataEncryptionInfoType.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for the modelling of information regarding the encryption of 
signature and order data.
- * 
- * <p>Java class for DataEncryptionInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="DataEncryptionInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="EncryptionPubKeyDigest">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension base="&lt;urn:org:ebics:H004>PubKeyDigestType">
- *                 &lt;attribute name="Version" use="required" 
type="{urn:org:ebics:H004}EncryptionVersionType" />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="TransactionKey" 
type="{urn:org:ebics:H004}SymmetricKeyType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DataEncryptionInfoType", propOrder = {
-    "encryptionPubKeyDigest",
-    "transactionKey",
-    "any"
-})
-@XmlSeeAlso({
-    
tech.libeufin.messages.ebics.response.DataTransferRequestType.DataEncryptionInfo.class,
-    
tech.libeufin.messages.ebics.response.DataTransferResponseType.DataEncryptionInfo.class
-})
-public class DataEncryptionInfoType {
-
-    @XmlElement(name = "EncryptionPubKeyDigest", required = true)
-    protected DataEncryptionInfoType.EncryptionPubKeyDigest 
encryptionPubKeyDigest;
-    @XmlElement(name = "TransactionKey", required = true)
-    protected byte[] transactionKey;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the encryptionPubKeyDigest property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataEncryptionInfoType.EncryptionPubKeyDigest }
-     *     
-     */
-    public DataEncryptionInfoType.EncryptionPubKeyDigest 
getEncryptionPubKeyDigest() {
-        return encryptionPubKeyDigest;
-    }
-
-    /**
-     * Sets the value of the encryptionPubKeyDigest property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataEncryptionInfoType.EncryptionPubKeyDigest }
-     *     
-     */
-    public void 
setEncryptionPubKeyDigest(DataEncryptionInfoType.EncryptionPubKeyDigest value) {
-        this.encryptionPubKeyDigest = value;
-    }
-
-    /**
-     * Gets the value of the transactionKey property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getTransactionKey() {
-        return transactionKey;
-    }
-
-    /**
-     * Sets the value of the transactionKey property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setTransactionKey(byte[] value) {
-        this.transactionKey = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>PubKeyDigestType">
-     *       &lt;attribute name="Version" use="required" 
type="{urn:org:ebics:H004}EncryptionVersionType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class EncryptionPubKeyDigest
-        extends PubKeyDigestType
-    {
-
-        @XmlAttribute(name = "Version", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String version;
-
-        /**
-         * Gets the value of the version property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getVersion() {
-            return version;
-        }
-
-        /**
-         * Sets the value of the version property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setVersion(String value) {
-            this.version = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/DataTransferRequestType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/DataTransferRequestType.java
deleted file mode 100644
index c10167b..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/DataTransferRequestType.java
+++ /dev/null
@@ -1,386 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.namespace.QName;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für den Transfer von Auftragsdaten (Anfrage).
- * 
- * <p>Java class for DataTransferRequestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="DataTransferRequestType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;choice>
- *           &lt;sequence>
- *             &lt;element name="DataEncryptionInfo">
- *               &lt;complexType>
- *                 &lt;complexContent>
- *                   &lt;extension 
base="{urn:org:ebics:H004}DataEncryptionInfoType">
- *                     &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *                   &lt;/extension>
- *                 &lt;/complexContent>
- *               &lt;/complexType>
- *             &lt;/element>
- *             &lt;element name="SignatureData">
- *               &lt;complexType>
- *                 &lt;simpleContent>
- *                   &lt;extension 
base="&lt;urn:org:ebics:H004>SignatureDataType">
- *                     &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *                   &lt;/extension>
- *                 &lt;/simpleContent>
- *               &lt;/complexType>
- *             &lt;/element>
- *           &lt;/sequence>
- *           &lt;sequence>
- *             &lt;element name="OrderData">
- *               &lt;complexType>
- *                 &lt;simpleContent>
- *                   &lt;extension base="&lt;urn:org:ebics:H004>OrderDataType">
- *                     &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
- *                   &lt;/extension>
- *                 &lt;/simpleContent>
- *               &lt;/complexType>
- *             &lt;/element>
- *           &lt;/sequence>
- *         &lt;/choice>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DataTransferRequestType", propOrder = {
-    "dataEncryptionInfo",
-    "signatureData",
-    "orderData",
-    "any"
-})
-public class DataTransferRequestType {
-
-    @XmlElement(name = "DataEncryptionInfo")
-    protected DataTransferRequestType.DataEncryptionInfo dataEncryptionInfo;
-    @XmlElement(name = "SignatureData")
-    protected DataTransferRequestType.SignatureData signatureData;
-    @XmlElement(name = "OrderData")
-    protected DataTransferRequestType.OrderData orderData;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the dataEncryptionInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataTransferRequestType.DataEncryptionInfo }
-     *     
-     */
-    public DataTransferRequestType.DataEncryptionInfo getDataEncryptionInfo() {
-        return dataEncryptionInfo;
-    }
-
-    /**
-     * Sets the value of the dataEncryptionInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataTransferRequestType.DataEncryptionInfo }
-     *     
-     */
-    public void 
setDataEncryptionInfo(DataTransferRequestType.DataEncryptionInfo value) {
-        this.dataEncryptionInfo = value;
-    }
-
-    /**
-     * Gets the value of the signatureData property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataTransferRequestType.SignatureData }
-     *     
-     */
-    public DataTransferRequestType.SignatureData getSignatureData() {
-        return signatureData;
-    }
-
-    /**
-     * Sets the value of the signatureData property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataTransferRequestType.SignatureData }
-     *     
-     */
-    public void setSignatureData(DataTransferRequestType.SignatureData value) {
-        this.signatureData = value;
-    }
-
-    /**
-     * Gets the value of the orderData property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataTransferRequestType.OrderData }
-     *     
-     */
-    public DataTransferRequestType.OrderData getOrderData() {
-        return orderData;
-    }
-
-    /**
-     * Sets the value of the orderData property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataTransferRequestType.OrderData }
-     *     
-     */
-    public void setOrderData(DataTransferRequestType.OrderData value) {
-        this.orderData = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:org:ebics:H004}DataEncryptionInfoType">
-     *       &lt;attGroup ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class DataEncryptionInfo
-        extends DataEncryptionInfoType
-    {
-
-        @XmlAttribute(name = "authenticate", required = true)
-        protected boolean authenticate;
-
-        /**
-         * Gets the value of the authenticate property.
-         * 
-         */
-        public boolean isAuthenticate() {
-            return authenticate;
-        }
-
-        /**
-         * Sets the value of the authenticate property.
-         * 
-         */
-        public void setAuthenticate(boolean value) {
-            this.authenticate = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>OrderDataType">
-     *       &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class OrderData {
-
-        @XmlValue
-        protected byte[] value;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Datentyp für binäre Auftragsdaten (komprimiert, verschlüsselt und 
kodiert).
-         * 
-         * @return
-         *     possible object is
-         *     byte[]
-         */
-        public byte[] getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     byte[]
-         */
-        public void setValue(byte[] value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>SignatureDataType">
-     *       &lt;attGroup ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class SignatureData {
-
-        @XmlValue
-        protected byte[] value;
-        @XmlAttribute(name = "authenticate", required = true)
-        protected boolean authenticate;
-
-        /**
-         * Datentyp für binäre Signaturdaten (komprimiert, verschlüsselt und 
kodiert).
-         * 
-         * @return
-         *     possible object is
-         *     byte[]
-         */
-        public byte[] getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     byte[]
-         */
-        public void setValue(byte[] value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the authenticate property.
-         * 
-         */
-        public boolean isAuthenticate() {
-            return authenticate;
-        }
-
-        /**
-         * Sets the value of the authenticate property.
-         * 
-         */
-        public void setAuthenticate(boolean value) {
-            this.authenticate = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/DataTransferResponseType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/DataTransferResponseType.java
deleted file mode 100644
index d624182..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/DataTransferResponseType.java
+++ /dev/null
@@ -1,355 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.namespace.QName;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für den Transfer von Auftragsdaten (Antwort).
- * 
- * <p>Java class for DataTransferResponseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="DataTransferResponseType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;sequence minOccurs="0">
- *           &lt;element name="DataEncryptionInfo">
- *             &lt;complexType>
- *               &lt;complexContent>
- *                 &lt;extension 
base="{urn:org:ebics:H004}DataEncryptionInfoType">
- *                   &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *                 &lt;/extension>
- *               &lt;/complexContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *           &lt;element name="SignatureData" maxOccurs="0" minOccurs="0">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;urn:org:ebics:H004>SignatureDataType">
- *                   &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *         &lt;/sequence>
- *         &lt;element name="OrderData">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension base="&lt;urn:org:ebics:H004>OrderDataType">
- *                 &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DataTransferResponseType", propOrder = {
-    "dataEncryptionInfo",
-    "orderData",
-    "any"
-})
-public class DataTransferResponseType {
-
-    @XmlElement(name = "DataEncryptionInfo")
-    protected DataTransferResponseType.DataEncryptionInfo dataEncryptionInfo;
-    @XmlElement(name = "OrderData", required = true)
-    protected DataTransferResponseType.OrderData orderData;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the dataEncryptionInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataTransferResponseType.DataEncryptionInfo }
-     *     
-     */
-    public DataTransferResponseType.DataEncryptionInfo getDataEncryptionInfo() 
{
-        return dataEncryptionInfo;
-    }
-
-    /**
-     * Sets the value of the dataEncryptionInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataTransferResponseType.DataEncryptionInfo }
-     *     
-     */
-    public void 
setDataEncryptionInfo(DataTransferResponseType.DataEncryptionInfo value) {
-        this.dataEncryptionInfo = value;
-    }
-
-    /**
-     * Gets the value of the orderData property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataTransferResponseType.OrderData }
-     *     
-     */
-    public DataTransferResponseType.OrderData getOrderData() {
-        return orderData;
-    }
-
-    /**
-     * Sets the value of the orderData property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataTransferResponseType.OrderData }
-     *     
-     */
-    public void setOrderData(DataTransferResponseType.OrderData value) {
-        this.orderData = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:org:ebics:H004}DataEncryptionInfoType">
-     *       &lt;attGroup ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class DataEncryptionInfo
-        extends DataEncryptionInfoType
-    {
-
-        @XmlAttribute(name = "authenticate", required = true)
-        protected boolean authenticate;
-
-        /**
-         * Gets the value of the authenticate property.
-         * 
-         */
-        public boolean isAuthenticate() {
-            return authenticate;
-        }
-
-        /**
-         * Sets the value of the authenticate property.
-         * 
-         */
-        public void setAuthenticate(boolean value) {
-            this.authenticate = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>OrderDataType">
-     *       &lt;anyAttribute processContents='lax' 
namespace='urn:org:ebics:H004'/>
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class OrderData {
-
-        @XmlValue
-        protected byte[] value;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Datentyp für binäre Auftragsdaten (komprimiert, verschlüsselt und 
kodiert).
-         * 
-         * @return
-         *     possible object is
-         *     byte[]
-         */
-        public byte[] getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     byte[]
-         */
-        public void setValue(byte[] value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>SignatureDataType">
-     *       &lt;attGroup ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class SignatureData {
-
-        @XmlValue
-        protected byte[] value;
-        @XmlAttribute(name = "authenticate", required = true)
-        protected boolean authenticate;
-
-        /**
-         * Datentyp für binäre Signaturdaten (komprimiert, verschlüsselt und 
kodiert).
-         * 
-         * @return
-         *     possible object is
-         *     byte[]
-         */
-        public byte[] getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     byte[]
-         */
-        public void setValue(byte[] value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the authenticate property.
-         * 
-         */
-        public boolean isAuthenticate() {
-            return authenticate;
-        }
-
-        /**
-         * Sets the value of the authenticate property.
-         * 
-         */
-        public void setAuthenticate(boolean value) {
-            this.authenticate = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/DigestMethodType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/DigestMethodType.java
deleted file mode 100644
index fd248f2..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/DigestMethodType.java
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for DigestMethodType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="DigestMethodType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Algorithm" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DigestMethodType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class DigestMethodType {
-
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Algorithm", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String algorithm;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-    /**
-     * Gets the value of the algorithm property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAlgorithm() {
-        return algorithm;
-    }
-
-    /**
-     * Sets the value of the algorithm property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAlgorithm(String value) {
-        this.algorithm = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/EbicsResponse.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/EbicsResponse.java
deleted file mode 100644
index 66585c2..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/EbicsResponse.java
+++ /dev/null
@@ -1,623 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="header">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;sequence>
- *                   &lt;element name="static" 
type="{urn:org:ebics:H004}ResponseStaticHeaderType"/>
- *                   &lt;element name="mutable" 
type="{urn:org:ebics:H004}ResponseMutableHeaderType"/>
- *                 &lt;/sequence>
- *                 &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element ref="{urn:org:ebics:H004}AuthSignature"/>
- *         &lt;element name="body">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;sequence>
- *                   &lt;element name="DataTransfer" 
type="{urn:org:ebics:H004}DataTransferResponseType" minOccurs="0"/>
- *                   &lt;element name="ReturnCode">
- *                     &lt;complexType>
- *                       &lt;simpleContent>
- *                         &lt;extension 
base="&lt;urn:org:ebics:H004>ReturnCodeType">
- *                           &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *                         &lt;/extension>
- *                       &lt;/simpleContent>
- *                     &lt;/complexType>
- *                   &lt;/element>
- *                   &lt;element name="TimestampBankParameter" minOccurs="0">
- *                     &lt;complexType>
- *                       &lt;simpleContent>
- *                         &lt;extension 
base="&lt;urn:org:ebics:H004>TimestampType">
- *                           &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
- *                         &lt;/extension>
- *                       &lt;/simpleContent>
- *                     &lt;/complexType>
- *                   &lt;/element>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *       &lt;attGroup ref="{urn:org:ebics:H004}VersionAttrGroup"/>
- *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "header",
-    "authSignature",
-    "body"
-})
-@XmlRootElement(name = "ebicsResponse")
-public class EbicsResponse {
-
-    @XmlElement(required = true)
-    protected EbicsResponse.Header header;
-    @XmlElement(name = "AuthSignature", required = true)
-    protected SignatureType authSignature;
-    @XmlElement(required = true)
-    protected EbicsResponse.Body body;
-    @XmlAttribute(name = "Version", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String version;
-    @XmlAttribute(name = "Revision")
-    protected Integer revision;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-    /**
-     * Gets the value of the header property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EbicsResponse.Header }
-     *     
-     */
-    public EbicsResponse.Header getHeader() {
-        return header;
-    }
-
-    /**
-     * Sets the value of the header property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EbicsResponse.Header }
-     *     
-     */
-    public void setHeader(EbicsResponse.Header value) {
-        this.header = value;
-    }
-
-    /**
-     * Authentication signature.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignatureType }
-     *     
-     */
-    public SignatureType getAuthSignature() {
-        return authSignature;
-    }
-
-    /**
-     * Sets the value of the authSignature property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignatureType }
-     *     
-     */
-    public void setAuthSignature(SignatureType value) {
-        this.authSignature = value;
-    }
-
-    /**
-     * Gets the value of the body property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EbicsResponse.Body }
-     *     
-     */
-    public EbicsResponse.Body getBody() {
-        return body;
-    }
-
-    /**
-     * Sets the value of the body property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EbicsResponse.Body }
-     *     
-     */
-    public void setBody(EbicsResponse.Body value) {
-        this.body = value;
-    }
-
-    /**
-     * Gets the value of the version property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVersion() {
-        return version;
-    }
-
-    /**
-     * Sets the value of the version property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVersion(String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the revision property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getRevision() {
-        return revision;
-    }
-
-    /**
-     * Sets the value of the revision property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setRevision(Integer value) {
-        this.revision = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;sequence>
-     *         &lt;element name="DataTransfer" 
type="{urn:org:ebics:H004}DataTransferResponseType" minOccurs="0"/>
-     *         &lt;element name="ReturnCode">
-     *           &lt;complexType>
-     *             &lt;simpleContent>
-     *               &lt;extension 
base="&lt;urn:org:ebics:H004>ReturnCodeType">
-     *                 &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *               &lt;/extension>
-     *             &lt;/simpleContent>
-     *           &lt;/complexType>
-     *         &lt;/element>
-     *         &lt;element name="TimestampBankParameter" minOccurs="0">
-     *           &lt;complexType>
-     *             &lt;simpleContent>
-     *               &lt;extension base="&lt;urn:org:ebics:H004>TimestampType">
-     *                 &lt;attGroup 
ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *               &lt;/extension>
-     *             &lt;/simpleContent>
-     *           &lt;/complexType>
-     *         &lt;/element>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "dataTransfer",
-        "returnCode",
-        "timestampBankParameter"
-    })
-    public static class Body {
-
-        @XmlElement(name = "DataTransfer")
-        protected DataTransferResponseType dataTransfer;
-        @XmlElement(name = "ReturnCode", required = true)
-        protected EbicsResponse.Body.ReturnCode returnCode;
-        @XmlElement(name = "TimestampBankParameter")
-        protected EbicsResponse.Body.TimestampBankParameter 
timestampBankParameter;
-
-        /**
-         * Gets the value of the dataTransfer property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link DataTransferResponseType }
-         *     
-         */
-        public DataTransferResponseType getDataTransfer() {
-            return dataTransfer;
-        }
-
-        /**
-         * Sets the value of the dataTransfer property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link DataTransferResponseType }
-         *     
-         */
-        public void setDataTransfer(DataTransferResponseType value) {
-            this.dataTransfer = value;
-        }
-
-        /**
-         * Gets the value of the returnCode property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link EbicsResponse.Body.ReturnCode }
-         *     
-         */
-        public EbicsResponse.Body.ReturnCode getReturnCode() {
-            return returnCode;
-        }
-
-        /**
-         * Sets the value of the returnCode property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link EbicsResponse.Body.ReturnCode }
-         *     
-         */
-        public void setReturnCode(EbicsResponse.Body.ReturnCode value) {
-            this.returnCode = value;
-        }
-
-        /**
-         * Gets the value of the timestampBankParameter property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link EbicsResponse.Body.TimestampBankParameter }
-         *     
-         */
-        public EbicsResponse.Body.TimestampBankParameter 
getTimestampBankParameter() {
-            return timestampBankParameter;
-        }
-
-        /**
-         * Sets the value of the timestampBankParameter property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link EbicsResponse.Body.TimestampBankParameter }
-         *     
-         */
-        public void 
setTimestampBankParameter(EbicsResponse.Body.TimestampBankParameter value) {
-            this.timestampBankParameter = value;
-        }
-
-
-        /**
-         * <p>Java class for anonymous complex type.
-         * 
-         * <p>The following schema fragment specifies the expected content 
contained within this class.
-         * 
-         * <pre>
-         * &lt;complexType>
-         *   &lt;simpleContent>
-         *     &lt;extension base="&lt;urn:org:ebics:H004>ReturnCodeType">
-         *       &lt;attGroup ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-         *     &lt;/extension>
-         *   &lt;/simpleContent>
-         * &lt;/complexType>
-         * </pre>
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "value"
-        })
-        public static class ReturnCode {
-
-            @XmlValue
-            @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-            protected String value;
-            @XmlAttribute(name = "authenticate", required = true)
-            protected boolean authenticate;
-
-            /**
-             * Datentyp für Antwortcodes.
-             * 
-             * @return
-             *     possible object is
-             *     {@link String }
-             *     
-             */
-            public String getValue() {
-                return value;
-            }
-
-            /**
-             * Sets the value of the value property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *     
-             */
-            public void setValue(String value) {
-                this.value = value;
-            }
-
-            /**
-             * Gets the value of the authenticate property.
-             * 
-             */
-            public boolean isAuthenticate() {
-                return authenticate;
-            }
-
-            /**
-             * Sets the value of the authenticate property.
-             * 
-             */
-            public void setAuthenticate(boolean value) {
-                this.authenticate = value;
-            }
-
-        }
-
-
-        /**
-         * <p>Java class for anonymous complex type.
-         * 
-         * <p>The following schema fragment specifies the expected content 
contained within this class.
-         * 
-         * <pre>
-         * &lt;complexType>
-         *   &lt;simpleContent>
-         *     &lt;extension base="&lt;urn:org:ebics:H004>TimestampType">
-         *       &lt;attGroup ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-         *     &lt;/extension>
-         *   &lt;/simpleContent>
-         * &lt;/complexType>
-         * </pre>
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "value"
-        })
-        public static class TimestampBankParameter {
-
-            @XmlValue
-            protected XMLGregorianCalendar value;
-            @XmlAttribute(name = "authenticate", required = true)
-            protected boolean authenticate;
-
-            /**
-             * Datentyp für Zeitstempel.
-             * 
-             * @return
-             *     possible object is
-             *     {@link XMLGregorianCalendar }
-             *     
-             */
-            public XMLGregorianCalendar getValue() {
-                return value;
-            }
-
-            /**
-             * Sets the value of the value property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link XMLGregorianCalendar }
-             *     
-             */
-            public void setValue(XMLGregorianCalendar value) {
-                this.value = value;
-            }
-
-            /**
-             * Gets the value of the authenticate property.
-             * 
-             */
-            public boolean isAuthenticate() {
-                return authenticate;
-            }
-
-            /**
-             * Sets the value of the authenticate property.
-             * 
-             */
-            public void setAuthenticate(boolean value) {
-                this.authenticate = value;
-            }
-
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;sequence>
-     *         &lt;element name="static" 
type="{urn:org:ebics:H004}ResponseStaticHeaderType"/>
-     *         &lt;element name="mutable" 
type="{urn:org:ebics:H004}ResponseMutableHeaderType"/>
-     *       &lt;/sequence>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}AuthenticationMarker"/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "_static",
-        "mutable"
-    })
-    public static class Header {
-
-        @XmlElement(name = "static", required = true)
-        protected ResponseStaticHeaderType _static;
-        @XmlElement(required = true)
-        protected ResponseMutableHeaderType mutable;
-        @XmlAttribute(name = "authenticate", required = true)
-        protected boolean authenticate;
-
-        /**
-         * Gets the value of the static property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link ResponseStaticHeaderType }
-         *     
-         */
-        public ResponseStaticHeaderType getStatic() {
-            return _static;
-        }
-
-        /**
-         * Sets the value of the static property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link ResponseStaticHeaderType }
-         *     
-         */
-        public void setStatic(ResponseStaticHeaderType value) {
-            this._static = value;
-        }
-
-        /**
-         * Gets the value of the mutable property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link ResponseMutableHeaderType }
-         *     
-         */
-        public ResponseMutableHeaderType getMutable() {
-            return mutable;
-        }
-
-        /**
-         * Sets the value of the mutable property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link ResponseMutableHeaderType }
-         *     
-         */
-        public void setMutable(ResponseMutableHeaderType value) {
-            this.mutable = value;
-        }
-
-        /**
-         * Gets the value of the authenticate property.
-         * 
-         */
-        public boolean isAuthenticate() {
-            return authenticate;
-        }
-
-        /**
-         * Sets the value of the authenticate property.
-         * 
-         */
-        public void setAuthenticate(boolean value) {
-            this.authenticate = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/EncryptionCertificateInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/EncryptionCertificateInfoType.java
deleted file mode 100644
index b45331e..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/EncryptionCertificateInfoType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Data type for encryption key.
- * 
- * <p>Java class for EncryptionCertificateInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="EncryptionCertificateInfoType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}CertificateInfoType">
- *       &lt;sequence>
- *         &lt;element name="EncryptionVersion" 
type="{urn:org:ebics:H004}EncryptionVersionType"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EncryptionCertificateInfoType", propOrder = {
-    "encryptionVersion"
-})
-public class EncryptionCertificateInfoType
-    extends CertificateInfoType
-{
-
-    @XmlElement(name = "EncryptionVersion", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String encryptionVersion;
-
-    /**
-     * Gets the value of the encryptionVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getEncryptionVersion() {
-        return encryptionVersion;
-    }
-
-    /**
-     * Sets the value of the encryptionVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setEncryptionVersion(String value) {
-        this.encryptionVersion = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/EncryptionPubKeyInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/EncryptionPubKeyInfoType.java
deleted file mode 100644
index 72c511f..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/EncryptionPubKeyInfoType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für öffentliche Verschlüsselungsschlüssel.
- * 
- * <p>Java class for EncryptionPubKeyInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="EncryptionPubKeyInfoType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}PubKeyInfoType">
- *       &lt;sequence>
- *         &lt;element name="EncryptionVersion" 
type="{urn:org:ebics:H004}EncryptionVersionType"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EncryptionPubKeyInfoType", propOrder = {
-    "encryptionVersion"
-})
-public class EncryptionPubKeyInfoType
-    extends PubKeyInfoTypeAtEbicsTypes
-{
-
-    @XmlElement(name = "EncryptionVersion", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String encryptionVersion;
-
-    /**
-     * Gets the value of the encryptionVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getEncryptionVersion() {
-        return encryptionVersion;
-    }
-
-    /**
-     * Sets the value of the encryptionVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setEncryptionVersion(String value) {
-        this.encryptionVersion = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/FDLOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/FDLOrderParamsType.java
deleted file mode 100644
index 881b591..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/FDLOrderParamsType.java
+++ /dev/null
@@ -1,232 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für Auftragsart FDL.
- * 
- * <p>Java class for FDLOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="FDLOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="DateRange" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;sequence>
- *                   &lt;element name="Start" 
type="{urn:org:ebics:H004}DateType"/>
- *                   &lt;element name="End" 
type="{urn:org:ebics:H004}DateType"/>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element ref="{urn:org:ebics:H004}Parameter" 
maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="FileFormat" 
type="{urn:org:ebics:H004}FileFormatType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FDLOrderParamsType", propOrder = {
-    "dateRange",
-    "parameter",
-    "fileFormat"
-})
-public class FDLOrderParamsType {
-
-    @XmlElement(name = "DateRange")
-    protected FDLOrderParamsType.DateRange dateRange;
-    @XmlElement(name = "Parameter")
-    protected List<Parameter> parameter;
-    @XmlElement(name = "FileFormat", required = true)
-    protected FileFormatType fileFormat;
-
-    /**
-     * Gets the value of the dateRange property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FDLOrderParamsType.DateRange }
-     *     
-     */
-    public FDLOrderParamsType.DateRange getDateRange() {
-        return dateRange;
-    }
-
-    /**
-     * Sets the value of the dateRange property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FDLOrderParamsType.DateRange }
-     *     
-     */
-    public void setDateRange(FDLOrderParamsType.DateRange value) {
-        this.dateRange = value;
-    }
-
-    /**
-     * Gets the value of the parameter property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the parameter 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getParameter().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Parameter }
-     * 
-     * 
-     */
-    public List<Parameter> getParameter() {
-        if (parameter == null) {
-            parameter = new ArrayList<Parameter>();
-        }
-        return this.parameter;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;sequence>
-     *         &lt;element name="Start" type="{urn:org:ebics:H004}DateType"/>
-     *         &lt;element name="End" type="{urn:org:ebics:H004}DateType"/>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "start",
-        "end"
-    })
-    public static class DateRange {
-
-        @XmlElement(name = "Start", required = true)
-        @XmlSchemaType(name = "date")
-        protected XMLGregorianCalendar start;
-        @XmlElement(name = "End", required = true)
-        @XmlSchemaType(name = "date")
-        protected XMLGregorianCalendar end;
-
-        /**
-         * Gets the value of the start property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public XMLGregorianCalendar getStart() {
-            return start;
-        }
-
-        /**
-         * Sets the value of the start property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public void setStart(XMLGregorianCalendar value) {
-            this.start = value;
-        }
-
-        /**
-         * Gets the value of the end property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public XMLGregorianCalendar getEnd() {
-            return end;
-        }
-
-        /**
-         * Sets the value of the end property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public void setEnd(XMLGregorianCalendar value) {
-            this.end = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/FULOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/FULOrderParamsType.java
deleted file mode 100644
index d958d02..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/FULOrderParamsType.java
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für Auftragsart FUL.
- * 
- * <p>Java class for FULOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="FULOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{urn:org:ebics:H004}Parameter" 
maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="FileFormat" 
type="{urn:org:ebics:H004}FileFormatType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FULOrderParamsType", propOrder = {
-    "parameter",
-    "fileFormat"
-})
-public class FULOrderParamsType {
-
-    @XmlElement(name = "Parameter")
-    protected List<Parameter> parameter;
-    @XmlElement(name = "FileFormat", required = true)
-    protected FileFormatType fileFormat;
-
-    /**
-     * Gets the value of the parameter property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the parameter 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getParameter().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Parameter }
-     * 
-     * 
-     */
-    public List<Parameter> getParameter() {
-        if (parameter == null) {
-            parameter = new ArrayList<Parameter>();
-        }
-        return this.parameter;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/FileFormatType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/FileFormatType.java
deleted file mode 100644
index 863292b..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/FileFormatType.java
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für das Dateiformat.
- * 
- * <p>Java class for FileFormatType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="FileFormatType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>token">
- *       &lt;attribute name="CountryCode" 
type="{urn:org:ebics:H004}CountryCodeType" />
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FileFormatType", propOrder = {
-    "value"
-})
-public class FileFormatType {
-
-    @XmlValue
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String value;
-    @XmlAttribute(name = "CountryCode")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String countryCode;
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the countryCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCountryCode() {
-        return countryCode;
-    }
-
-    /**
-     * Sets the value of the countryCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCountryCode(String value) {
-        this.countryCode = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/GenericOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/GenericOrderParamsType.java
deleted file mode 100644
index 01d60ae..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/GenericOrderParamsType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für beliebige Auftragsarten.
- * 
- * <p>Java class for GenericOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="GenericOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{urn:org:ebics:H004}Parameter" 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GenericOrderParamsType", propOrder = {
-    "parameter"
-})
-public class GenericOrderParamsType {
-
-    @XmlElement(name = "Parameter")
-    protected List<Parameter> parameter;
-
-    /**
-     * Gets the value of the parameter property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the parameter 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getParameter().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Parameter }
-     * 
-     * 
-     */
-    public List<Parameter> getParameter() {
-        if (parameter == null) {
-            parameter = new ArrayList<Parameter>();
-        }
-        return this.parameter;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/H3KRequestOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/H3KRequestOrderDataType.java
deleted file mode 100644
index 2f81ac1..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/H3KRequestOrderDataType.java
+++ /dev/null
@@ -1,190 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Order type for order data H3K (request: initialise all three user's keys).
- * 
- * <p>Java class for H3KRequestOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="H3KRequestOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="SignatureCertificateInfo" 
type="{urn:org:ebics:H004}SignatureCertificateInfoType"/>
- *         &lt;element name="AuthenticationCertificateInfo" 
type="{urn:org:ebics:H004}AuthenticationCertificateInfoType"/>
- *         &lt;element name="EncryptionCertificateInfo" 
type="{urn:org:ebics:H004}EncryptionCertificateInfoType"/>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "H3KRequestOrderDataType", propOrder = {
-    "signatureCertificateInfo",
-    "authenticationCertificateInfo",
-    "encryptionCertificateInfo",
-    "partnerID",
-    "userID"
-})
-public class H3KRequestOrderDataType {
-
-    @XmlElement(name = "SignatureCertificateInfo", required = true)
-    protected SignatureCertificateInfoType signatureCertificateInfo;
-    @XmlElement(name = "AuthenticationCertificateInfo", required = true)
-    protected AuthenticationCertificateInfoType authenticationCertificateInfo;
-    @XmlElement(name = "EncryptionCertificateInfo", required = true)
-    protected EncryptionCertificateInfoType encryptionCertificateInfo;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-
-    /**
-     * Gets the value of the signatureCertificateInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignatureCertificateInfoType }
-     *     
-     */
-    public SignatureCertificateInfoType getSignatureCertificateInfo() {
-        return signatureCertificateInfo;
-    }
-
-    /**
-     * Sets the value of the signatureCertificateInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignatureCertificateInfoType }
-     *     
-     */
-    public void setSignatureCertificateInfo(SignatureCertificateInfoType 
value) {
-        this.signatureCertificateInfo = value;
-    }
-
-    /**
-     * Gets the value of the authenticationCertificateInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthenticationCertificateInfoType }
-     *     
-     */
-    public AuthenticationCertificateInfoType 
getAuthenticationCertificateInfo() {
-        return authenticationCertificateInfo;
-    }
-
-    /**
-     * Sets the value of the authenticationCertificateInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthenticationCertificateInfoType }
-     *     
-     */
-    public void 
setAuthenticationCertificateInfo(AuthenticationCertificateInfoType value) {
-        this.authenticationCertificateInfo = value;
-    }
-
-    /**
-     * Gets the value of the encryptionCertificateInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EncryptionCertificateInfoType }
-     *     
-     */
-    public EncryptionCertificateInfoType getEncryptionCertificateInfo() {
-        return encryptionCertificateInfo;
-    }
-
-    /**
-     * Sets the value of the encryptionCertificateInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EncryptionCertificateInfoType }
-     *     
-     */
-    public void setEncryptionCertificateInfo(EncryptionCertificateInfoType 
value) {
-        this.encryptionCertificateInfo = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HAAResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HAAResponseOrderDataType.java
deleted file mode 100644
index f6f207f..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HAAResponseOrderDataType.java
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HAA (Antwort: abrufbare 
Auftragsarten abholen).
- * 
- * <p>Java class for HAAResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HAAResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderTypes" 
type="{urn:org:ebics:H004}OrderTListType"/>
- *         &lt;any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HAAResponseOrderDataType", propOrder = {
-    "orderTypes",
-    "any"
-})
-public class HAAResponseOrderDataType {
-
-    @XmlList
-    @XmlElement(name = "OrderTypes", required = true)
-    protected List<String> orderTypes;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderTypes property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderTypes 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderTypes().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getOrderTypes() {
-        if (orderTypes == null) {
-            orderTypes = new ArrayList<String>();
-        }
-        return this.orderTypes;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HCARequestOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HCARequestOrderDataType.java
deleted file mode 100644
index d239717..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HCARequestOrderDataType.java
+++ /dev/null
@@ -1,200 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HCA (Anfrage: Änderung der 
Teilnehmerschlüssel für Authentifikation und Verschlüsselung).
- * 
- * <p>Java class for HCARequestOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HCARequestOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="AuthenticationPubKeyInfo" 
type="{urn:org:ebics:H004}AuthenticationPubKeyInfoType"/>
- *         &lt;element name="EncryptionPubKeyInfo" 
type="{urn:org:ebics:H004}EncryptionPubKeyInfoType"/>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HCARequestOrderDataType", propOrder = {
-    "authenticationPubKeyInfo",
-    "encryptionPubKeyInfo",
-    "partnerID",
-    "userID",
-    "any"
-})
-public class HCARequestOrderDataType {
-
-    @XmlElement(name = "AuthenticationPubKeyInfo", required = true)
-    protected AuthenticationPubKeyInfoType authenticationPubKeyInfo;
-    @XmlElement(name = "EncryptionPubKeyInfo", required = true)
-    protected EncryptionPubKeyInfoType encryptionPubKeyInfo;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the authenticationPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public AuthenticationPubKeyInfoType getAuthenticationPubKeyInfo() {
-        return authenticationPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the authenticationPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public void setAuthenticationPubKeyInfo(AuthenticationPubKeyInfoType 
value) {
-        this.authenticationPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the encryptionPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public EncryptionPubKeyInfoType getEncryptionPubKeyInfo() {
-        return encryptionPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the encryptionPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public void setEncryptionPubKeyInfo(EncryptionPubKeyInfoType value) {
-        this.encryptionPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HCSRequestOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HCSRequestOrderDataType.java
deleted file mode 100644
index caf847b..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HCSRequestOrderDataType.java
+++ /dev/null
@@ -1,228 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HCS (Anfrage: Schlüsselwechsel 
aller Schlüssel).
- * 
- * <p>Java class for HCSRequestOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HCSRequestOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="AuthenticationPubKeyInfo" 
type="{urn:org:ebics:H004}AuthenticationPubKeyInfoType"/>
- *         &lt;element name="EncryptionPubKeyInfo" 
type="{urn:org:ebics:H004}EncryptionPubKeyInfoType"/>
- *         &lt;element ref="{http://www.ebics.org/S001}SignaturePubKeyInfo"/>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HCSRequestOrderDataType", propOrder = {
-    "authenticationPubKeyInfo",
-    "encryptionPubKeyInfo",
-    "signaturePubKeyInfo",
-    "partnerID",
-    "userID",
-    "any"
-})
-public class HCSRequestOrderDataType {
-
-    @XmlElement(name = "AuthenticationPubKeyInfo", required = true)
-    protected AuthenticationPubKeyInfoType authenticationPubKeyInfo;
-    @XmlElement(name = "EncryptionPubKeyInfo", required = true)
-    protected EncryptionPubKeyInfoType encryptionPubKeyInfo;
-    @XmlElement(name = "SignaturePubKeyInfo", namespace = 
"http://www.ebics.org/S001";, required = true)
-    protected SignaturePubKeyInfoType signaturePubKeyInfo;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the authenticationPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public AuthenticationPubKeyInfoType getAuthenticationPubKeyInfo() {
-        return authenticationPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the authenticationPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public void setAuthenticationPubKeyInfo(AuthenticationPubKeyInfoType 
value) {
-        this.authenticationPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the encryptionPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public EncryptionPubKeyInfoType getEncryptionPubKeyInfo() {
-        return encryptionPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the encryptionPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public void setEncryptionPubKeyInfo(EncryptionPubKeyInfoType value) {
-        this.encryptionPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the signaturePubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignaturePubKeyInfoType }
-     *     
-     */
-    public SignaturePubKeyInfoType getSignaturePubKeyInfo() {
-        return signaturePubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the signaturePubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignaturePubKeyInfoType }
-     *     
-     */
-    public void setSignaturePubKeyInfo(SignaturePubKeyInfoType value) {
-        this.signaturePubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HIARequestOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HIARequestOrderDataType.java
deleted file mode 100644
index 89e1288..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HIARequestOrderDataType.java
+++ /dev/null
@@ -1,200 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HIA (Anfrage: Initialisierung 
der Teilnehmerschlüssel für Authentifikation und Verschlüsselung).
- * 
- * <p>Java class for HIARequestOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HIARequestOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="AuthenticationPubKeyInfo" 
type="{urn:org:ebics:H004}AuthenticationPubKeyInfoType"/>
- *         &lt;element name="EncryptionPubKeyInfo" 
type="{urn:org:ebics:H004}EncryptionPubKeyInfoType"/>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HIARequestOrderDataType", propOrder = {
-    "authenticationPubKeyInfo",
-    "encryptionPubKeyInfo",
-    "partnerID",
-    "userID",
-    "any"
-})
-public class HIARequestOrderDataType {
-
-    @XmlElement(name = "AuthenticationPubKeyInfo", required = true)
-    protected AuthenticationPubKeyInfoType authenticationPubKeyInfo;
-    @XmlElement(name = "EncryptionPubKeyInfo", required = true)
-    protected EncryptionPubKeyInfoType encryptionPubKeyInfo;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the authenticationPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public AuthenticationPubKeyInfoType getAuthenticationPubKeyInfo() {
-        return authenticationPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the authenticationPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public void setAuthenticationPubKeyInfo(AuthenticationPubKeyInfoType 
value) {
-        this.authenticationPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the encryptionPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public EncryptionPubKeyInfoType getEncryptionPubKeyInfo() {
-        return encryptionPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the encryptionPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public void setEncryptionPubKeyInfo(EncryptionPubKeyInfoType value) {
-        this.encryptionPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HKDResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HKDResponseOrderDataType.java
deleted file mode 100644
index 0eeccf4..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HKDResponseOrderDataType.java
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Order data for order type HKD (response: receive customer based information 
on the customer and the customer's user.
- * 
- * <p>Java class for HKDResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HKDResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="PartnerInfo" 
type="{urn:org:ebics:H004}PartnerInfoType"/>
- *         &lt;element name="UserInfo" type="{urn:org:ebics:H004}UserInfoType" 
maxOccurs="unbounded"/>
- *         &lt;any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HKDResponseOrderDataType", propOrder = {
-    "partnerInfo",
-    "userInfo",
-    "any"
-})
-public class HKDResponseOrderDataType {
-
-    @XmlElement(name = "PartnerInfo", required = true)
-    protected PartnerInfoType partnerInfo;
-    @XmlElement(name = "UserInfo", required = true)
-    protected List<UserInfoType> userInfo;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PartnerInfoType }
-     *     
-     */
-    public PartnerInfoType getPartnerInfo() {
-        return partnerInfo;
-    }
-
-    /**
-     * Sets the value of the partnerInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PartnerInfoType }
-     *     
-     */
-    public void setPartnerInfo(PartnerInfoType value) {
-        this.partnerInfo = value;
-    }
-
-    /**
-     * Gets the value of the userInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the userInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getUserInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link UserInfoType }
-     * 
-     * 
-     */
-    public List<UserInfoType> getUserInfo() {
-        if (userInfo == null) {
-            userInfo = new ArrayList<UserInfoType>();
-        }
-        return this.userInfo;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HPBResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HPBResponseOrderDataType.java
deleted file mode 100644
index aff33a0..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HPBResponseOrderDataType.java
+++ /dev/null
@@ -1,169 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HPB (Antwort: Transfer der 
Bankschlüssel).
- * 
- * <p>Java class for HPBResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HPBResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="AuthenticationPubKeyInfo" 
type="{urn:org:ebics:H004}AuthenticationPubKeyInfoType"/>
- *         &lt;element name="EncryptionPubKeyInfo" 
type="{urn:org:ebics:H004}EncryptionPubKeyInfoType"/>
- *         &lt;element ref="{http://www.ebics.org/S001}SignaturePubKeyInfo"; 
maxOccurs="0" minOccurs="0"/>
- *         &lt;element name="HostID" type="{urn:org:ebics:H004}HostIDType"/>
- *         &lt;any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HPBResponseOrderDataType", propOrder = {
-    "authenticationPubKeyInfo",
-    "encryptionPubKeyInfo",
-    "hostID",
-    "any"
-})
-public class HPBResponseOrderDataType {
-
-    @XmlElement(name = "AuthenticationPubKeyInfo", required = true)
-    protected AuthenticationPubKeyInfoType authenticationPubKeyInfo;
-    @XmlElement(name = "EncryptionPubKeyInfo", required = true)
-    protected EncryptionPubKeyInfoType encryptionPubKeyInfo;
-    @XmlElement(name = "HostID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String hostID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the authenticationPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public AuthenticationPubKeyInfoType getAuthenticationPubKeyInfo() {
-        return authenticationPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the authenticationPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public void setAuthenticationPubKeyInfo(AuthenticationPubKeyInfoType 
value) {
-        this.authenticationPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the encryptionPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public EncryptionPubKeyInfoType getEncryptionPubKeyInfo() {
-        return encryptionPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the encryptionPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public void setEncryptionPubKeyInfo(EncryptionPubKeyInfoType value) {
-        this.encryptionPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the hostID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getHostID() {
-        return hostID;
-    }
-
-    /**
-     * Sets the value of the hostID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setHostID(String value) {
-        this.hostID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HPDAccessParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HPDAccessParamsType.java
deleted file mode 100644
index 3b3a062..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HPDAccessParamsType.java
+++ /dev/null
@@ -1,274 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.datatype.XMLGregorianCalendar;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für HPD-Zugangsparameter.
- * 
- * <p>Java class for HPDAccessParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HPDAccessParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="URL" maxOccurs="unbounded">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension 
base="&lt;http://www.w3.org/2001/XMLSchema>anyURI">
- *                 &lt;attribute name="valid_from" 
type="{urn:org:ebics:H004}TimestampType" />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="Institute">
- *           &lt;simpleType>
- *             &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}normalizedString";>
- *               &lt;maxLength value="80"/>
- *             &lt;/restriction>
- *           &lt;/simpleType>
- *         &lt;/element>
- *         &lt;element name="HostID" type="{urn:org:ebics:H004}HostIDType" 
minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HPDAccessParamsType", propOrder = {
-    "url",
-    "institute",
-    "hostID",
-    "any"
-})
-public class HPDAccessParamsType {
-
-    @XmlElement(name = "URL", required = true)
-    protected List<HPDAccessParamsType.URL> url;
-    @XmlElement(name = "Institute", required = true)
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    protected String institute;
-    @XmlElement(name = "HostID")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String hostID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the url property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the url property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getURL().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link HPDAccessParamsType.URL }
-     * 
-     * 
-     */
-    public List<HPDAccessParamsType.URL> getURL() {
-        if (url == null) {
-            url = new ArrayList<HPDAccessParamsType.URL>();
-        }
-        return this.url;
-    }
-
-    /**
-     * Gets the value of the institute property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getInstitute() {
-        return institute;
-    }
-
-    /**
-     * Sets the value of the institute property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setInstitute(String value) {
-        this.institute = value;
-    }
-
-    /**
-     * Gets the value of the hostID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getHostID() {
-        return hostID;
-    }
-
-    /**
-     * Sets the value of the hostID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setHostID(String value) {
-        this.hostID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>anyURI">
-     *       &lt;attribute name="valid_from" 
type="{urn:org:ebics:H004}TimestampType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class URL {
-
-        @XmlValue
-        @XmlSchemaType(name = "anyURI")
-        protected String value;
-        @XmlAttribute(name = "valid_from")
-        protected XMLGregorianCalendar validFrom;
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the validFrom property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public XMLGregorianCalendar getValidFrom() {
-            return validFrom;
-        }
-
-        /**
-         * Sets the value of the validFrom property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public void setValidFrom(XMLGregorianCalendar value) {
-            this.validFrom = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HPDProtocolParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HPDProtocolParamsType.java
deleted file mode 100644
index 6efc810..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HPDProtocolParamsType.java
+++ /dev/null
@@ -1,713 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for HPD's parameters regarding the EBICS protocol.
- * 
- * <p>Java class for HPDProtocolParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HPDProtocolParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="Version" 
type="{urn:org:ebics:H004}HPDVersionType"/>
- *         &lt;element name="Recovery" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
- *                 &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="PreValidation" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
- *                 &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="X509Data" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
- *                 &lt;attribute name="persistent" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
- *                 &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="ClientDataDownload" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
- *                 &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="DownloadableOrderData" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
- *                 &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HPDProtocolParamsType", propOrder = {
-    "version",
-    "recovery",
-    "preValidation",
-    "x509Data",
-    "clientDataDownload",
-    "downloadableOrderData",
-    "any"
-})
-public class HPDProtocolParamsType {
-
-    @XmlElement(name = "Version", required = true)
-    protected HPDVersionType version;
-    @XmlElement(name = "Recovery")
-    protected HPDProtocolParamsType.Recovery recovery;
-    @XmlElement(name = "PreValidation")
-    protected HPDProtocolParamsType.PreValidation preValidation;
-    @XmlElement(name = "X509Data")
-    protected HPDProtocolParamsType.X509Data x509Data;
-    @XmlElement(name = "ClientDataDownload")
-    protected HPDProtocolParamsType.ClientDataDownload clientDataDownload;
-    @XmlElement(name = "DownloadableOrderData")
-    protected HPDProtocolParamsType.DownloadableOrderData 
downloadableOrderData;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the version property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDVersionType }
-     *     
-     */
-    public HPDVersionType getVersion() {
-        return version;
-    }
-
-    /**
-     * Sets the value of the version property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDVersionType }
-     *     
-     */
-    public void setVersion(HPDVersionType value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the recovery property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDProtocolParamsType.Recovery }
-     *     
-     */
-    public HPDProtocolParamsType.Recovery getRecovery() {
-        return recovery;
-    }
-
-    /**
-     * Sets the value of the recovery property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDProtocolParamsType.Recovery }
-     *     
-     */
-    public void setRecovery(HPDProtocolParamsType.Recovery value) {
-        this.recovery = value;
-    }
-
-    /**
-     * Gets the value of the preValidation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDProtocolParamsType.PreValidation }
-     *     
-     */
-    public HPDProtocolParamsType.PreValidation getPreValidation() {
-        return preValidation;
-    }
-
-    /**
-     * Sets the value of the preValidation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDProtocolParamsType.PreValidation }
-     *     
-     */
-    public void setPreValidation(HPDProtocolParamsType.PreValidation value) {
-        this.preValidation = value;
-    }
-
-    /**
-     * Gets the value of the x509Data property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDProtocolParamsType.X509Data }
-     *     
-     */
-    public HPDProtocolParamsType.X509Data getX509Data() {
-        return x509Data;
-    }
-
-    /**
-     * Sets the value of the x509Data property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDProtocolParamsType.X509Data }
-     *     
-     */
-    public void setX509Data(HPDProtocolParamsType.X509Data value) {
-        this.x509Data = value;
-    }
-
-    /**
-     * Gets the value of the clientDataDownload property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDProtocolParamsType.ClientDataDownload }
-     *     
-     */
-    public HPDProtocolParamsType.ClientDataDownload getClientDataDownload() {
-        return clientDataDownload;
-    }
-
-    /**
-     * Sets the value of the clientDataDownload property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDProtocolParamsType.ClientDataDownload }
-     *     
-     */
-    public void setClientDataDownload(HPDProtocolParamsType.ClientDataDownload 
value) {
-        this.clientDataDownload = value;
-    }
-
-    /**
-     * Gets the value of the downloadableOrderData property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDProtocolParamsType.DownloadableOrderData }
-     *     
-     */
-    public HPDProtocolParamsType.DownloadableOrderData 
getDownloadableOrderData() {
-        return downloadableOrderData;
-    }
-
-    /**
-     * Sets the value of the downloadableOrderData property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDProtocolParamsType.DownloadableOrderData }
-     *     
-     */
-    public void 
setDownloadableOrderData(HPDProtocolParamsType.DownloadableOrderData value) {
-        this.downloadableOrderData = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
-     *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class ClientDataDownload {
-
-        @XmlAttribute(name = "supported")
-        protected Boolean supported;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Gets the value of the supported property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isSupported() {
-            if (supported == null) {
-                return true;
-            } else {
-                return supported;
-            }
-        }
-
-        /**
-         * Sets the value of the supported property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setSupported(Boolean value) {
-            this.supported = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
-     *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class DownloadableOrderData {
-
-        @XmlAttribute(name = "supported")
-        protected Boolean supported;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Gets the value of the supported property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isSupported() {
-            if (supported == null) {
-                return true;
-            } else {
-                return supported;
-            }
-        }
-
-        /**
-         * Sets the value of the supported property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setSupported(Boolean value) {
-            this.supported = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-
-    /**
-     * Optional support flag, default = true.
-     * 
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
-     *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class PreValidation {
-
-        @XmlAttribute(name = "supported")
-        protected Boolean supported;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Gets the value of the supported property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isSupported() {
-            if (supported == null) {
-                return true;
-            } else {
-                return supported;
-            }
-        }
-
-        /**
-         * Sets the value of the supported property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setSupported(Boolean value) {
-            this.supported = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
-     *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Recovery {
-
-        @XmlAttribute(name = "supported")
-        protected Boolean supported;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Gets the value of the supported property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isSupported() {
-            if (supported == null) {
-                return true;
-            } else {
-                return supported;
-            }
-        }
-
-        /**
-         * Sets the value of the supported property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setSupported(Boolean value) {
-            this.supported = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}OptSupportFlag"/>
-     *       &lt;attribute name="persistent" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-     *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class X509Data {
-
-        @XmlAttribute(name = "persistent")
-        protected Boolean persistent;
-        @XmlAttribute(name = "supported")
-        protected Boolean supported;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Gets the value of the persistent property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isPersistent() {
-            if (persistent == null) {
-                return false;
-            } else {
-                return persistent;
-            }
-        }
-
-        /**
-         * Sets the value of the persistent property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setPersistent(Boolean value) {
-            this.persistent = value;
-        }
-
-        /**
-         * Gets the value of the supported property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isSupported() {
-            if (supported == null) {
-                return true;
-            } else {
-                return supported;
-            }
-        }
-
-        /**
-         * Sets the value of the supported property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setSupported(Boolean value) {
-            this.supported = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HPDResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HPDResponseOrderDataType.java
deleted file mode 100644
index 3909135..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HPDResponseOrderDataType.java
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HPD (Antwort: Bankparameter 
abholen).
- * 
- * <p>Java class for HPDResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HPDResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="AccessParams" 
type="{urn:org:ebics:H004}HPDAccessParamsType"/>
- *         &lt;element name="ProtocolParams" 
type="{urn:org:ebics:H004}HPDProtocolParamsType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HPDResponseOrderDataType", propOrder = {
-    "accessParams",
-    "protocolParams"
-})
-public class HPDResponseOrderDataType {
-
-    @XmlElement(name = "AccessParams", required = true)
-    protected HPDAccessParamsType accessParams;
-    @XmlElement(name = "ProtocolParams", required = true)
-    protected HPDProtocolParamsType protocolParams;
-
-    /**
-     * Gets the value of the accessParams property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDAccessParamsType }
-     *     
-     */
-    public HPDAccessParamsType getAccessParams() {
-        return accessParams;
-    }
-
-    /**
-     * Sets the value of the accessParams property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDAccessParamsType }
-     *     
-     */
-    public void setAccessParams(HPDAccessParamsType value) {
-        this.accessParams = value;
-    }
-
-    /**
-     * Gets the value of the protocolParams property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HPDProtocolParamsType }
-     *     
-     */
-    public HPDProtocolParamsType getProtocolParams() {
-        return protocolParams;
-    }
-
-    /**
-     * Sets the value of the protocolParams property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HPDProtocolParamsType }
-     *     
-     */
-    public void setProtocolParams(HPDProtocolParamsType value) {
-        this.protocolParams = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HPDVersionType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HPDVersionType.java
deleted file mode 100644
index 6f691f0..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HPDVersionType.java
+++ /dev/null
@@ -1,234 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für HPD-Versionsinformationen.
- * 
- * <p>Java class for HPDVersionType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HPDVersionType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="Protocol">
- *           &lt;simpleType>
- *             &lt;list itemType="{urn:org:ebics:H004}ProtocolVersionType" />
- *           &lt;/simpleType>
- *         &lt;/element>
- *         &lt;element name="Authentication">
- *           &lt;simpleType>
- *             &lt;list 
itemType="{urn:org:ebics:H004}AuthenticationVersionType" />
- *           &lt;/simpleType>
- *         &lt;/element>
- *         &lt;element name="Encryption">
- *           &lt;simpleType>
- *             &lt;list itemType="{urn:org:ebics:H004}EncryptionVersionType" />
- *           &lt;/simpleType>
- *         &lt;/element>
- *         &lt;element name="Signature">
- *           &lt;simpleType>
- *             &lt;list 
itemType="{http://www.ebics.org/S001}SignatureVersionType"; />
- *           &lt;/simpleType>
- *         &lt;/element>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HPDVersionType", propOrder = {
-    "protocol",
-    "authentication",
-    "encryption",
-    "signature",
-    "any"
-})
-public class HPDVersionType {
-
-    @XmlList
-    @XmlElement(name = "Protocol", required = true)
-    protected List<String> protocol;
-    @XmlList
-    @XmlElement(name = "Authentication", required = true)
-    protected List<String> authentication;
-    @XmlList
-    @XmlElement(name = "Encryption", required = true)
-    protected List<String> encryption;
-    @XmlList
-    @XmlElement(name = "Signature", required = true)
-    protected List<String> signature;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the protocol property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the protocol 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getProtocol().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getProtocol() {
-        if (protocol == null) {
-            protocol = new ArrayList<String>();
-        }
-        return this.protocol;
-    }
-
-    /**
-     * Gets the value of the authentication property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
authentication property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAuthentication().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getAuthentication() {
-        if (authentication == null) {
-            authentication = new ArrayList<String>();
-        }
-        return this.authentication;
-    }
-
-    /**
-     * Gets the value of the encryption property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the encryption 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getEncryption().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getEncryption() {
-        if (encryption == null) {
-            encryption = new ArrayList<String>();
-        }
-        return this.encryption;
-    }
-
-    /**
-     * Gets the value of the signature property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the signature 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSignature().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getSignature() {
-        if (signature == null) {
-            signature = new ArrayList<String>();
-        }
-        return this.signature;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HSARequestOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HSARequestOrderDataType.java
deleted file mode 100644
index 136a984..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HSARequestOrderDataType.java
+++ /dev/null
@@ -1,200 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HSA (Anfrage: Initialisierung 
der Teilnehmerschlüssel für Authentifikation und Verschlüsselung, bankfachlich 
signiert mit FTAM-Schlüssel).
- * 
- * <p>Java class for HSARequestOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HSARequestOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="AuthenticationPubKeyInfo" 
type="{urn:org:ebics:H004}AuthenticationPubKeyInfoType"/>
- *         &lt;element name="EncryptionPubKeyInfo" 
type="{urn:org:ebics:H004}EncryptionPubKeyInfoType"/>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HSARequestOrderDataType", propOrder = {
-    "authenticationPubKeyInfo",
-    "encryptionPubKeyInfo",
-    "partnerID",
-    "userID",
-    "any"
-})
-public class HSARequestOrderDataType {
-
-    @XmlElement(name = "AuthenticationPubKeyInfo", required = true)
-    protected AuthenticationPubKeyInfoType authenticationPubKeyInfo;
-    @XmlElement(name = "EncryptionPubKeyInfo", required = true)
-    protected EncryptionPubKeyInfoType encryptionPubKeyInfo;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the authenticationPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public AuthenticationPubKeyInfoType getAuthenticationPubKeyInfo() {
-        return authenticationPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the authenticationPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthenticationPubKeyInfoType }
-     *     
-     */
-    public void setAuthenticationPubKeyInfo(AuthenticationPubKeyInfoType 
value) {
-        this.authenticationPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the encryptionPubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public EncryptionPubKeyInfoType getEncryptionPubKeyInfo() {
-        return encryptionPubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the encryptionPubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EncryptionPubKeyInfoType }
-     *     
-     */
-    public void setEncryptionPubKeyInfo(EncryptionPubKeyInfoType value) {
-        this.encryptionPubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HTDReponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HTDReponseOrderDataType.java
deleted file mode 100644
index 80cd6e6..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HTDReponseOrderDataType.java
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HTD (Antwort: Kunden- und 
Teilnehmerdaten des Teilnehmers abholen).
- * 
- * <p>Java class for HTDReponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HTDReponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="PartnerInfo" 
type="{urn:org:ebics:H004}PartnerInfoType"/>
- *         &lt;element name="UserInfo" 
type="{urn:org:ebics:H004}UserInfoType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HTDReponseOrderDataType", propOrder = {
-    "partnerInfo",
-    "userInfo",
-    "any"
-})
-public class HTDReponseOrderDataType {
-
-    @XmlElement(name = "PartnerInfo", required = true)
-    protected PartnerInfoType partnerInfo;
-    @XmlElement(name = "UserInfo", required = true)
-    protected UserInfoType userInfo;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PartnerInfoType }
-     *     
-     */
-    public PartnerInfoType getPartnerInfo() {
-        return partnerInfo;
-    }
-
-    /**
-     * Sets the value of the partnerInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PartnerInfoType }
-     *     
-     */
-    public void setPartnerInfo(PartnerInfoType value) {
-        this.partnerInfo = value;
-    }
-
-    /**
-     * Gets the value of the userInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link UserInfoType }
-     *     
-     */
-    public UserInfoType getUserInfo() {
-        return userInfo;
-    }
-
-    /**
-     * Sets the value of the userInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link UserInfoType }
-     *     
-     */
-    public void setUserInfo(UserInfoType value) {
-        this.userInfo = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVDOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVDOrderParamsType.java
deleted file mode 100644
index a969b0c..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVDOrderParamsType.java
+++ /dev/null
@@ -1,199 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für Auftragsart HVD.
- * 
- * <p>Java class for HVDOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVDOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;group ref="{urn:org:ebics:H004}HVRequestStructure"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVDOrderParamsType", propOrder = {
-    "partnerID",
-    "orderType",
-    "fileFormat",
-    "orderID",
-    "any"
-})
-public class HVDOrderParamsType {
-
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "OrderID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the orderID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderID() {
-        return orderID;
-    }
-
-    /**
-     * Sets the value of the orderID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderID(String value) {
-        this.orderID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVDResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVDResponseOrderDataType.java
deleted file mode 100644
index 842df46..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVDResponseOrderDataType.java
+++ /dev/null
@@ -1,240 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HVD (Antwort: VEU-Status 
abrufen).
- * 
- * <p>Java class for HVDResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVDResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="DataDigest" 
type="{urn:org:ebics:H004}DataDigestType"/>
- *         &lt;element name="DisplayFile" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         &lt;element name="OrderDataAvailable" 
type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="OrderDataSize" 
type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *         &lt;element name="OrderDetailsAvailable" 
type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="BankSignature" 
type="{urn:org:ebics:H004}SignatureType" maxOccurs="0" minOccurs="0"/>
- *         &lt;element name="SignerInfo" 
type="{urn:org:ebics:H004}SignerInfoType" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVDResponseOrderDataType", propOrder = {
-    "dataDigest",
-    "displayFile",
-    "orderDataAvailable",
-    "orderDataSize",
-    "orderDetailsAvailable",
-    "signerInfo",
-    "any"
-})
-public class HVDResponseOrderDataType {
-
-    @XmlElement(name = "DataDigest", required = true)
-    protected DataDigestType dataDigest;
-    @XmlElement(name = "DisplayFile", required = true)
-    protected byte[] displayFile;
-    @XmlElement(name = "OrderDataAvailable")
-    protected boolean orderDataAvailable;
-    @XmlElement(name = "OrderDataSize", required = true)
-    @XmlSchemaType(name = "positiveInteger")
-    protected BigInteger orderDataSize;
-    @XmlElement(name = "OrderDetailsAvailable")
-    protected boolean orderDetailsAvailable;
-    @XmlElement(name = "SignerInfo")
-    protected List<SignerInfoType> signerInfo;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the dataDigest property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataDigestType }
-     *     
-     */
-    public DataDigestType getDataDigest() {
-        return dataDigest;
-    }
-
-    /**
-     * Sets the value of the dataDigest property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataDigestType }
-     *     
-     */
-    public void setDataDigest(DataDigestType value) {
-        this.dataDigest = value;
-    }
-
-    /**
-     * Gets the value of the displayFile property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getDisplayFile() {
-        return displayFile;
-    }
-
-    /**
-     * Sets the value of the displayFile property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setDisplayFile(byte[] value) {
-        this.displayFile = value;
-    }
-
-    /**
-     * Gets the value of the orderDataAvailable property.
-     * 
-     */
-    public boolean isOrderDataAvailable() {
-        return orderDataAvailable;
-    }
-
-    /**
-     * Sets the value of the orderDataAvailable property.
-     * 
-     */
-    public void setOrderDataAvailable(boolean value) {
-        this.orderDataAvailable = value;
-    }
-
-    /**
-     * Gets the value of the orderDataSize property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getOrderDataSize() {
-        return orderDataSize;
-    }
-
-    /**
-     * Sets the value of the orderDataSize property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setOrderDataSize(BigInteger value) {
-        this.orderDataSize = value;
-    }
-
-    /**
-     * Gets the value of the orderDetailsAvailable property.
-     * 
-     */
-    public boolean isOrderDetailsAvailable() {
-        return orderDetailsAvailable;
-    }
-
-    /**
-     * Sets the value of the orderDetailsAvailable property.
-     * 
-     */
-    public void setOrderDetailsAvailable(boolean value) {
-        this.orderDetailsAvailable = value;
-    }
-
-    /**
-     * Gets the value of the signerInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the signerInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSignerInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SignerInfoType }
-     * 
-     * 
-     */
-    public List<SignerInfoType> getSignerInfo() {
-        if (signerInfo == null) {
-            signerInfo = new ArrayList<SignerInfoType>();
-        }
-        return this.signerInfo;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVEOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVEOrderParamsType.java
deleted file mode 100644
index 012b62a..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVEOrderParamsType.java
+++ /dev/null
@@ -1,199 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für Auftragsart HVE.
- * 
- * <p>Java class for HVEOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVEOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;group ref="{urn:org:ebics:H004}HVRequestStructure"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVEOrderParamsType", propOrder = {
-    "partnerID",
-    "orderType",
-    "fileFormat",
-    "orderID",
-    "any"
-})
-public class HVEOrderParamsType {
-
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "OrderID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the orderID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderID() {
-        return orderID;
-    }
-
-    /**
-     * Sets the value of the orderID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderID(String value) {
-        this.orderID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVSOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVSOrderParamsType.java
deleted file mode 100644
index 2c42476..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVSOrderParamsType.java
+++ /dev/null
@@ -1,199 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für Auftragsart HVS.
- * 
- * <p>Java class for HVSOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVSOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;group ref="{urn:org:ebics:H004}HVRequestStructure"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVSOrderParamsType", propOrder = {
-    "partnerID",
-    "orderType",
-    "fileFormat",
-    "orderID",
-    "any"
-})
-public class HVSOrderParamsType {
-
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "OrderID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the orderID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderID() {
-        return orderID;
-    }
-
-    /**
-     * Sets the value of the orderID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderID(String value) {
-        this.orderID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVSRequestOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVSRequestOrderDataType.java
deleted file mode 100644
index a9c8d38..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVSRequestOrderDataType.java
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HVS (Anfrage: VEU-Storno).
- * 
- * <p>Java class for HVSRequestOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVSRequestOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="CancelledDataDigest" 
type="{urn:org:ebics:H004}DataDigestType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVSRequestOrderDataType", propOrder = {
-    "cancelledDataDigest",
-    "any"
-})
-public class HVSRequestOrderDataType {
-
-    @XmlElement(name = "CancelledDataDigest", required = true)
-    protected DataDigestType cancelledDataDigest;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the cancelledDataDigest property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataDigestType }
-     *     
-     */
-    public DataDigestType getCancelledDataDigest() {
-        return cancelledDataDigest;
-    }
-
-    /**
-     * Sets the value of the cancelledDataDigest property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataDigestType }
-     *     
-     */
-    public void setCancelledDataDigest(DataDigestType value) {
-        this.cancelledDataDigest = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVTAccountInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVTAccountInfoType.java
deleted file mode 100644
index 7b1ba6b..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVTAccountInfoType.java
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Data type for account information regarding order type HVT.
- * 
- * <p>Java class for HVTAccountInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVTAccountInfoType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}AttributedAccountType">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVTAccountInfoType")
-public class HVTAccountInfoType
-    extends AttributedAccountType
-{
-
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVTOrderFlagsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVTOrderFlagsType.java
deleted file mode 100644
index 3b1e6ee..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVTOrderFlagsType.java
+++ /dev/null
@@ -1,155 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.math.BigInteger;
-import java.util.HashMap;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-
-/**
- * Datentyp für HVT-Auftragsflags.
- * 
- * <p>Java class for HVTOrderFlagsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVTOrderFlagsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;attribute name="completeOrderData" use="required" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; />
- *       &lt;attribute name="fetchLimit" use="required">
- *         &lt;simpleType>
- *           &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger";>
- *             &lt;totalDigits value="10"/>
- *           &lt;/restriction>
- *         &lt;/simpleType>
- *       &lt;/attribute>
- *       &lt;attribute name="fetchOffset" use="required">
- *         &lt;simpleType>
- *           &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger";>
- *             &lt;totalDigits value="10"/>
- *           &lt;/restriction>
- *         &lt;/simpleType>
- *       &lt;/attribute>
- *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVTOrderFlagsType")
-@XmlSeeAlso({
-    tech.libeufin.messages.ebics.response.HVTOrderParamsType.OrderFlags.class
-})
-public class HVTOrderFlagsType {
-
-    @XmlAttribute(name = "completeOrderData", required = true)
-    protected boolean completeOrderData;
-    @XmlAttribute(name = "fetchLimit", required = true)
-    protected BigInteger fetchLimit;
-    @XmlAttribute(name = "fetchOffset", required = true)
-    protected BigInteger fetchOffset;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-    /**
-     * Gets the value of the completeOrderData property.
-     * 
-     */
-    public boolean isCompleteOrderData() {
-        return completeOrderData;
-    }
-
-    /**
-     * Sets the value of the completeOrderData property.
-     * 
-     */
-    public void setCompleteOrderData(boolean value) {
-        this.completeOrderData = value;
-    }
-
-    /**
-     * Gets the value of the fetchLimit property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getFetchLimit() {
-        return fetchLimit;
-    }
-
-    /**
-     * Sets the value of the fetchLimit property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setFetchLimit(BigInteger value) {
-        this.fetchLimit = value;
-    }
-
-    /**
-     * Gets the value of the fetchOffset property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getFetchOffset() {
-        return fetchOffset;
-    }
-
-    /**
-     * Sets the value of the fetchOffset property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setFetchOffset(BigInteger value) {
-        this.fetchOffset = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVTOrderInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVTOrderInfoType.java
deleted file mode 100644
index edd0df4..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVTOrderInfoType.java
+++ /dev/null
@@ -1,520 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.datatype.XMLGregorianCalendar;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für HVT-Auftragsinformationen.
- * 
- * <p>Java class for HVTOrderInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVTOrderInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderFormat" 
type="{urn:org:ebics:H004}OrderFormatType" minOccurs="0"/>
- *         &lt;element name="AccountInfo" 
type="{urn:org:ebics:H004}HVTAccountInfoType" maxOccurs="3" minOccurs="2"/>
- *         &lt;element name="ExecutionDate" minOccurs="0">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension 
base="&lt;http://www.w3.org/2001/XMLSchema>date">
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="Amount">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension base="&lt;urn:org:ebics:H004>AmountValueType">
- *                 &lt;attribute name="isCredit" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; />
- *                 &lt;attribute name="Currency" 
type="{urn:org:ebics:H004}CurrencyBaseType" />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="Description" maxOccurs="4" minOccurs="0">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension 
base="&lt;http://www.w3.org/2001/XMLSchema>string">
- *                 &lt;attribute name="Type" use="required">
- *                   &lt;simpleType>
- *                     &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}token";>
- *                       &lt;enumeration value="Purpose"/>
- *                       &lt;enumeration value="Details"/>
- *                       &lt;enumeration value="Comment"/>
- *                     &lt;/restriction>
- *                   &lt;/simpleType>
- *                 &lt;/attribute>
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVTOrderInfoType", propOrder = {
-    "orderFormat",
-    "accountInfo",
-    "executionDate",
-    "amount",
-    "description",
-    "any"
-})
-public class HVTOrderInfoType {
-
-    @XmlElement(name = "OrderFormat")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderFormat;
-    @XmlElement(name = "AccountInfo", required = true)
-    protected List<HVTAccountInfoType> accountInfo;
-    @XmlElement(name = "ExecutionDate")
-    protected HVTOrderInfoType.ExecutionDate executionDate;
-    @XmlElement(name = "Amount", required = true)
-    protected HVTOrderInfoType.Amount amount;
-    @XmlElement(name = "Description")
-    protected List<HVTOrderInfoType.Description> description;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderFormat() {
-        return orderFormat;
-    }
-
-    /**
-     * Sets the value of the orderFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderFormat(String value) {
-        this.orderFormat = value;
-    }
-
-    /**
-     * Gets the value of the accountInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the accountInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAccountInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link HVTAccountInfoType }
-     * 
-     * 
-     */
-    public List<HVTAccountInfoType> getAccountInfo() {
-        if (accountInfo == null) {
-            accountInfo = new ArrayList<HVTAccountInfoType>();
-        }
-        return this.accountInfo;
-    }
-
-    /**
-     * Gets the value of the executionDate property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVTOrderInfoType.ExecutionDate }
-     *     
-     */
-    public HVTOrderInfoType.ExecutionDate getExecutionDate() {
-        return executionDate;
-    }
-
-    /**
-     * Sets the value of the executionDate property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVTOrderInfoType.ExecutionDate }
-     *     
-     */
-    public void setExecutionDate(HVTOrderInfoType.ExecutionDate value) {
-        this.executionDate = value;
-    }
-
-    /**
-     * Gets the value of the amount property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVTOrderInfoType.Amount }
-     *     
-     */
-    public HVTOrderInfoType.Amount getAmount() {
-        return amount;
-    }
-
-    /**
-     * Sets the value of the amount property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVTOrderInfoType.Amount }
-     *     
-     */
-    public void setAmount(HVTOrderInfoType.Amount value) {
-        this.amount = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the description 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getDescription().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link HVTOrderInfoType.Description }
-     * 
-     * 
-     */
-    public List<HVTOrderInfoType.Description> getDescription() {
-        if (description == null) {
-            description = new ArrayList<HVTOrderInfoType.Description>();
-        }
-        return this.description;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>AmountValueType">
-     *       &lt;attribute name="isCredit" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; />
-     *       &lt;attribute name="Currency" 
type="{urn:org:ebics:H004}CurrencyBaseType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Amount {
-
-        @XmlValue
-        protected BigDecimal value;
-        @XmlAttribute(name = "isCredit")
-        protected Boolean isCredit;
-        @XmlAttribute(name = "Currency")
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String currency;
-
-        /**
-         * Datentyp für einen Betragswert (ohne Währung).
-         * 
-         * @return
-         *     possible object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public BigDecimal getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public void setValue(BigDecimal value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the isCredit property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isIsCredit() {
-            return isCredit;
-        }
-
-        /**
-         * Sets the value of the isCredit property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setIsCredit(Boolean value) {
-            this.isCredit = value;
-        }
-
-        /**
-         * Gets the value of the currency property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getCurrency() {
-            return currency;
-        }
-
-        /**
-         * Sets the value of the currency property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setCurrency(String value) {
-            this.currency = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
-     *       &lt;attribute name="Type" use="required">
-     *         &lt;simpleType>
-     *           &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}token";>
-     *             &lt;enumeration value="Purpose"/>
-     *             &lt;enumeration value="Details"/>
-     *             &lt;enumeration value="Comment"/>
-     *           &lt;/restriction>
-     *         &lt;/simpleType>
-     *       &lt;/attribute>
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Description {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "Type", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String type;
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the type property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getType() {
-            return type;
-        }
-
-        /**
-         * Sets the value of the type property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setType(String value) {
-            this.type = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>date">
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class ExecutionDate {
-
-        @XmlValue
-        @XmlSchemaType(name = "date")
-        protected XMLGregorianCalendar value;
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public XMLGregorianCalendar getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public void setValue(XMLGregorianCalendar value) {
-            this.value = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVTOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVTOrderParamsType.java
deleted file mode 100644
index 3257c72..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVTOrderParamsType.java
+++ /dev/null
@@ -1,295 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for additional order parameters for order type HVT.
- * 
- * <p>Java class for HVTOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVTOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;group ref="{urn:org:ebics:H004}HVRequestStructure"/>
- *         &lt;element name="OrderFlags">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;extension base="{urn:org:ebics:H004}HVTOrderFlagsType">
- *                 &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *               &lt;/extension>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element ref="{urn:org:ebics:H004}Parameter" 
maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVTOrderParamsType", propOrder = {
-    "partnerID",
-    "orderType",
-    "fileFormat",
-    "orderID",
-    "orderFlags",
-    "parameter",
-    "any"
-})
-public class HVTOrderParamsType {
-
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "OrderID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderID;
-    @XmlElement(name = "OrderFlags", required = true)
-    protected HVTOrderParamsType.OrderFlags orderFlags;
-    @XmlElement(name = "Parameter")
-    protected List<Parameter> parameter;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the orderID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderID() {
-        return orderID;
-    }
-
-    /**
-     * Sets the value of the orderID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderID(String value) {
-        this.orderID = value;
-    }
-
-    /**
-     * Gets the value of the orderFlags property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVTOrderParamsType.OrderFlags }
-     *     
-     */
-    public HVTOrderParamsType.OrderFlags getOrderFlags() {
-        return orderFlags;
-    }
-
-    /**
-     * Sets the value of the orderFlags property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVTOrderParamsType.OrderFlags }
-     *     
-     */
-    public void setOrderFlags(HVTOrderParamsType.OrderFlags value) {
-        this.orderFlags = value;
-    }
-
-    /**
-     * Generic key-value parameters Gets the value of the parameter property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the parameter 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getParameter().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Parameter }
-     * 
-     * 
-     */
-    public List<Parameter> getParameter() {
-        if (parameter == null) {
-            parameter = new ArrayList<Parameter>();
-        }
-        return this.parameter;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:org:ebics:H004}HVTOrderFlagsType">
-     *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class OrderFlags
-        extends HVTOrderFlagsType
-    {
-
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVTResponseOrderData.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVTResponseOrderData.java
deleted file mode 100644
index 2771c5c..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVTResponseOrderData.java
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}HVTResponseOrderDataType">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "")
-public class HVTResponseOrderData
-    extends HVTResponseOrderDataType
-{
-
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVTResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVTResponseOrderDataType.java
deleted file mode 100644
index 6267f51..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVTResponseOrderDataType.java
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Antwort mit Einzelauftraginfos für Auftragsart HVT (Antwort 
VEU-Transaktionsdetails abrufen mit completeOrderData="false").
- * 
- * <p>Java class for HVTResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVTResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="NumOrderInfos" 
type="{urn:org:ebics:H004}NumOrderInfosType"/>
- *         &lt;element name="OrderInfo" 
type="{urn:org:ebics:H004}HVTOrderInfoType" maxOccurs="unbounded"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVTResponseOrderDataType", propOrder = {
-    "numOrderInfos",
-    "orderInfo",
-    "any"
-})
-@XmlSeeAlso({
-    HVTResponseOrderData.class
-})
-public class HVTResponseOrderDataType {
-
-    @XmlElement(name = "NumOrderInfos", required = true)
-    @XmlSchemaType(name = "nonNegativeInteger")
-    protected BigInteger numOrderInfos;
-    @XmlElement(name = "OrderInfo", required = true)
-    protected List<HVTOrderInfoType> orderInfo;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the numOrderInfos property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getNumOrderInfos() {
-        return numOrderInfos;
-    }
-
-    /**
-     * Sets the value of the numOrderInfos property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setNumOrderInfos(BigInteger value) {
-        this.numOrderInfos = value;
-    }
-
-    /**
-     * Gets the value of the orderInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link HVTOrderInfoType }
-     * 
-     * 
-     */
-    public List<HVTOrderInfoType> getOrderInfo() {
-        if (orderInfo == null) {
-            orderInfo = new ArrayList<HVTOrderInfoType>();
-        }
-        return this.orderInfo;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVUOrderDetailsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVUOrderDetailsType.java
deleted file mode 100644
index 8ed20a6..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVUOrderDetailsType.java
+++ /dev/null
@@ -1,291 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für HVU-Auftragsdetails.
- * 
- * <p>Java class for HVUOrderDetailsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVUOrderDetailsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderType" 
type="{urn:org:ebics:H004}OrderTBaseType"/>
- *         &lt;element name="FileFormat" 
type="{urn:org:ebics:H004}FileFormatType" minOccurs="0"/>
- *         &lt;element name="OrderID" type="{urn:org:ebics:H004}OrderIDType"/>
- *         &lt;element name="OrderDataSize" 
type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *         &lt;element name="SigningInfo" 
type="{urn:org:ebics:H004}HVUSigningInfoType"/>
- *         &lt;element name="SignerInfo" 
type="{urn:org:ebics:H004}SignerInfoType" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="OriginatorInfo" 
type="{urn:org:ebics:H004}HVUOriginatorInfoType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVUOrderDetailsType", propOrder = {
-    "orderType",
-    "fileFormat",
-    "orderID",
-    "orderDataSize",
-    "signingInfo",
-    "signerInfo",
-    "originatorInfo",
-    "any"
-})
-public class HVUOrderDetailsType {
-
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "OrderID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderID;
-    @XmlElement(name = "OrderDataSize", required = true)
-    @XmlSchemaType(name = "positiveInteger")
-    protected BigInteger orderDataSize;
-    @XmlElement(name = "SigningInfo", required = true)
-    protected HVUSigningInfoType signingInfo;
-    @XmlElement(name = "SignerInfo")
-    protected List<SignerInfoType> signerInfo;
-    @XmlElement(name = "OriginatorInfo", required = true)
-    protected HVUOriginatorInfoType originatorInfo;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the orderID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderID() {
-        return orderID;
-    }
-
-    /**
-     * Sets the value of the orderID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderID(String value) {
-        this.orderID = value;
-    }
-
-    /**
-     * Gets the value of the orderDataSize property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getOrderDataSize() {
-        return orderDataSize;
-    }
-
-    /**
-     * Sets the value of the orderDataSize property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setOrderDataSize(BigInteger value) {
-        this.orderDataSize = value;
-    }
-
-    /**
-     * Gets the value of the signingInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVUSigningInfoType }
-     *     
-     */
-    public HVUSigningInfoType getSigningInfo() {
-        return signingInfo;
-    }
-
-    /**
-     * Sets the value of the signingInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVUSigningInfoType }
-     *     
-     */
-    public void setSigningInfo(HVUSigningInfoType value) {
-        this.signingInfo = value;
-    }
-
-    /**
-     * Gets the value of the signerInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the signerInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSignerInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SignerInfoType }
-     * 
-     * 
-     */
-    public List<SignerInfoType> getSignerInfo() {
-        if (signerInfo == null) {
-            signerInfo = new ArrayList<SignerInfoType>();
-        }
-        return this.signerInfo;
-    }
-
-    /**
-     * Gets the value of the originatorInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVUOriginatorInfoType }
-     *     
-     */
-    public HVUOriginatorInfoType getOriginatorInfo() {
-        return originatorInfo;
-    }
-
-    /**
-     * Sets the value of the originatorInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVUOriginatorInfoType }
-     *     
-     */
-    public void setOriginatorInfo(HVUOriginatorInfoType value) {
-        this.originatorInfo = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVUOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVUOrderParamsType.java
deleted file mode 100644
index dd75741..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVUOrderParamsType.java
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für Auftragsart HVU.
- * 
- * <p>Java class for HVUOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVUOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderTypes" 
type="{urn:org:ebics:H004}OrderTListType" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVUOrderParamsType", propOrder = {
-    "orderTypes",
-    "any"
-})
-public class HVUOrderParamsType {
-
-    @XmlList
-    @XmlElement(name = "OrderTypes")
-    protected List<String> orderTypes;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderTypes property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderTypes 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderTypes().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getOrderTypes() {
-        if (orderTypes == null) {
-            orderTypes = new ArrayList<String>();
-        }
-        return this.orderTypes;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVUOriginatorInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVUOriginatorInfoType.java
deleted file mode 100644
index 60c9347..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVUOriginatorInfoType.java
+++ /dev/null
@@ -1,203 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * Datentyp für Informationen zum Ersteller eines HVU-Auftrags.
- * 
- * <p>Java class for HVUOriginatorInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVUOriginatorInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;element name="Name" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;element name="Timestamp" 
type="{urn:org:ebics:H004}TimestampType"/>
- *         &lt;any namespace='urn:org:ebics:H004' maxOccurs="unbounded" 
minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVUOriginatorInfoType", propOrder = {
-    "partnerID",
-    "userID",
-    "name",
-    "timestamp",
-    "any"
-})
-public class HVUOriginatorInfoType {
-
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlElement(name = "Name")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String name;
-    @XmlElement(name = "Timestamp", required = true)
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar timestamp;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the timestamp property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getTimestamp() {
-        return timestamp;
-    }
-
-    /**
-     * Sets the value of the timestamp property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setTimestamp(XMLGregorianCalendar value) {
-        this.timestamp = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVUResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVUResponseOrderDataType.java
deleted file mode 100644
index e0391c5..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVUResponseOrderDataType.java
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Auftragsdaten für Auftragsart HVU (Antwort: VEU-Übersicht 
abholen).
- * 
- * <p>Java class for HVUResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVUResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderDetails" 
type="{urn:org:ebics:H004}HVUOrderDetailsType" maxOccurs="unbounded"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVUResponseOrderDataType", propOrder = {
-    "orderDetails",
-    "any"
-})
-public class HVUResponseOrderDataType {
-
-    @XmlElement(name = "OrderDetails", required = true)
-    protected List<HVUOrderDetailsType> orderDetails;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderDetails property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderDetails 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderDetails().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link HVUOrderDetailsType }
-     * 
-     * 
-     */
-    public List<HVUOrderDetailsType> getOrderDetails() {
-        if (orderDetails == null) {
-            orderDetails = new ArrayList<HVUOrderDetailsType>();
-        }
-        return this.orderDetails;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVUSigningInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVUSigningInfoType.java
deleted file mode 100644
index d0e128d..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVUSigningInfoType.java
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.math.BigInteger;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für Informationen zu den HVU-Unterschriftsmodalitäten.
- * 
- * <p>Java class for HVUSigningInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVUSigningInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;attribute name="readyToBeSigned" use="required" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; />
- *       &lt;attribute name="NumSigRequired" use="required" 
type="{http://www.w3.org/2001/XMLSchema}positiveInteger"; />
- *       &lt;attribute name="NumSigDone" use="required" 
type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVUSigningInfoType")
-public class HVUSigningInfoType {
-
-    @XmlAttribute(name = "readyToBeSigned", required = true)
-    protected boolean readyToBeSigned;
-    @XmlAttribute(name = "NumSigRequired", required = true)
-    @XmlSchemaType(name = "positiveInteger")
-    protected BigInteger numSigRequired;
-    @XmlAttribute(name = "NumSigDone", required = true)
-    @XmlSchemaType(name = "nonNegativeInteger")
-    protected BigInteger numSigDone;
-
-    /**
-     * Gets the value of the readyToBeSigned property.
-     * 
-     */
-    public boolean isReadyToBeSigned() {
-        return readyToBeSigned;
-    }
-
-    /**
-     * Sets the value of the readyToBeSigned property.
-     * 
-     */
-    public void setReadyToBeSigned(boolean value) {
-        this.readyToBeSigned = value;
-    }
-
-    /**
-     * Gets the value of the numSigRequired property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getNumSigRequired() {
-        return numSigRequired;
-    }
-
-    /**
-     * Sets the value of the numSigRequired property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setNumSigRequired(BigInteger value) {
-        this.numSigRequired = value;
-    }
-
-    /**
-     * Gets the value of the numSigDone property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getNumSigDone() {
-        return numSigDone;
-    }
-
-    /**
-     * Sets the value of the numSigDone property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setNumSigDone(BigInteger value) {
-        this.numSigDone = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVZOrderDetailsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVZOrderDetailsType.java
deleted file mode 100644
index e9e8c8e..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVZOrderDetailsType.java
+++ /dev/null
@@ -1,1190 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für HVZ-Auftragsdetails.
- * 
- * <p>Java class for HVZOrderDetailsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVZOrderDetailsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderType" 
type="{urn:org:ebics:H004}OrderTBaseType"/>
- *         &lt;element name="FileFormat" 
type="{urn:org:ebics:H004}FileFormatType" minOccurs="0"/>
- *         &lt;element name="OrderID" type="{urn:org:ebics:H004}OrderIDType"/>
- *         &lt;element name="DataDigest" 
type="{urn:org:ebics:H004}DataDigestType"/>
- *         &lt;element name="OrderDataAvailable" 
type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="OrderDataSize" 
type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *         &lt;element name="OrderDetailsAvailable" 
type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;group ref="{urn:org:ebics:H004}HVZPaymentOrderDetailsStructure" 
minOccurs="0"/>
- *         &lt;element name="SigningInfo" 
type="{urn:org:ebics:H004}HVUSigningInfoType"/>
- *         &lt;element name="SignerInfo" 
type="{urn:org:ebics:H004}SignerInfoType" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="OriginatorInfo" 
type="{urn:org:ebics:H004}HVUOriginatorInfoType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVZOrderDetailsType", propOrder = {
-    "orderType",
-    "fileFormat",
-    "orderID",
-    "dataDigest",
-    "orderDataAvailable",
-    "orderDataSize",
-    "orderDetailsAvailable",
-    "totalOrders",
-    "totalAmount",
-    "currency",
-    "firstOrderInfo",
-    "signingInfo",
-    "signerInfo",
-    "originatorInfo",
-    "any"
-})
-public class HVZOrderDetailsType {
-
-    @XmlElement(name = "OrderType", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderType;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "OrderID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderID;
-    @XmlElement(name = "DataDigest", required = true)
-    protected DataDigestType dataDigest;
-    @XmlElement(name = "OrderDataAvailable")
-    protected boolean orderDataAvailable;
-    @XmlElement(name = "OrderDataSize", required = true)
-    @XmlSchemaType(name = "positiveInteger")
-    protected BigInteger orderDataSize;
-    @XmlElement(name = "OrderDetailsAvailable")
-    protected boolean orderDetailsAvailable;
-    @XmlElement(name = "TotalOrders")
-    @XmlSchemaType(name = "nonNegativeInteger")
-    protected BigInteger totalOrders;
-    @XmlElement(name = "TotalAmount")
-    protected HVZOrderDetailsType.TotalAmount totalAmount;
-    @XmlElement(name = "Currency")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String currency;
-    @XmlElement(name = "FirstOrderInfo")
-    protected HVZOrderDetailsType.FirstOrderInfo firstOrderInfo;
-    @XmlElement(name = "SigningInfo", required = true)
-    protected HVUSigningInfoType signingInfo;
-    @XmlElement(name = "SignerInfo")
-    protected List<SignerInfoType> signerInfo;
-    @XmlElement(name = "OriginatorInfo", required = true)
-    protected HVUOriginatorInfoType originatorInfo;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * Sets the value of the orderType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderType(String value) {
-        this.orderType = value;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the orderID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderID() {
-        return orderID;
-    }
-
-    /**
-     * Sets the value of the orderID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderID(String value) {
-        this.orderID = value;
-    }
-
-    /**
-     * Gets the value of the dataDigest property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataDigestType }
-     *     
-     */
-    public DataDigestType getDataDigest() {
-        return dataDigest;
-    }
-
-    /**
-     * Sets the value of the dataDigest property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataDigestType }
-     *     
-     */
-    public void setDataDigest(DataDigestType value) {
-        this.dataDigest = value;
-    }
-
-    /**
-     * Gets the value of the orderDataAvailable property.
-     * 
-     */
-    public boolean isOrderDataAvailable() {
-        return orderDataAvailable;
-    }
-
-    /**
-     * Sets the value of the orderDataAvailable property.
-     * 
-     */
-    public void setOrderDataAvailable(boolean value) {
-        this.orderDataAvailable = value;
-    }
-
-    /**
-     * Gets the value of the orderDataSize property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getOrderDataSize() {
-        return orderDataSize;
-    }
-
-    /**
-     * Sets the value of the orderDataSize property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setOrderDataSize(BigInteger value) {
-        this.orderDataSize = value;
-    }
-
-    /**
-     * Gets the value of the orderDetailsAvailable property.
-     * 
-     */
-    public boolean isOrderDetailsAvailable() {
-        return orderDetailsAvailable;
-    }
-
-    /**
-     * Sets the value of the orderDetailsAvailable property.
-     * 
-     */
-    public void setOrderDetailsAvailable(boolean value) {
-        this.orderDetailsAvailable = value;
-    }
-
-    /**
-     * Gets the value of the totalOrders property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getTotalOrders() {
-        return totalOrders;
-    }
-
-    /**
-     * Sets the value of the totalOrders property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setTotalOrders(BigInteger value) {
-        this.totalOrders = value;
-    }
-
-    /**
-     * Gets the value of the totalAmount property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVZOrderDetailsType.TotalAmount }
-     *     
-     */
-    public HVZOrderDetailsType.TotalAmount getTotalAmount() {
-        return totalAmount;
-    }
-
-    /**
-     * Sets the value of the totalAmount property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVZOrderDetailsType.TotalAmount }
-     *     
-     */
-    public void setTotalAmount(HVZOrderDetailsType.TotalAmount value) {
-        this.totalAmount = value;
-    }
-
-    /**
-     * Gets the value of the currency property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCurrency() {
-        return currency;
-    }
-
-    /**
-     * Sets the value of the currency property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCurrency(String value) {
-        this.currency = value;
-    }
-
-    /**
-     * Gets the value of the firstOrderInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVZOrderDetailsType.FirstOrderInfo }
-     *     
-     */
-    public HVZOrderDetailsType.FirstOrderInfo getFirstOrderInfo() {
-        return firstOrderInfo;
-    }
-
-    /**
-     * Sets the value of the firstOrderInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVZOrderDetailsType.FirstOrderInfo }
-     *     
-     */
-    public void setFirstOrderInfo(HVZOrderDetailsType.FirstOrderInfo value) {
-        this.firstOrderInfo = value;
-    }
-
-    /**
-     * Gets the value of the signingInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVUSigningInfoType }
-     *     
-     */
-    public HVUSigningInfoType getSigningInfo() {
-        return signingInfo;
-    }
-
-    /**
-     * Sets the value of the signingInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVUSigningInfoType }
-     *     
-     */
-    public void setSigningInfo(HVUSigningInfoType value) {
-        this.signingInfo = value;
-    }
-
-    /**
-     * Gets the value of the signerInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the signerInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSignerInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SignerInfoType }
-     * 
-     * 
-     */
-    public List<SignerInfoType> getSignerInfo() {
-        if (signerInfo == null) {
-            signerInfo = new ArrayList<SignerInfoType>();
-        }
-        return this.signerInfo;
-    }
-
-    /**
-     * Gets the value of the originatorInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HVUOriginatorInfoType }
-     *     
-     */
-    public HVUOriginatorInfoType getOriginatorInfo() {
-        return originatorInfo;
-    }
-
-    /**
-     * Sets the value of the originatorInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HVUOriginatorInfoType }
-     *     
-     */
-    public void setOriginatorInfo(HVUOriginatorInfoType value) {
-        this.originatorInfo = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;sequence>
-     *         &lt;element name="OrderPartyInfo" 
type="{http://www.w3.org/2001/XMLSchema}normalizedString"; minOccurs="0"/>
-     *         &lt;element name="AccountInfo" minOccurs="0">
-     *           &lt;complexType>
-     *             &lt;complexContent>
-     *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *                 &lt;sequence>
-     *                   &lt;choice maxOccurs="2">
-     *                     &lt;element name="AccountNumber">
-     *                       &lt;complexType>
-     *                         &lt;simpleContent>
-     *                           &lt;extension 
base="&lt;urn:org:ebics:H004>AccountNumberType">
-     *                             &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-     *                           &lt;/extension>
-     *                         &lt;/simpleContent>
-     *                       &lt;/complexType>
-     *                     &lt;/element>
-     *                     &lt;element name="NationalAccountNumber">
-     *                       &lt;complexType>
-     *                         &lt;simpleContent>
-     *                           &lt;extension 
base="&lt;urn:org:ebics:H004>NationalAccountNumberType">
-     *                             &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-     *                           &lt;/extension>
-     *                         &lt;/simpleContent>
-     *                       &lt;/complexType>
-     *                     &lt;/element>
-     *                   &lt;/choice>
-     *                   &lt;choice maxOccurs="2">
-     *                     &lt;element name="BankCode">
-     *                       &lt;complexType>
-     *                         &lt;simpleContent>
-     *                           &lt;extension 
base="&lt;urn:org:ebics:H004>BankCodeType">
-     *                             &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-     *                             &lt;attribute name="Prefix" 
type="{urn:org:ebics:H004}BankCodePrefixType" />
-     *                           &lt;/extension>
-     *                         &lt;/simpleContent>
-     *                       &lt;/complexType>
-     *                     &lt;/element>
-     *                     &lt;element name="NationalBankCode">
-     *                       &lt;complexType>
-     *                         &lt;simpleContent>
-     *                           &lt;extension 
base="&lt;urn:org:ebics:H004>NationalBankCodeType">
-     *                             &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-     *                           &lt;/extension>
-     *                         &lt;/simpleContent>
-     *                       &lt;/complexType>
-     *                     &lt;/element>
-     *                   &lt;/choice>
-     *                 &lt;/sequence>
-     *               &lt;/restriction>
-     *             &lt;/complexContent>
-     *           &lt;/complexType>
-     *         &lt;/element>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "orderPartyInfo",
-        "accountInfo"
-    })
-    public static class FirstOrderInfo {
-
-        @XmlElement(name = "OrderPartyInfo")
-        @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-        @XmlSchemaType(name = "normalizedString")
-        protected String orderPartyInfo;
-        @XmlElement(name = "AccountInfo")
-        protected HVZOrderDetailsType.FirstOrderInfo.AccountInfo accountInfo;
-
-        /**
-         * Gets the value of the orderPartyInfo property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getOrderPartyInfo() {
-            return orderPartyInfo;
-        }
-
-        /**
-         * Sets the value of the orderPartyInfo property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setOrderPartyInfo(String value) {
-            this.orderPartyInfo = value;
-        }
-
-        /**
-         * Gets the value of the accountInfo property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link HVZOrderDetailsType.FirstOrderInfo.AccountInfo }
-         *     
-         */
-        public HVZOrderDetailsType.FirstOrderInfo.AccountInfo getAccountInfo() 
{
-            return accountInfo;
-        }
-
-        /**
-         * Sets the value of the accountInfo property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link HVZOrderDetailsType.FirstOrderInfo.AccountInfo }
-         *     
-         */
-        public void 
setAccountInfo(HVZOrderDetailsType.FirstOrderInfo.AccountInfo value) {
-            this.accountInfo = value;
-        }
-
-
-        /**
-         * <p>Java class for anonymous complex type.
-         * 
-         * <p>The following schema fragment specifies the expected content 
contained within this class.
-         * 
-         * <pre>
-         * &lt;complexType>
-         *   &lt;complexContent>
-         *     &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
-         *       &lt;sequence>
-         *         &lt;choice maxOccurs="2">
-         *           &lt;element name="AccountNumber">
-         *             &lt;complexType>
-         *               &lt;simpleContent>
-         *                 &lt;extension 
base="&lt;urn:org:ebics:H004>AccountNumberType">
-         *                   &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-         *                 &lt;/extension>
-         *               &lt;/simpleContent>
-         *             &lt;/complexType>
-         *           &lt;/element>
-         *           &lt;element name="NationalAccountNumber">
-         *             &lt;complexType>
-         *               &lt;simpleContent>
-         *                 &lt;extension 
base="&lt;urn:org:ebics:H004>NationalAccountNumberType">
-         *                   &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-         *                 &lt;/extension>
-         *               &lt;/simpleContent>
-         *             &lt;/complexType>
-         *           &lt;/element>
-         *         &lt;/choice>
-         *         &lt;choice maxOccurs="2">
-         *           &lt;element name="BankCode">
-         *             &lt;complexType>
-         *               &lt;simpleContent>
-         *                 &lt;extension 
base="&lt;urn:org:ebics:H004>BankCodeType">
-         *                   &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-         *                   &lt;attribute name="Prefix" 
type="{urn:org:ebics:H004}BankCodePrefixType" />
-         *                 &lt;/extension>
-         *               &lt;/simpleContent>
-         *             &lt;/complexType>
-         *           &lt;/element>
-         *           &lt;element name="NationalBankCode">
-         *             &lt;complexType>
-         *               &lt;simpleContent>
-         *                 &lt;extension 
base="&lt;urn:org:ebics:H004>NationalBankCodeType">
-         *                   &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-         *                 &lt;/extension>
-         *               &lt;/simpleContent>
-         *             &lt;/complexType>
-         *           &lt;/element>
-         *         &lt;/choice>
-         *       &lt;/sequence>
-         *     &lt;/restriction>
-         *   &lt;/complexContent>
-         * &lt;/complexType>
-         * </pre>
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "accountNumberOrNationalAccountNumber",
-            "bankCodeOrNationalBankCode"
-        })
-        public static class AccountInfo {
-
-            @XmlElements({
-                @XmlElement(name = "AccountNumber", type = 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.AccountNumber.class),
-                @XmlElement(name = "NationalAccountNumber", type = 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalAccountNumber.class)
-            })
-            protected List<Object> accountNumberOrNationalAccountNumber;
-            @XmlElements({
-                @XmlElement(name = "BankCode", type = 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.BankCode.class),
-                @XmlElement(name = "NationalBankCode", type = 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalBankCode.class)
-            })
-            protected List<Object> bankCodeOrNationalBankCode;
-
-            /**
-             * Gets the value of the accountNumberOrNationalAccountNumber 
property.
-             * 
-             * <p>
-             * This accessor method returns a reference to the live list,
-             * not a snapshot. Therefore any modification you make to the
-             * returned list will be present inside the JAXB object.
-             * This is why there is not a <CODE>set</CODE> method for the 
accountNumberOrNationalAccountNumber property.
-             * 
-             * <p>
-             * For example, to add a new item, do as follows:
-             * <pre>
-             *    getAccountNumberOrNationalAccountNumber().add(newItem);
-             * </pre>
-             * 
-             * 
-             * <p>
-             * Objects of the following type(s) are allowed in the list
-             * {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.AccountNumber }
-             * {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalAccountNumber }
-             * 
-             * 
-             */
-            public List<Object> getAccountNumberOrNationalAccountNumber() {
-                if (accountNumberOrNationalAccountNumber == null) {
-                    accountNumberOrNationalAccountNumber = new 
ArrayList<Object>();
-                }
-                return this.accountNumberOrNationalAccountNumber;
-            }
-
-            /**
-             * Gets the value of the bankCodeOrNationalBankCode property.
-             * 
-             * <p>
-             * This accessor method returns a reference to the live list,
-             * not a snapshot. Therefore any modification you make to the
-             * returned list will be present inside the JAXB object.
-             * This is why there is not a <CODE>set</CODE> method for the 
bankCodeOrNationalBankCode property.
-             * 
-             * <p>
-             * For example, to add a new item, do as follows:
-             * <pre>
-             *    getBankCodeOrNationalBankCode().add(newItem);
-             * </pre>
-             * 
-             * 
-             * <p>
-             * Objects of the following type(s) are allowed in the list
-             * {@link HVZOrderDetailsType.FirstOrderInfo.AccountInfo.BankCode }
-             * {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalBankCode }
-             * 
-             * 
-             */
-            public List<Object> getBankCodeOrNationalBankCode() {
-                if (bankCodeOrNationalBankCode == null) {
-                    bankCodeOrNationalBankCode = new ArrayList<Object>();
-                }
-                return this.bankCodeOrNationalBankCode;
-            }
-
-
-            /**
-             * <p>Java class for anonymous complex type.
-             * 
-             * <p>The following schema fragment specifies the expected content 
contained within this class.
-             * 
-             * <pre>
-             * &lt;complexType>
-             *   &lt;simpleContent>
-             *     &lt;extension 
base="&lt;urn:org:ebics:H004>AccountNumberType">
-             *       &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-             *     &lt;/extension>
-             *   &lt;/simpleContent>
-             * &lt;/complexType>
-             * </pre>
-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "", propOrder = {
-                "value"
-            })
-            public static class AccountNumber {
-
-                @XmlValue
-                @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-                protected String value;
-                @XmlAttribute(name = "international")
-                protected Boolean international;
-
-                /**
-                 * Datentyp für eine Kontonummer (national/international).
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getValue() {
-                    return value;
-                }
-
-                /**
-                 * Sets the value of the value property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setValue(String value) {
-                    this.value = value;
-                }
-
-                /**
-                 * Gets the value of the international property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public boolean isInternational() {
-                    if (international == null) {
-                        return false;
-                    } else {
-                        return international;
-                    }
-                }
-
-                /**
-                 * Sets the value of the international property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public void setInternational(Boolean value) {
-                    this.international = value;
-                }
-
-            }
-
-
-            /**
-             * <p>Java class for anonymous complex type.
-             * 
-             * <p>The following schema fragment specifies the expected content 
contained within this class.
-             * 
-             * <pre>
-             * &lt;complexType>
-             *   &lt;simpleContent>
-             *     &lt;extension base="&lt;urn:org:ebics:H004>BankCodeType">
-             *       &lt;attribute name="international" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
-             *       &lt;attribute name="Prefix" 
type="{urn:org:ebics:H004}BankCodePrefixType" />
-             *     &lt;/extension>
-             *   &lt;/simpleContent>
-             * &lt;/complexType>
-             * </pre>
-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "", propOrder = {
-                "value"
-            })
-            public static class BankCode {
-
-                @XmlValue
-                @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-                protected String value;
-                @XmlAttribute(name = "international")
-                protected Boolean international;
-                @XmlAttribute(name = "Prefix")
-                @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-                protected String prefix;
-
-                /**
-                 * Datentyp für eine Bankleitzahl (national/international).
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getValue() {
-                    return value;
-                }
-
-                /**
-                 * Sets the value of the value property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setValue(String value) {
-                    this.value = value;
-                }
-
-                /**
-                 * Gets the value of the international property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public boolean isInternational() {
-                    if (international == null) {
-                        return false;
-                    } else {
-                        return international;
-                    }
-                }
-
-                /**
-                 * Sets the value of the international property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link Boolean }
-                 *     
-                 */
-                public void setInternational(Boolean value) {
-                    this.international = value;
-                }
-
-                /**
-                 * Gets the value of the prefix property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getPrefix() {
-                    return prefix;
-                }
-
-                /**
-                 * Sets the value of the prefix property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setPrefix(String value) {
-                    this.prefix = value;
-                }
-
-            }
-
-
-            /**
-             * <p>Java class for anonymous complex type.
-             * 
-             * <p>The following schema fragment specifies the expected content 
contained within this class.
-             * 
-             * <pre>
-             * &lt;complexType>
-             *   &lt;simpleContent>
-             *     &lt;extension 
base="&lt;urn:org:ebics:H004>NationalAccountNumberType">
-             *       &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-             *     &lt;/extension>
-             *   &lt;/simpleContent>
-             * &lt;/complexType>
-             * </pre>
-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "", propOrder = {
-                "value"
-            })
-            public static class NationalAccountNumber {
-
-                @XmlValue
-                @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-                protected String value;
-                @XmlAttribute(name = "format", required = true)
-                @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-                @XmlSchemaType(name = "token")
-                protected String format;
-
-                /**
-                 * Datentyp für eine Kontonummer (freies Format).
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getValue() {
-                    return value;
-                }
-
-                /**
-                 * Sets the value of the value property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setValue(String value) {
-                    this.value = value;
-                }
-
-                /**
-                 * Gets the value of the format property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getFormat() {
-                    return format;
-                }
-
-                /**
-                 * Sets the value of the format property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setFormat(String value) {
-                    this.format = value;
-                }
-
-            }
-
-
-            /**
-             * <p>Java class for anonymous complex type.
-             * 
-             * <p>The following schema fragment specifies the expected content 
contained within this class.
-             * 
-             * <pre>
-             * &lt;complexType>
-             *   &lt;simpleContent>
-             *     &lt;extension 
base="&lt;urn:org:ebics:H004>NationalBankCodeType">
-             *       &lt;attribute name="format" use="required" 
type="{http://www.w3.org/2001/XMLSchema}token"; />
-             *     &lt;/extension>
-             *   &lt;/simpleContent>
-             * &lt;/complexType>
-             * </pre>
-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "", propOrder = {
-                "value"
-            })
-            public static class NationalBankCode {
-
-                @XmlValue
-                @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-                protected String value;
-                @XmlAttribute(name = "format", required = true)
-                @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-                @XmlSchemaType(name = "token")
-                protected String format;
-
-                /**
-                 * Datentyp für eine Bankleitzahl (freies Format).
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getValue() {
-                    return value;
-                }
-
-                /**
-                 * Sets the value of the value property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setValue(String value) {
-                    this.value = value;
-                }
-
-                /**
-                 * Gets the value of the format property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link String }
-                 *     
-                 */
-                public String getFormat() {
-                    return format;
-                }
-
-                /**
-                 * Sets the value of the format property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link String }
-                 *     
-                 */
-                public void setFormat(String value) {
-                    this.format = value;
-                }
-
-            }
-
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>AmountValueType">
-     *       &lt;attribute name="isCredit" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class TotalAmount {
-
-        @XmlValue
-        protected BigDecimal value;
-        @XmlAttribute(name = "isCredit")
-        protected Boolean isCredit;
-
-        /**
-         * Datentyp für einen Betragswert (ohne Währung).
-         * 
-         * @return
-         *     possible object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public BigDecimal getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public void setValue(BigDecimal value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the isCredit property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isIsCredit() {
-            return isCredit;
-        }
-
-        /**
-         * Sets the value of the isCredit property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setIsCredit(Boolean value) {
-            this.isCredit = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVZOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVZOrderParamsType.java
deleted file mode 100644
index 1fb1743..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVZOrderParamsType.java
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter für Auftragsart HVZ.
- * 
- * <p>Java class for HVZOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVZOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderTypes" 
type="{urn:org:ebics:H004}OrderTListType" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVZOrderParamsType", propOrder = {
-    "orderTypes",
-    "any"
-})
-public class HVZOrderParamsType {
-
-    @XmlList
-    @XmlElement(name = "OrderTypes")
-    protected List<String> orderTypes;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderTypes property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderTypes 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderTypes().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getOrderTypes() {
-        if (orderTypes == null) {
-            orderTypes = new ArrayList<String>();
-        }
-        return this.orderTypes;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVZResponseOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVZResponseOrderDataType.java
deleted file mode 100644
index 579e201..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/HVZResponseOrderDataType.java
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Order data for order type HVZ (response: receive summary of orders 
currently stored in the distributed signature processing unit with additional 
informations).
- * 
- * <p>Java class for HVZResponseOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="HVZResponseOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderDetails" 
type="{urn:org:ebics:H004}HVZOrderDetailsType" maxOccurs="unbounded"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HVZResponseOrderDataType", propOrder = {
-    "orderDetails",
-    "any"
-})
-public class HVZResponseOrderDataType {
-
-    @XmlElement(name = "OrderDetails", required = true)
-    protected List<HVZOrderDetailsType> orderDetails;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderDetails property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderDetails 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderDetails().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link HVZOrderDetailsType }
-     * 
-     * 
-     */
-    public List<HVZOrderDetailsType> getOrderDetails() {
-        if (orderDetails == null) {
-            orderDetails = new ArrayList<HVZOrderDetailsType>();
-        }
-        return this.orderDetails;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/KeyInfoType.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/KeyInfoType.java
deleted file mode 100644
index 679423b..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/KeyInfoType.java
+++ /dev/null
@@ -1,142 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for KeyInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="KeyInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;choice maxOccurs="unbounded">
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}KeyName"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}KeyValue"/>
- *         &lt;element 
ref="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethod"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}PGPData"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SPKIData"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}MgmtData"/>
- *         &lt;any processContents='lax' namespace='##other'/>
- *       &lt;/choice>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "KeyInfoType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class KeyInfoType {
-
-    @XmlElementRefs({
-        @XmlElementRef(name = "X509Data", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "PGPData", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "MgmtData", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "KeyValue", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "RetrievalMethod", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "KeyName", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "SPKIData", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false)
-    })
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
-     * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
-     * {@link Element }
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
-     * {@link String }
-     * {@link Object }
-     * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/KeyValueType.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/KeyValueType.java
deleted file mode 100644
index c456677..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/KeyValueType.java
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for KeyValueType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="KeyValueType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;choice>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValue"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
- *         &lt;any processContents='lax' namespace='##other'/>
- *       &lt;/choice>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "KeyValueType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class KeyValueType {
-
-    @XmlElementRefs({
-        @XmlElementRef(name = "DSAKeyValue", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "RSAKeyValue", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false)
-    })
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
-     * {@link Element }
-     * {@link String }
-     * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/ManifestType.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/ManifestType.java
deleted file mode 100644
index 82aec10..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/ManifestType.java
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for ManifestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="ManifestType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Reference"; 
maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ManifestType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "reference"
-})
-public class ManifestType {
-
-    @XmlElement(name = "Reference", required = true)
-    protected List<ReferenceType> reference;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the reference property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the reference 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getReference().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ReferenceType }
-     * 
-     * 
-     */
-    public List<ReferenceType> getReference() {
-        if (reference == null) {
-            reference = new ArrayList<ReferenceType>();
-        }
-        return this.reference;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/ObjectFactory.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/ObjectFactory.java
deleted file mode 100644
index 4b4de35..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/ObjectFactory.java
+++ /dev/null
@@ -1,1877 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.math.BigInteger;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the tech.libeufin.messages.ebics.response package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _HVTResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HVTResponseOrderData");
-    private final static QName _KeyInfo_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "KeyInfo");
-    private final static QName _HPBResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HPBResponseOrderData");
-    private final static QName _GenericOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "GenericOrderParams");
-    private final static QName _HSARequestOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HSARequestOrderData");
-    private final static QName _ebicsSignatureDataAtEbicsOrders_QNAME = new 
QName("urn:org:ebics:H004", "EBICSSignatureData");
-    private final static QName _HVDResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HVDResponseOrderData");
-    private final static QName _HCARequestOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HCARequestOrderData");
-    private final static QName _SignatureProperty_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "SignatureProperty");
-    private final static QName _HVEOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "HVEOrderParams");
-    private final static QName _EBICSOrderData_QNAME = new 
QName("urn:org:ebics:H004", "EBICSOrderData");
-    private final static QName _RSAKeyValue_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "RSAKeyValue");
-    private final static QName _HCSRequestOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HCSRequestOrderData");
-    private final static QName _HVSOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "HVSOrderParams");
-    private final static QName _SignatureMethod_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "SignatureMethod");
-    private final static QName _Object_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "Object");
-    private final static QName _BankSignatureData_QNAME = new 
QName("urn:org:ebics:H004", "BankSignatureData");
-    private final static QName _FDLOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "FDLOrderParams");
-    private final static QName _PGPData_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "PGPData");
-    private final static QName _RetrievalMethod_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "RetrievalMethod");
-    private final static QName _SignaturePubKeyOrderData_QNAME = new 
QName("http://www.ebics.org/S001";, "SignaturePubKeyOrderData");
-    private final static QName _DSAKeyValue_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "DSAKeyValue");
-    private final static QName _HVSRequestOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HVSRequestOrderData");
-    private final static QName _OrderSignatureData_QNAME = new 
QName("http://www.ebics.org/S001";, "OrderSignatureData");
-    private final static QName _H3KRequestOrderData_QNAME = new 
QName("urn:org:ebics:H004", "H3KRequestOrderData");
-    private final static QName _HTDResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HTDResponseOrderData");
-    private final static QName _SPKIData_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "SPKIData");
-    private final static QName _HIARequestOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HIARequestOrderData");
-    private final static QName _HVZResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HVZResponseOrderData");
-    private final static QName _SignatureValue_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "SignatureValue");
-    private final static QName _UserSignatureData_QNAME = new 
QName("http://www.ebics.org/S001";, "UserSignatureData");
-    private final static QName _OrderParams_QNAME = new 
QName("urn:org:ebics:H004", "OrderParams");
-    private final static QName _KeyValue_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "KeyValue");
-    private final static QName _Transforms_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "Transforms");
-    private final static QName _HVUResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HVUResponseOrderData");
-    private final static QName _SignaturePubKeyInfo_QNAME = new 
QName("http://www.ebics.org/S001";, "SignaturePubKeyInfo");
-    private final static QName _HVUOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "HVUOrderParams");
-    private final static QName _DigestMethod_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "DigestMethod");
-    private final static QName _X509Data_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "X509Data");
-    private final static QName _AuthSignature_QNAME = new 
QName("urn:org:ebics:H004", "AuthSignature");
-    private final static QName _KeyName_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "KeyName");
-    private final static QName _Signature_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "Signature");
-    private final static QName _MgmtData_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "MgmtData");
-    private final static QName _HAAResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HAAResponseOrderData");
-    private final static QName _HVZOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "HVZOrderParams");
-    private final static QName _SignatureProperties_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "SignatureProperties");
-    private final static QName _HPDResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HPDResponseOrderData");
-    private final static QName _FULOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "FULOrderParams");
-    private final static QName _Transform_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "Transform");
-    private final static QName _HKDResponseOrderData_QNAME = new 
QName("urn:org:ebics:H004", "HKDResponseOrderData");
-    private final static QName _HVDOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "HVDOrderParams");
-    private final static QName _StandardOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "StandardOrderParams");
-    private final static QName _Reference_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "Reference");
-    private final static QName _DigestValue_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "DigestValue");
-    private final static QName _HVTOrderParams_QNAME = new 
QName("urn:org:ebics:H004", "HVTOrderParams");
-    private final static QName _CanonicalizationMethod_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "CanonicalizationMethod");
-    private final static QName _SignedInfo_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "SignedInfo");
-    private final static QName _ebicsSignatureDataAtEbicsSignatures_QNAME = 
new QName("http://www.ebics.org/S001";, "EBICSSignatureData");
-    private final static QName _Manifest_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "Manifest");
-    private final static QName _SPKIDataTypeSPKISexp_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "SPKISexp");
-    private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = 
new QName("http://www.w3.org/2000/09/xmldsig#";, "HMACOutputLength");
-    private final static QName _TransformTypeXPath_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "XPath");
-    private final static QName _PGPDataTypePGPKeyID_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "PGPKeyID");
-    private final static QName _PGPDataTypePGPKeyPacket_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "PGPKeyPacket");
-    private final static QName _X509DataTypeX509IssuerSerial_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "X509IssuerSerial");
-    private final static QName _X509DataTypeX509CRL_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "X509CRL");
-    private final static QName _X509DataTypeX509SubjectName_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "X509SubjectName");
-    private final static QName _X509DataTypeX509SKI_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "X509SKI");
-    private final static QName _X509DataTypeX509Certificate_QNAME = new 
QName("http://www.w3.org/2000/09/xmldsig#";, "X509Certificate");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of 
schema derived classes for package: tech.libeufin.messages.ebics.response
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link EbicsResponse }
-     * 
-     */
-    public EbicsResponse createEbicsResponse() {
-        return new EbicsResponse();
-    }
-
-    /**
-     * Create an instance of {@link Parameter }
-     * 
-     */
-    public Parameter createParameter() {
-        return new Parameter();
-    }
-
-    /**
-     * Create an instance of {@link UserSignatureDataSigBookType }
-     * 
-     */
-    public UserSignatureDataSigBookType createUserSignatureDataSigBookType() {
-        return new UserSignatureDataSigBookType();
-    }
-
-    /**
-     * Create an instance of {@link AccountType }
-     * 
-     */
-    public AccountType createAccountType() {
-        return new AccountType();
-    }
-
-    /**
-     * Create an instance of {@link DataTransferResponseType }
-     * 
-     */
-    public DataTransferResponseType createDataTransferResponseType() {
-        return new DataTransferResponseType();
-    }
-
-    /**
-     * Create an instance of {@link DataEncryptionInfoType }
-     * 
-     */
-    public DataEncryptionInfoType createDataEncryptionInfoType() {
-        return new DataEncryptionInfoType();
-    }
-
-    /**
-     * Create an instance of {@link ResponseMutableHeaderType }
-     * 
-     */
-    public ResponseMutableHeaderType createResponseMutableHeaderType() {
-        return new ResponseMutableHeaderType();
-    }
-
-    /**
-     * Create an instance of {@link AttributedAccountType }
-     * 
-     */
-    public AttributedAccountType createAttributedAccountType() {
-        return new AttributedAccountType();
-    }
-
-    /**
-     * Create an instance of {@link UserInfoType }
-     * 
-     */
-    public UserInfoType createUserInfoType() {
-        return new UserInfoType();
-    }
-
-    /**
-     * Create an instance of {@link HPDAccessParamsType }
-     * 
-     */
-    public HPDAccessParamsType createHPDAccessParamsType() {
-        return new HPDAccessParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HVZOrderDetailsType }
-     * 
-     */
-    public HVZOrderDetailsType createHVZOrderDetailsType() {
-        return new HVZOrderDetailsType();
-    }
-
-    /**
-     * Create an instance of {@link HVZOrderDetailsType.FirstOrderInfo }
-     * 
-     */
-    public HVZOrderDetailsType.FirstOrderInfo 
createHVZOrderDetailsTypeFirstOrderInfo() {
-        return new HVZOrderDetailsType.FirstOrderInfo();
-    }
-
-    /**
-     * Create an instance of {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo }
-     * 
-     */
-    public HVZOrderDetailsType.FirstOrderInfo.AccountInfo 
createHVZOrderDetailsTypeFirstOrderInfoAccountInfo() {
-        return new HVZOrderDetailsType.FirstOrderInfo.AccountInfo();
-    }
-
-    /**
-     * Create an instance of {@link PartnerInfoType }
-     * 
-     */
-    public PartnerInfoType createPartnerInfoType() {
-        return new PartnerInfoType();
-    }
-
-    /**
-     * Create an instance of {@link HVTOrderInfoType }
-     * 
-     */
-    public HVTOrderInfoType createHVTOrderInfoType() {
-        return new HVTOrderInfoType();
-    }
-
-    /**
-     * Create an instance of {@link DataTransferRequestType }
-     * 
-     */
-    public DataTransferRequestType createDataTransferRequestType() {
-        return new DataTransferRequestType();
-    }
-
-    /**
-     * Create an instance of {@link SignerInfoType }
-     * 
-     */
-    public SignerInfoType createSignerInfoType() {
-        return new SignerInfoType();
-    }
-
-    /**
-     * Create an instance of {@link HPDProtocolParamsType }
-     * 
-     */
-    public HPDProtocolParamsType createHPDProtocolParamsType() {
-        return new HPDProtocolParamsType();
-    }
-
-    /**
-     * Create an instance of {@link BankSignatureDataSigBookType }
-     * 
-     */
-    public BankSignatureDataSigBookType createBankSignatureDataSigBookType() {
-        return new BankSignatureDataSigBookType();
-    }
-
-    /**
-     * Create an instance of {@link StandardOrderParamsType }
-     * 
-     */
-    public StandardOrderParamsType createStandardOrderParamsType() {
-        return new StandardOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link FDLOrderParamsType }
-     * 
-     */
-    public FDLOrderParamsType createFDLOrderParamsType() {
-        return new FDLOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HVTOrderParamsType }
-     * 
-     */
-    public HVTOrderParamsType createHVTOrderParamsType() {
-        return new HVTOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link EbicsResponse.Body }
-     * 
-     */
-    public EbicsResponse.Body createEbicsResponseBody() {
-        return new EbicsResponse.Body();
-    }
-
-    /**
-     * Create an instance of {@link HVZOrderParamsType }
-     * 
-     */
-    public HVZOrderParamsType createHVZOrderParamsType() {
-        return new HVZOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HAAResponseOrderDataType }
-     * 
-     */
-    public HAAResponseOrderDataType createHAAResponseOrderDataType() {
-        return new HAAResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HVSOrderParamsType }
-     * 
-     */
-    public HVSOrderParamsType createHVSOrderParamsType() {
-        return new HVSOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HPDResponseOrderDataType }
-     * 
-     */
-    public HPDResponseOrderDataType createHPDResponseOrderDataType() {
-        return new HPDResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link FULOrderParamsType }
-     * 
-     */
-    public FULOrderParamsType createFULOrderParamsType() {
-        return new FULOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link SignatureType }
-     * 
-     */
-    public SignatureType createSignatureType() {
-        return new SignatureType();
-    }
-
-    /**
-     * Create an instance of {@link HVEOrderParamsType }
-     * 
-     */
-    public HVEOrderParamsType createHVEOrderParamsType() {
-        return new HVEOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link EbicsResponse.Header }
-     * 
-     */
-    public EbicsResponse.Header createEbicsResponseHeader() {
-        return new EbicsResponse.Header();
-    }
-
-    /**
-     * Create an instance of {@link HCSRequestOrderDataType }
-     * 
-     */
-    public HCSRequestOrderDataType createHCSRequestOrderDataType() {
-        return new HCSRequestOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HVSRequestOrderDataType }
-     * 
-     */
-    public HVSRequestOrderDataType createHVSRequestOrderDataType() {
-        return new HVSRequestOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link H3KRequestOrderDataType }
-     * 
-     */
-    public H3KRequestOrderDataType createH3KRequestOrderDataType() {
-        return new H3KRequestOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HTDReponseOrderDataType }
-     * 
-     */
-    public HTDReponseOrderDataType createHTDReponseOrderDataType() {
-        return new HTDReponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HKDResponseOrderDataType }
-     * 
-     */
-    public HKDResponseOrderDataType createHKDResponseOrderDataType() {
-        return new HKDResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HVDOrderParamsType }
-     * 
-     */
-    public HVDOrderParamsType createHVDOrderParamsType() {
-        return new HVDOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HPBResponseOrderDataType }
-     * 
-     */
-    public HPBResponseOrderDataType createHPBResponseOrderDataType() {
-        return new HPBResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link GenericOrderParamsType }
-     * 
-     */
-    public GenericOrderParamsType createGenericOrderParamsType() {
-        return new GenericOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HSARequestOrderDataType }
-     * 
-     */
-    public HSARequestOrderDataType createHSARequestOrderDataType() {
-        return new HSARequestOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HIARequestOrderDataType }
-     * 
-     */
-    public HIARequestOrderDataType createHIARequestOrderDataType() {
-        return new HIARequestOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HVZResponseOrderDataType }
-     * 
-     */
-    public HVZResponseOrderDataType createHVZResponseOrderDataType() {
-        return new HVZResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HVTResponseOrderData }
-     * 
-     */
-    public HVTResponseOrderData createHVTResponseOrderData() {
-        return new HVTResponseOrderData();
-    }
-
-    /**
-     * Create an instance of {@link HCARequestOrderDataType }
-     * 
-     */
-    public HCARequestOrderDataType createHCARequestOrderDataType() {
-        return new HCARequestOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link Parameter.Value }
-     * 
-     */
-    public Parameter.Value createParameterValue() {
-        return new Parameter.Value();
-    }
-
-    /**
-     * Create an instance of {@link HVUOrderParamsType }
-     * 
-     */
-    public HVUOrderParamsType createHVUOrderParamsType() {
-        return new HVUOrderParamsType();
-    }
-
-    /**
-     * Create an instance of {@link HVUResponseOrderDataType }
-     * 
-     */
-    public HVUResponseOrderDataType createHVUResponseOrderDataType() {
-        return new HVUResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HVDResponseOrderDataType }
-     * 
-     */
-    public HVDResponseOrderDataType createHVDResponseOrderDataType() {
-        return new HVDResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link PubKeyDigestType }
-     * 
-     */
-    public PubKeyDigestType createPubKeyDigestType() {
-        return new PubKeyDigestType();
-    }
-
-    /**
-     * Create an instance of {@link FileFormatType }
-     * 
-     */
-    public FileFormatType createFileFormatType() {
-        return new FileFormatType();
-    }
-
-    /**
-     * Create an instance of {@link EncryptionPubKeyInfoType }
-     * 
-     */
-    public EncryptionPubKeyInfoType createEncryptionPubKeyInfoType() {
-        return new EncryptionPubKeyInfoType();
-    }
-
-    /**
-     * Create an instance of {@link HVTResponseOrderDataType }
-     * 
-     */
-    public HVTResponseOrderDataType createHVTResponseOrderDataType() {
-        return new HVTResponseOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link HVUSigningInfoType }
-     * 
-     */
-    public HVUSigningInfoType createHVUSigningInfoType() {
-        return new HVUSigningInfoType();
-    }
-
-    /**
-     * Create an instance of {@link AuthenticationCertificateInfoType }
-     * 
-     */
-    public AuthenticationCertificateInfoType 
createAuthenticationCertificateInfoType() {
-        return new AuthenticationCertificateInfoType();
-    }
-
-    /**
-     * Create an instance of {@link AmountType }
-     * 
-     */
-    public AmountType createAmountType() {
-        return new AmountType();
-    }
-
-    /**
-     * Create an instance of {@link HVTOrderFlagsType }
-     * 
-     */
-    public HVTOrderFlagsType createHVTOrderFlagsType() {
-        return new HVTOrderFlagsType();
-    }
-
-    /**
-     * Create an instance of {@link HVUOrderDetailsType }
-     * 
-     */
-    public HVUOrderDetailsType createHVUOrderDetailsType() {
-        return new HVUOrderDetailsType();
-    }
-
-    /**
-     * Create an instance of {@link EncryptionCertificateInfoType }
-     * 
-     */
-    public EncryptionCertificateInfoType createEncryptionCertificateInfoType() 
{
-        return new EncryptionCertificateInfoType();
-    }
-
-    /**
-     * Create an instance of {@link SignatureCertificateInfoType }
-     * 
-     */
-    public SignatureCertificateInfoType createSignatureCertificateInfoType() {
-        return new SignatureCertificateInfoType();
-    }
-
-    /**
-     * Create an instance of {@link CertificateInfoType }
-     * 
-     */
-    public CertificateInfoType createCertificateInfoType() {
-        return new CertificateInfoType();
-    }
-
-    /**
-     * Create an instance of {@link PreValidationRequestType }
-     * 
-     */
-    public PreValidationRequestType createPreValidationRequestType() {
-        return new PreValidationRequestType();
-    }
-
-    /**
-     * Create an instance of {@link PubKeyInfoTypeAtEbicsTypes }
-     * 
-     */
-    public PubKeyInfoTypeAtEbicsTypes createPubKeyInfoTypeAtEbicsTypes() {
-        return new PubKeyInfoTypeAtEbicsTypes();
-    }
-
-    /**
-     * Create an instance of {@link TransferReceiptRequestType }
-     * 
-     */
-    public TransferReceiptRequestType createTransferReceiptRequestType() {
-        return new TransferReceiptRequestType();
-    }
-
-    /**
-     * Create an instance of {@link AuthOrderInfoType }
-     * 
-     */
-    public AuthOrderInfoType createAuthOrderInfoType() {
-        return new AuthOrderInfoType();
-    }
-
-    /**
-     * Create an instance of {@link BankInfoType }
-     * 
-     */
-    public BankInfoType createBankInfoType() {
-        return new BankInfoType();
-    }
-
-    /**
-     * Create an instance of {@link HPDVersionType }
-     * 
-     */
-    public HPDVersionType createHPDVersionType() {
-        return new HPDVersionType();
-    }
-
-    /**
-     * Create an instance of {@link HVUOriginatorInfoType }
-     * 
-     */
-    public HVUOriginatorInfoType createHVUOriginatorInfoType() {
-        return new HVUOriginatorInfoType();
-    }
-
-    /**
-     * Create an instance of {@link HVTAccountInfoType }
-     * 
-     */
-    public HVTAccountInfoType createHVTAccountInfoType() {
-        return new HVTAccountInfoType();
-    }
-
-    /**
-     * Create an instance of {@link TransferReceiptResponseType }
-     * 
-     */
-    public TransferReceiptResponseType createTransferReceiptResponseType() {
-        return new TransferReceiptResponseType();
-    }
-
-    /**
-     * Create an instance of {@link PubKeyValueTypeAtEbicsTypes }
-     * 
-     */
-    public PubKeyValueTypeAtEbicsTypes createPubKeyValueTypeAtEbicsTypes() {
-        return new PubKeyValueTypeAtEbicsTypes();
-    }
-
-    /**
-     * Create an instance of {@link AuthenticationPubKeyInfoType }
-     * 
-     */
-    public AuthenticationPubKeyInfoType createAuthenticationPubKeyInfoType() {
-        return new AuthenticationPubKeyInfoType();
-    }
-
-    /**
-     * Create an instance of {@link ResponseStaticHeaderType }
-     * 
-     */
-    public ResponseStaticHeaderType createResponseStaticHeaderType() {
-        return new ResponseStaticHeaderType();
-    }
-
-    /**
-     * Create an instance of {@link AddressInfoType }
-     * 
-     */
-    public AddressInfoType createAddressInfoType() {
-        return new AddressInfoType();
-    }
-
-    /**
-     * Create an instance of {@link DataDigestType }
-     * 
-     */
-    public DataDigestType createDataDigestType() {
-        return new DataDigestType();
-    }
-
-    /**
-     * Create an instance of {@link UserPermissionType }
-     * 
-     */
-    public UserPermissionType createUserPermissionType() {
-        return new UserPermissionType();
-    }
-
-    /**
-     * Create an instance of {@link PreValidationAccountAuthType }
-     * 
-     */
-    public PreValidationAccountAuthType createPreValidationAccountAuthType() {
-        return new PreValidationAccountAuthType();
-    }
-
-    /**
-     * Create an instance of {@link PGPDataType }
-     * 
-     */
-    public PGPDataType createPGPDataType() {
-        return new PGPDataType();
-    }
-
-    /**
-     * Create an instance of {@link KeyValueType }
-     * 
-     */
-    public KeyValueType createKeyValueType() {
-        return new KeyValueType();
-    }
-
-    /**
-     * Create an instance of {@link DSAKeyValueType }
-     * 
-     */
-    public DSAKeyValueType createDSAKeyValueType() {
-        return new DSAKeyValueType();
-    }
-
-    /**
-     * Create an instance of {@link ReferenceType }
-     * 
-     */
-    public ReferenceType createReferenceType() {
-        return new ReferenceType();
-    }
-
-    /**
-     * Create an instance of {@link RetrievalMethodType }
-     * 
-     */
-    public RetrievalMethodType createRetrievalMethodType() {
-        return new RetrievalMethodType();
-    }
-
-    /**
-     * Create an instance of {@link TransformsType }
-     * 
-     */
-    public TransformsType createTransformsType() {
-        return new TransformsType();
-    }
-
-    /**
-     * Create an instance of {@link CanonicalizationMethodType }
-     * 
-     */
-    public CanonicalizationMethodType createCanonicalizationMethodType() {
-        return new CanonicalizationMethodType();
-    }
-
-    /**
-     * Create an instance of {@link DigestMethodType }
-     * 
-     */
-    public DigestMethodType createDigestMethodType() {
-        return new DigestMethodType();
-    }
-
-    /**
-     * Create an instance of {@link ManifestType }
-     * 
-     */
-    public ManifestType createManifestType() {
-        return new ManifestType();
-    }
-
-    /**
-     * Create an instance of {@link SignaturePropertyType }
-     * 
-     */
-    public SignaturePropertyType createSignaturePropertyType() {
-        return new SignaturePropertyType();
-    }
-
-    /**
-     * Create an instance of {@link X509DataType }
-     * 
-     */
-    public X509DataType createX509DataType() {
-        return new X509DataType();
-    }
-
-    /**
-     * Create an instance of {@link SignedInfoType }
-     * 
-     */
-    public SignedInfoType createSignedInfoType() {
-        return new SignedInfoType();
-    }
-
-    /**
-     * Create an instance of {@link RSAKeyValueType }
-     * 
-     */
-    public RSAKeyValueType createRSAKeyValueType() {
-        return new RSAKeyValueType();
-    }
-
-    /**
-     * Create an instance of {@link SPKIDataType }
-     * 
-     */
-    public SPKIDataType createSPKIDataType() {
-        return new SPKIDataType();
-    }
-
-    /**
-     * Create an instance of {@link SignatureValueType }
-     * 
-     */
-    public SignatureValueType createSignatureValueType() {
-        return new SignatureValueType();
-    }
-
-    /**
-     * Create an instance of {@link KeyInfoType }
-     * 
-     */
-    public KeyInfoType createKeyInfoType() {
-        return new KeyInfoType();
-    }
-
-    /**
-     * Create an instance of {@link SignaturePropertiesType }
-     * 
-     */
-    public SignaturePropertiesType createSignaturePropertiesType() {
-        return new SignaturePropertiesType();
-    }
-
-    /**
-     * Create an instance of {@link SignatureMethodType }
-     * 
-     */
-    public SignatureMethodType createSignatureMethodType() {
-        return new SignatureMethodType();
-    }
-
-    /**
-     * Create an instance of {@link ObjectType }
-     * 
-     */
-    public ObjectType createObjectType() {
-        return new ObjectType();
-    }
-
-    /**
-     * Create an instance of {@link TransformType }
-     * 
-     */
-    public TransformType createTransformType() {
-        return new TransformType();
-    }
-
-    /**
-     * Create an instance of {@link X509IssuerSerialType }
-     * 
-     */
-    public X509IssuerSerialType createX509IssuerSerialType() {
-        return new X509IssuerSerialType();
-    }
-
-    /**
-     * Create an instance of {@link SignaturePubKeyInfoType }
-     * 
-     */
-    public SignaturePubKeyInfoType createSignaturePubKeyInfoType() {
-        return new SignaturePubKeyInfoType();
-    }
-
-    /**
-     * Create an instance of {@link SignaturePubKeyOrderDataType }
-     * 
-     */
-    public SignaturePubKeyOrderDataType createSignaturePubKeyOrderDataType() {
-        return new SignaturePubKeyOrderDataType();
-    }
-
-    /**
-     * Create an instance of {@link OrderSignatureDataType }
-     * 
-     */
-    public OrderSignatureDataType createOrderSignatureDataType() {
-        return new OrderSignatureDataType();
-    }
-
-    /**
-     * Create an instance of {@link PubKeyInfoTypeAtEbicsSignatures }
-     * 
-     */
-    public PubKeyInfoTypeAtEbicsSignatures 
createPubKeyInfoTypeAtEbicsSignatures() {
-        return new PubKeyInfoTypeAtEbicsSignatures();
-    }
-
-    /**
-     * Create an instance of {@link PubKeyValueTypeAtEbicsSignatures }
-     * 
-     */
-    public PubKeyValueTypeAtEbicsSignatures 
createPubKeyValueTypeAtEbicsSignatures() {
-        return new PubKeyValueTypeAtEbicsSignatures();
-    }
-
-    /**
-     * Create an instance of {@link 
UserSignatureDataSigBookType.OrderSignature }
-     * 
-     */
-    public UserSignatureDataSigBookType.OrderSignature 
createUserSignatureDataSigBookTypeOrderSignature() {
-        return new UserSignatureDataSigBookType.OrderSignature();
-    }
-
-    /**
-     * Create an instance of {@link AccountType.AccountNumber }
-     * 
-     */
-    public AccountType.AccountNumber createAccountTypeAccountNumber() {
-        return new AccountType.AccountNumber();
-    }
-
-    /**
-     * Create an instance of {@link AccountType.NationalAccountNumber }
-     * 
-     */
-    public AccountType.NationalAccountNumber 
createAccountTypeNationalAccountNumber() {
-        return new AccountType.NationalAccountNumber();
-    }
-
-    /**
-     * Create an instance of {@link AccountType.BankCode }
-     * 
-     */
-    public AccountType.BankCode createAccountTypeBankCode() {
-        return new AccountType.BankCode();
-    }
-
-    /**
-     * Create an instance of {@link AccountType.NationalBankCode }
-     * 
-     */
-    public AccountType.NationalBankCode createAccountTypeNationalBankCode() {
-        return new AccountType.NationalBankCode();
-    }
-
-    /**
-     * Create an instance of {@link 
DataTransferResponseType.DataEncryptionInfo }
-     * 
-     */
-    public DataTransferResponseType.DataEncryptionInfo 
createDataTransferResponseTypeDataEncryptionInfo() {
-        return new DataTransferResponseType.DataEncryptionInfo();
-    }
-
-    /**
-     * Create an instance of {@link DataTransferResponseType.SignatureData }
-     * 
-     */
-    public DataTransferResponseType.SignatureData 
createDataTransferResponseTypeSignatureData() {
-        return new DataTransferResponseType.SignatureData();
-    }
-
-    /**
-     * Create an instance of {@link DataTransferResponseType.OrderData }
-     * 
-     */
-    public DataTransferResponseType.OrderData 
createDataTransferResponseTypeOrderData() {
-        return new DataTransferResponseType.OrderData();
-    }
-
-    /**
-     * Create an instance of {@link 
DataEncryptionInfoType.EncryptionPubKeyDigest }
-     * 
-     */
-    public DataEncryptionInfoType.EncryptionPubKeyDigest 
createDataEncryptionInfoTypeEncryptionPubKeyDigest() {
-        return new DataEncryptionInfoType.EncryptionPubKeyDigest();
-    }
-
-    /**
-     * Create an instance of {@link ResponseMutableHeaderType.SegmentNumber }
-     * 
-     */
-    public ResponseMutableHeaderType.SegmentNumber 
createResponseMutableHeaderTypeSegmentNumber() {
-        return new ResponseMutableHeaderType.SegmentNumber();
-    }
-
-    /**
-     * Create an instance of {@link AttributedAccountType.AccountNumber }
-     * 
-     */
-    public AttributedAccountType.AccountNumber 
createAttributedAccountTypeAccountNumber() {
-        return new AttributedAccountType.AccountNumber();
-    }
-
-    /**
-     * Create an instance of {@link 
AttributedAccountType.NationalAccountNumber }
-     * 
-     */
-    public AttributedAccountType.NationalAccountNumber 
createAttributedAccountTypeNationalAccountNumber() {
-        return new AttributedAccountType.NationalAccountNumber();
-    }
-
-    /**
-     * Create an instance of {@link AttributedAccountType.BankCode }
-     * 
-     */
-    public AttributedAccountType.BankCode 
createAttributedAccountTypeBankCode() {
-        return new AttributedAccountType.BankCode();
-    }
-
-    /**
-     * Create an instance of {@link AttributedAccountType.NationalBankCode }
-     * 
-     */
-    public AttributedAccountType.NationalBankCode 
createAttributedAccountTypeNationalBankCode() {
-        return new AttributedAccountType.NationalBankCode();
-    }
-
-    /**
-     * Create an instance of {@link AttributedAccountType.AccountHolder }
-     * 
-     */
-    public AttributedAccountType.AccountHolder 
createAttributedAccountTypeAccountHolder() {
-        return new AttributedAccountType.AccountHolder();
-    }
-
-    /**
-     * Create an instance of {@link UserInfoType.UserID }
-     * 
-     */
-    public UserInfoType.UserID createUserInfoTypeUserID() {
-        return new UserInfoType.UserID();
-    }
-
-    /**
-     * Create an instance of {@link HPDAccessParamsType.URL }
-     * 
-     */
-    public HPDAccessParamsType.URL createHPDAccessParamsTypeURL() {
-        return new HPDAccessParamsType.URL();
-    }
-
-    /**
-     * Create an instance of {@link HVZOrderDetailsType.TotalAmount }
-     * 
-     */
-    public HVZOrderDetailsType.TotalAmount 
createHVZOrderDetailsTypeTotalAmount() {
-        return new HVZOrderDetailsType.TotalAmount();
-    }
-
-    /**
-     * Create an instance of {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.AccountNumber }
-     * 
-     */
-    public HVZOrderDetailsType.FirstOrderInfo.AccountInfo.AccountNumber 
createHVZOrderDetailsTypeFirstOrderInfoAccountInfoAccountNumber() {
-        return new 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.AccountNumber();
-    }
-
-    /**
-     * Create an instance of {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalAccountNumber }
-     * 
-     */
-    public 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalAccountNumber 
createHVZOrderDetailsTypeFirstOrderInfoAccountInfoNationalAccountNumber() {
-        return new 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalAccountNumber();
-    }
-
-    /**
-     * Create an instance of {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.BankCode }
-     * 
-     */
-    public HVZOrderDetailsType.FirstOrderInfo.AccountInfo.BankCode 
createHVZOrderDetailsTypeFirstOrderInfoAccountInfoBankCode() {
-        return new HVZOrderDetailsType.FirstOrderInfo.AccountInfo.BankCode();
-    }
-
-    /**
-     * Create an instance of {@link 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalBankCode }
-     * 
-     */
-    public HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalBankCode 
createHVZOrderDetailsTypeFirstOrderInfoAccountInfoNationalBankCode() {
-        return new 
HVZOrderDetailsType.FirstOrderInfo.AccountInfo.NationalBankCode();
-    }
-
-    /**
-     * Create an instance of {@link PartnerInfoType.AccountInfo }
-     * 
-     */
-    public PartnerInfoType.AccountInfo createPartnerInfoTypeAccountInfo() {
-        return new PartnerInfoType.AccountInfo();
-    }
-
-    /**
-     * Create an instance of {@link HVTOrderInfoType.ExecutionDate }
-     * 
-     */
-    public HVTOrderInfoType.ExecutionDate 
createHVTOrderInfoTypeExecutionDate() {
-        return new HVTOrderInfoType.ExecutionDate();
-    }
-
-    /**
-     * Create an instance of {@link HVTOrderInfoType.Amount }
-     * 
-     */
-    public HVTOrderInfoType.Amount createHVTOrderInfoTypeAmount() {
-        return new HVTOrderInfoType.Amount();
-    }
-
-    /**
-     * Create an instance of {@link HVTOrderInfoType.Description }
-     * 
-     */
-    public HVTOrderInfoType.Description createHVTOrderInfoTypeDescription() {
-        return new HVTOrderInfoType.Description();
-    }
-
-    /**
-     * Create an instance of {@link DataTransferRequestType.DataEncryptionInfo 
}
-     * 
-     */
-    public DataTransferRequestType.DataEncryptionInfo 
createDataTransferRequestTypeDataEncryptionInfo() {
-        return new DataTransferRequestType.DataEncryptionInfo();
-    }
-
-    /**
-     * Create an instance of {@link DataTransferRequestType.SignatureData }
-     * 
-     */
-    public DataTransferRequestType.SignatureData 
createDataTransferRequestTypeSignatureData() {
-        return new DataTransferRequestType.SignatureData();
-    }
-
-    /**
-     * Create an instance of {@link DataTransferRequestType.OrderData }
-     * 
-     */
-    public DataTransferRequestType.OrderData 
createDataTransferRequestTypeOrderData() {
-        return new DataTransferRequestType.OrderData();
-    }
-
-    /**
-     * Create an instance of {@link SignerInfoType.Permission }
-     * 
-     */
-    public SignerInfoType.Permission createSignerInfoTypePermission() {
-        return new SignerInfoType.Permission();
-    }
-
-    /**
-     * Create an instance of {@link HPDProtocolParamsType.Recovery }
-     * 
-     */
-    public HPDProtocolParamsType.Recovery 
createHPDProtocolParamsTypeRecovery() {
-        return new HPDProtocolParamsType.Recovery();
-    }
-
-    /**
-     * Create an instance of {@link HPDProtocolParamsType.PreValidation }
-     * 
-     */
-    public HPDProtocolParamsType.PreValidation 
createHPDProtocolParamsTypePreValidation() {
-        return new HPDProtocolParamsType.PreValidation();
-    }
-
-    /**
-     * Create an instance of {@link HPDProtocolParamsType.X509Data }
-     * 
-     */
-    public HPDProtocolParamsType.X509Data 
createHPDProtocolParamsTypeX509Data() {
-        return new HPDProtocolParamsType.X509Data();
-    }
-
-    /**
-     * Create an instance of {@link HPDProtocolParamsType.ClientDataDownload }
-     * 
-     */
-    public HPDProtocolParamsType.ClientDataDownload 
createHPDProtocolParamsTypeClientDataDownload() {
-        return new HPDProtocolParamsType.ClientDataDownload();
-    }
-
-    /**
-     * Create an instance of {@link 
HPDProtocolParamsType.DownloadableOrderData }
-     * 
-     */
-    public HPDProtocolParamsType.DownloadableOrderData 
createHPDProtocolParamsTypeDownloadableOrderData() {
-        return new HPDProtocolParamsType.DownloadableOrderData();
-    }
-
-    /**
-     * Create an instance of {@link 
BankSignatureDataSigBookType.OrderSignature }
-     * 
-     */
-    public BankSignatureDataSigBookType.OrderSignature 
createBankSignatureDataSigBookTypeOrderSignature() {
-        return new BankSignatureDataSigBookType.OrderSignature();
-    }
-
-    /**
-     * Create an instance of {@link StandardOrderParamsType.DateRange }
-     * 
-     */
-    public StandardOrderParamsType.DateRange 
createStandardOrderParamsTypeDateRange() {
-        return new StandardOrderParamsType.DateRange();
-    }
-
-    /**
-     * Create an instance of {@link FDLOrderParamsType.DateRange }
-     * 
-     */
-    public FDLOrderParamsType.DateRange createFDLOrderParamsTypeDateRange() {
-        return new FDLOrderParamsType.DateRange();
-    }
-
-    /**
-     * Create an instance of {@link HVTOrderParamsType.OrderFlags }
-     * 
-     */
-    public HVTOrderParamsType.OrderFlags createHVTOrderParamsTypeOrderFlags() {
-        return new HVTOrderParamsType.OrderFlags();
-    }
-
-    /**
-     * Create an instance of {@link EbicsResponse.Body.ReturnCode }
-     * 
-     */
-    public EbicsResponse.Body.ReturnCode createEbicsResponseBodyReturnCode() {
-        return new EbicsResponse.Body.ReturnCode();
-    }
-
-    /**
-     * Create an instance of {@link EbicsResponse.Body.TimestampBankParameter }
-     * 
-     */
-    public EbicsResponse.Body.TimestampBankParameter 
createEbicsResponseBodyTimestampBankParameter() {
-        return new EbicsResponse.Body.TimestampBankParameter();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVTResponseOrderData }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HVTResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HVTResponseOrderData> 
createHVTResponseOrderData(HVTResponseOrderData value) {
-        return new 
JAXBElement<HVTResponseOrderData>(_HVTResponseOrderData_QNAME, 
HVTResponseOrderData.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"KeyInfo")
-    public JAXBElement<KeyInfoType> createKeyInfo(KeyInfoType value) {
-        return new JAXBElement<KeyInfoType>(_KeyInfo_QNAME, KeyInfoType.class, 
null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HPBResponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HPBResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HPBResponseOrderDataType> 
createHPBResponseOrderData(HPBResponseOrderDataType value) {
-        return new 
JAXBElement<HPBResponseOrderDataType>(_HPBResponseOrderData_QNAME, 
HPBResponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
GenericOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"GenericOrderParams", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "OrderParams")
-    public JAXBElement<GenericOrderParamsType> 
createGenericOrderParams(GenericOrderParamsType value) {
-        return new 
JAXBElement<GenericOrderParamsType>(_GenericOrderParams_QNAME, 
GenericOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HSARequestOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HSARequestOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HSARequestOrderDataType> 
createHSARequestOrderData(HSARequestOrderDataType value) {
-        return new 
JAXBElement<HSARequestOrderDataType>(_HSARequestOrderData_QNAME, 
HSARequestOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Object 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"EBICSSignatureData")
-    public JAXBElement<Object> createebicsSignatureDataAtEbicsOrders(Object 
value) {
-        return new JAXBElement<Object>(_ebicsSignatureDataAtEbicsOrders_QNAME, 
Object.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVDResponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HVDResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HVDResponseOrderDataType> 
createHVDResponseOrderData(HVDResponseOrderDataType value) {
-        return new 
JAXBElement<HVDResponseOrderDataType>(_HVDResponseOrderData_QNAME, 
HVDResponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HCARequestOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HCARequestOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HCARequestOrderDataType> 
createHCARequestOrderData(HCARequestOrderDataType value) {
-        return new 
JAXBElement<HCARequestOrderDataType>(_HCARequestOrderData_QNAME, 
HCARequestOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
SignaturePropertyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"SignatureProperty")
-    public JAXBElement<SignaturePropertyType> 
createSignatureProperty(SignaturePropertyType value) {
-        return new 
JAXBElement<SignaturePropertyType>(_SignatureProperty_QNAME, 
SignaturePropertyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVEOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "HVEOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<HVEOrderParamsType> 
createHVEOrderParams(HVEOrderParamsType value) {
-        return new JAXBElement<HVEOrderParamsType>(_HVEOrderParams_QNAME, 
HVEOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Object 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "EBICSOrderData")
-    public JAXBElement<Object> createEBICSOrderData(Object value) {
-        return new JAXBElement<Object>(_EBICSOrderData_QNAME, Object.class, 
null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
RSAKeyValueType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"RSAKeyValue")
-    public JAXBElement<RSAKeyValueType> createRSAKeyValue(RSAKeyValueType 
value) {
-        return new JAXBElement<RSAKeyValueType>(_RSAKeyValue_QNAME, 
RSAKeyValueType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HCSRequestOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HCSRequestOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HCSRequestOrderDataType> 
createHCSRequestOrderData(HCSRequestOrderDataType value) {
-        return new 
JAXBElement<HCSRequestOrderDataType>(_HCSRequestOrderData_QNAME, 
HCSRequestOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVSOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "HVSOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<HVSOrderParamsType> 
createHVSOrderParams(HVSOrderParamsType value) {
-        return new JAXBElement<HVSOrderParamsType>(_HVSOrderParams_QNAME, 
HVSOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
SignatureMethodType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"SignatureMethod")
-    public JAXBElement<SignatureMethodType> 
createSignatureMethod(SignatureMethodType value) {
-        return new JAXBElement<SignatureMethodType>(_SignatureMethod_QNAME, 
SignatureMethodType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"Object")
-    public JAXBElement<ObjectType> createObject(ObjectType value) {
-        return new JAXBElement<ObjectType>(_Object_QNAME, ObjectType.class, 
null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
BankSignatureDataSigBookType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"BankSignatureData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSSignatureData")
-    public JAXBElement<BankSignatureDataSigBookType> 
createBankSignatureData(BankSignatureDataSigBookType value) {
-        return new 
JAXBElement<BankSignatureDataSigBookType>(_BankSignatureData_QNAME, 
BankSignatureDataSigBookType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
FDLOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "FDLOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<FDLOrderParamsType> 
createFDLOrderParams(FDLOrderParamsType value) {
-        return new JAXBElement<FDLOrderParamsType>(_FDLOrderParams_QNAME, 
FDLOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"PGPData")
-    public JAXBElement<PGPDataType> createPGPData(PGPDataType value) {
-        return new JAXBElement<PGPDataType>(_PGPData_QNAME, PGPDataType.class, 
null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
RetrievalMethodType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"RetrievalMethod")
-    public JAXBElement<RetrievalMethodType> 
createRetrievalMethod(RetrievalMethodType value) {
-        return new JAXBElement<RetrievalMethodType>(_RetrievalMethod_QNAME, 
RetrievalMethodType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
SignaturePubKeyOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.ebics.org/S001";, name = 
"SignaturePubKeyOrderData")
-    public JAXBElement<SignaturePubKeyOrderDataType> 
createSignaturePubKeyOrderData(SignaturePubKeyOrderDataType value) {
-        return new 
JAXBElement<SignaturePubKeyOrderDataType>(_SignaturePubKeyOrderData_QNAME, 
SignaturePubKeyOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
DSAKeyValueType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"DSAKeyValue")
-    public JAXBElement<DSAKeyValueType> createDSAKeyValue(DSAKeyValueType 
value) {
-        return new JAXBElement<DSAKeyValueType>(_DSAKeyValue_QNAME, 
DSAKeyValueType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVSRequestOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HVSRequestOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HVSRequestOrderDataType> 
createHVSRequestOrderData(HVSRequestOrderDataType value) {
-        return new 
JAXBElement<HVSRequestOrderDataType>(_HVSRequestOrderData_QNAME, 
HVSRequestOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
OrderSignatureDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.ebics.org/S001";, name = 
"OrderSignatureData")
-    public JAXBElement<OrderSignatureDataType> 
createOrderSignatureData(OrderSignatureDataType value) {
-        return new 
JAXBElement<OrderSignatureDataType>(_OrderSignatureData_QNAME, 
OrderSignatureDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
H3KRequestOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"H3KRequestOrderData")
-    public JAXBElement<H3KRequestOrderDataType> 
createH3KRequestOrderData(H3KRequestOrderDataType value) {
-        return new 
JAXBElement<H3KRequestOrderDataType>(_H3KRequestOrderData_QNAME, 
H3KRequestOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HTDReponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HTDResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HTDReponseOrderDataType> 
createHTDResponseOrderData(HTDReponseOrderDataType value) {
-        return new 
JAXBElement<HTDReponseOrderDataType>(_HTDResponseOrderData_QNAME, 
HTDReponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SPKIDataType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"SPKIData")
-    public JAXBElement<SPKIDataType> createSPKIData(SPKIDataType value) {
-        return new JAXBElement<SPKIDataType>(_SPKIData_QNAME, 
SPKIDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HIARequestOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HIARequestOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HIARequestOrderDataType> 
createHIARequestOrderData(HIARequestOrderDataType value) {
-        return new 
JAXBElement<HIARequestOrderDataType>(_HIARequestOrderData_QNAME, 
HIARequestOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVZResponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HVZResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HVZResponseOrderDataType> 
createHVZResponseOrderData(HVZResponseOrderDataType value) {
-        return new 
JAXBElement<HVZResponseOrderDataType>(_HVZResponseOrderData_QNAME, 
HVZResponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
SignatureValueType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"SignatureValue")
-    public JAXBElement<SignatureValueType> 
createSignatureValue(SignatureValueType value) {
-        return new JAXBElement<SignatureValueType>(_SignatureValue_QNAME, 
SignatureValueType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
UserSignatureDataSigBookType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.ebics.org/S001";, name = 
"UserSignatureData", substitutionHeadNamespace = "http://www.ebics.org/S001";, 
substitutionHeadName = "EBICSSignatureData")
-    public JAXBElement<UserSignatureDataSigBookType> 
createUserSignatureData(UserSignatureDataSigBookType value) {
-        return new 
JAXBElement<UserSignatureDataSigBookType>(_UserSignatureData_QNAME, 
UserSignatureDataSigBookType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Object 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "OrderParams")
-    public JAXBElement<Object> createOrderParams(Object value) {
-        return new JAXBElement<Object>(_OrderParams_QNAME, Object.class, null, 
value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"KeyValue")
-    public JAXBElement<KeyValueType> createKeyValue(KeyValueType value) {
-        return new JAXBElement<KeyValueType>(_KeyValue_QNAME, 
KeyValueType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
TransformsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"Transforms")
-    public JAXBElement<TransformsType> createTransforms(TransformsType value) {
-        return new JAXBElement<TransformsType>(_Transforms_QNAME, 
TransformsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVUResponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HVUResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HVUResponseOrderDataType> 
createHVUResponseOrderData(HVUResponseOrderDataType value) {
-        return new 
JAXBElement<HVUResponseOrderDataType>(_HVUResponseOrderData_QNAME, 
HVUResponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
SignaturePubKeyInfoType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.ebics.org/S001";, name = 
"SignaturePubKeyInfo")
-    public JAXBElement<SignaturePubKeyInfoType> 
createSignaturePubKeyInfo(SignaturePubKeyInfoType value) {
-        return new 
JAXBElement<SignaturePubKeyInfoType>(_SignaturePubKeyInfo_QNAME, 
SignaturePubKeyInfoType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVUOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "HVUOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<HVUOrderParamsType> 
createHVUOrderParams(HVUOrderParamsType value) {
-        return new JAXBElement<HVUOrderParamsType>(_HVUOrderParams_QNAME, 
HVUOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
DigestMethodType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"DigestMethod")
-    public JAXBElement<DigestMethodType> createDigestMethod(DigestMethodType 
value) {
-        return new JAXBElement<DigestMethodType>(_DigestMethod_QNAME, 
DigestMethodType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"X509Data")
-    public JAXBElement<X509DataType> createX509Data(X509DataType value) {
-        return new JAXBElement<X509DataType>(_X509Data_QNAME, 
X509DataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "AuthSignature")
-    public JAXBElement<SignatureType> createAuthSignature(SignatureType value) 
{
-        return new JAXBElement<SignatureType>(_AuthSignature_QNAME, 
SignatureType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"KeyName")
-    public JAXBElement<String> createKeyName(String value) {
-        return new JAXBElement<String>(_KeyName_QNAME, String.class, null, 
value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"Signature")
-    public JAXBElement<SignatureType> createSignature(SignatureType value) {
-        return new JAXBElement<SignatureType>(_Signature_QNAME, 
SignatureType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"MgmtData")
-    public JAXBElement<String> createMgmtData(String value) {
-        return new JAXBElement<String>(_MgmtData_QNAME, String.class, null, 
value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HAAResponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HAAResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HAAResponseOrderDataType> 
createHAAResponseOrderData(HAAResponseOrderDataType value) {
-        return new 
JAXBElement<HAAResponseOrderDataType>(_HAAResponseOrderData_QNAME, 
HAAResponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVZOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "HVZOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<HVZOrderParamsType> 
createHVZOrderParams(HVZOrderParamsType value) {
-        return new JAXBElement<HVZOrderParamsType>(_HVZOrderParams_QNAME, 
HVZOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
SignaturePropertiesType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"SignatureProperties")
-    public JAXBElement<SignaturePropertiesType> 
createSignatureProperties(SignaturePropertiesType value) {
-        return new 
JAXBElement<SignaturePropertiesType>(_SignatureProperties_QNAME, 
SignaturePropertiesType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HPDResponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HPDResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HPDResponseOrderDataType> 
createHPDResponseOrderData(HPDResponseOrderDataType value) {
-        return new 
JAXBElement<HPDResponseOrderDataType>(_HPDResponseOrderData_QNAME, 
HPDResponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
FULOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "FULOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<FULOrderParamsType> 
createFULOrderParams(FULOrderParamsType value) {
-        return new JAXBElement<FULOrderParamsType>(_FULOrderParams_QNAME, 
FULOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TransformType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"Transform")
-    public JAXBElement<TransformType> createTransform(TransformType value) {
-        return new JAXBElement<TransformType>(_Transform_QNAME, 
TransformType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HKDResponseOrderDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"HKDResponseOrderData", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "EBICSOrderData")
-    public JAXBElement<HKDResponseOrderDataType> 
createHKDResponseOrderData(HKDResponseOrderDataType value) {
-        return new 
JAXBElement<HKDResponseOrderDataType>(_HKDResponseOrderData_QNAME, 
HKDResponseOrderDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVDOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "HVDOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<HVDOrderParamsType> 
createHVDOrderParams(HVDOrderParamsType value) {
-        return new JAXBElement<HVDOrderParamsType>(_HVDOrderParams_QNAME, 
HVDOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
StandardOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = 
"StandardOrderParams", substitutionHeadNamespace = "urn:org:ebics:H004", 
substitutionHeadName = "OrderParams")
-    public JAXBElement<StandardOrderParamsType> 
createStandardOrderParams(StandardOrderParamsType value) {
-        return new 
JAXBElement<StandardOrderParamsType>(_StandardOrderParams_QNAME, 
StandardOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"Reference")
-    public JAXBElement<ReferenceType> createReference(ReferenceType value) {
-        return new JAXBElement<ReferenceType>(_Reference_QNAME, 
ReferenceType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code 
>}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"DigestValue")
-    public JAXBElement<byte[]> createDigestValue(byte[] value) {
-        return new JAXBElement<byte[]>(_DigestValue_QNAME, byte[].class, null, 
((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
HVTOrderParamsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:org:ebics:H004", name = "HVTOrderParams", 
substitutionHeadNamespace = "urn:org:ebics:H004", substitutionHeadName = 
"OrderParams")
-    public JAXBElement<HVTOrderParamsType> 
createHVTOrderParams(HVTOrderParamsType value) {
-        return new JAXBElement<HVTOrderParamsType>(_HVTOrderParams_QNAME, 
HVTOrderParamsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
CanonicalizationMethodType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"CanonicalizationMethod")
-    public JAXBElement<CanonicalizationMethodType> 
createCanonicalizationMethod(CanonicalizationMethodType value) {
-        return new 
JAXBElement<CanonicalizationMethodType>(_CanonicalizationMethod_QNAME, 
CanonicalizationMethodType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
SignedInfoType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"SignedInfo")
-    public JAXBElement<SignedInfoType> createSignedInfo(SignedInfoType value) {
-        return new JAXBElement<SignedInfoType>(_SignedInfo_QNAME, 
SignedInfoType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Object 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.ebics.org/S001";, name = 
"EBICSSignatureData")
-    public JAXBElement<Object> 
createebicsSignatureDataAtEbicsSignatures(Object value) {
-        return new 
JAXBElement<Object>(_ebicsSignatureDataAtEbicsSignatures_QNAME, Object.class, 
null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"Manifest")
-    public JAXBElement<ManifestType> createManifest(ManifestType value) {
-        return new JAXBElement<ManifestType>(_Manifest_QNAME, 
ManifestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code 
>}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"SPKISexp", scope = SPKIDataType.class)
-    public JAXBElement<byte[]> createSPKIDataTypeSPKISexp(byte[] value) {
-        return new JAXBElement<byte[]>(_SPKIDataTypeSPKISexp_QNAME, 
byte[].class, SPKIDataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"HMACOutputLength", scope = SignatureMethodType.class)
-    public JAXBElement<BigInteger> 
createSignatureMethodTypeHMACOutputLength(BigInteger value) {
-        return new 
JAXBElement<BigInteger>(_SignatureMethodTypeHMACOutputLength_QNAME, 
BigInteger.class, SignatureMethodType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"XPath", scope = TransformType.class)
-    public JAXBElement<String> createTransformTypeXPath(String value) {
-        return new JAXBElement<String>(_TransformTypeXPath_QNAME, 
String.class, TransformType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code 
>}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"PGPKeyID", scope = PGPDataType.class)
-    public JAXBElement<byte[]> createPGPDataTypePGPKeyID(byte[] value) {
-        return new JAXBElement<byte[]>(_PGPDataTypePGPKeyID_QNAME, 
byte[].class, PGPDataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code 
>}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"PGPKeyPacket", scope = PGPDataType.class)
-    public JAXBElement<byte[]> createPGPDataTypePGPKeyPacket(byte[] value) {
-        return new JAXBElement<byte[]>(_PGPDataTypePGPKeyPacket_QNAME, 
byte[].class, PGPDataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link 
X509IssuerSerialType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"X509IssuerSerial", scope = X509DataType.class)
-    public JAXBElement<X509IssuerSerialType> 
createX509DataTypeX509IssuerSerial(X509IssuerSerialType value) {
-        return new 
JAXBElement<X509IssuerSerialType>(_X509DataTypeX509IssuerSerial_QNAME, 
X509IssuerSerialType.class, X509DataType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code 
>}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"X509CRL", scope = X509DataType.class)
-    public JAXBElement<byte[]> createX509DataTypeX509CRL(byte[] value) {
-        return new JAXBElement<byte[]>(_X509DataTypeX509CRL_QNAME, 
byte[].class, X509DataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String 
}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"X509SubjectName", scope = X509DataType.class)
-    public JAXBElement<String> createX509DataTypeX509SubjectName(String value) 
{
-        return new JAXBElement<String>(_X509DataTypeX509SubjectName_QNAME, 
String.class, X509DataType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code 
>}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"X509SKI", scope = X509DataType.class)
-    public JAXBElement<byte[]> createX509DataTypeX509SKI(byte[] value) {
-        return new JAXBElement<byte[]>(_X509DataTypeX509SKI_QNAME, 
byte[].class, X509DataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code 
>}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#";, name = 
"X509Certificate", scope = X509DataType.class)
-    public JAXBElement<byte[]> createX509DataTypeX509Certificate(byte[] value) 
{
-        return new JAXBElement<byte[]>(_X509DataTypeX509Certificate_QNAME, 
byte[].class, X509DataType.class, ((byte[]) value));
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/ObjectType.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/ObjectType.java
deleted file mode 100644
index 1bad9d7..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/ObjectType.java
+++ /dev/null
@@ -1,171 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for ObjectType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="ObjectType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence maxOccurs="unbounded" minOccurs="0">
- *         &lt;any processContents='lax'/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *       &lt;attribute name="MimeType" 
type="{http://www.w3.org/2001/XMLSchema}string"; />
- *       &lt;attribute name="Encoding" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ObjectType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class ObjectType {
-
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-    @XmlAttribute(name = "MimeType")
-    protected String mimeType;
-    @XmlAttribute(name = "Encoding")
-    @XmlSchemaType(name = "anyURI")
-    protected String encoding;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the mimeType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMimeType() {
-        return mimeType;
-    }
-
-    /**
-     * Sets the value of the mimeType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMimeType(String value) {
-        this.mimeType = value;
-    }
-
-    /**
-     * Gets the value of the encoding property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getEncoding() {
-        return encoding;
-    }
-
-    /**
-     * Sets the value of the encoding property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setEncoding(String value) {
-        this.encoding = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/OrderAttributeType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/OrderAttributeType.java
deleted file mode 100644
index f8a9263..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/OrderAttributeType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for OrderAttributeType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="OrderAttributeType">
- *   &lt;restriction base="{urn:org:ebics:H004}OrderAttributeBaseType">
- *     &lt;enumeration value="OZHNN"/>
- *     &lt;enumeration value="UZHNN"/>
- *     &lt;enumeration value="DZHNN"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "OrderAttributeType")
-@XmlEnum
-public enum OrderAttributeType {
-
-
-    /**
-     * Auftragsdaten mit Unterschrift, ZIP-komprimiert, hybrid verschlüsselt
-     * 
-     */
-    OZHNN,
-
-    /**
-     * Unterschrift, ZIP-komprimiert, hybrid verschlüsselt
-     * 
-     */
-    UZHNN,
-
-    /**
-     * Auftragsdaten ohne Unterschrift, ZIP-komprimiert, hybrid verschlüsselt
-     * 
-     */
-    DZHNN;
-
-    public String value() {
-        return name();
-    }
-
-    public static OrderAttributeType fromValue(String v) {
-        return valueOf(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/OrderSignatureDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/OrderSignatureDataType.java
deleted file mode 100644
index a3d2e53..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/OrderSignatureDataType.java
+++ /dev/null
@@ -1,190 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Data type according for a digital signature (either autorising an order or 
applied for transportation), structured format.
- * 
- * <p>Java class for OrderSignatureDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="OrderSignatureDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="SignatureVersion" 
type="{http://www.ebics.org/S001}SignatureVersionType"/>
- *         &lt;element name="SignatureValue" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         &lt;element name="PartnerID" 
type="{http://www.ebics.org/S001}PartnerIDType"/>
- *         &lt;element name="UserID" 
type="{http://www.ebics.org/S001}UserIDType"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"; 
minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OrderSignatureDataType", namespace = 
"http://www.ebics.org/S001";, propOrder = {
-    "signatureVersion",
-    "signatureValue",
-    "partnerID",
-    "userID",
-    "x509Data"
-})
-public class OrderSignatureDataType {
-
-    @XmlElement(name = "SignatureVersion", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String signatureVersion;
-    @XmlElement(name = "SignatureValue", required = true)
-    protected byte[] signatureValue;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlElement(name = "X509Data", namespace = 
"http://www.w3.org/2000/09/xmldsig#";)
-    protected X509DataType x509Data;
-
-    /**
-     * Gets the value of the signatureVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSignatureVersion() {
-        return signatureVersion;
-    }
-
-    /**
-     * Sets the value of the signatureVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSignatureVersion(String value) {
-        this.signatureVersion = value;
-    }
-
-    /**
-     * Gets the value of the signatureValue property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getSignatureValue() {
-        return signatureValue;
-    }
-
-    /**
-     * Sets the value of the signatureValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setSignatureValue(byte[] value) {
-        this.signatureValue = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Parameter for X509Data
-     * 
-     * @return
-     *     possible object is
-     *     {@link X509DataType }
-     *     
-     */
-    public X509DataType getX509Data() {
-        return x509Data;
-    }
-
-    /**
-     * Sets the value of the x509Data property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link X509DataType }
-     *     
-     */
-    public void setX509Data(X509DataType value) {
-        this.x509Data = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/OrderTType.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/OrderTType.java
deleted file mode 100644
index 0a95844..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/OrderTType.java
+++ /dev/null
@@ -1,723 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for OrderTType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="OrderTType">
- *   &lt;restriction base="{urn:org:ebics:H004}OrderTBaseType">
- *     &lt;length value="3"/>
- *     &lt;enumeration value="HSA"/>
- *     &lt;enumeration value="HIA"/>
- *     &lt;enumeration value="HPB"/>
- *     &lt;enumeration value="HCA"/>
- *     &lt;enumeration value="HPD"/>
- *     &lt;enumeration value="HVU"/>
- *     &lt;enumeration value="HVD"/>
- *     &lt;enumeration value="HVT"/>
- *     &lt;enumeration value="HVE"/>
- *     &lt;enumeration value="HVS"/>
- *     &lt;enumeration value="HKD"/>
- *     &lt;enumeration value="HAA"/>
- *     &lt;enumeration value="HVU"/>
- *     &lt;enumeration value="HVD"/>
- *     &lt;enumeration value="HVT"/>
- *     &lt;enumeration value="HVE"/>
- *     &lt;enumeration value="HVS"/>
- *     &lt;enumeration value="AAE"/>
- *     &lt;enumeration value="AEA"/>
- *     &lt;enumeration value="AIA"/>
- *     &lt;enumeration value="AKA"/>
- *     &lt;enumeration value="AWV"/>
- *     &lt;enumeration value="AZM"/>
- *     &lt;enumeration value="AZV"/>
- *     &lt;enumeration value="AZ2"/>
- *     &lt;enumeration value="AZ4"/>
- *     &lt;enumeration value="DDG"/>
- *     &lt;enumeration value="DHB"/>
- *     &lt;enumeration value="DTE"/>
- *     &lt;enumeration value="DTI"/>
- *     &lt;enumeration value="DTM"/>
- *     &lt;enumeration value="DTV"/>
- *     &lt;enumeration value="DT2"/>
- *     &lt;enumeration value="DT4"/>
- *     &lt;enumeration value="EAB"/>
- *     &lt;enumeration value="ECS"/>
- *     &lt;enumeration value="EDC"/>
- *     &lt;enumeration value="EEA"/>
- *     &lt;enumeration value="EEZ"/>
- *     &lt;enumeration value="EIB"/>
- *     &lt;enumeration value="EIK"/>
- *     &lt;enumeration value="ESA"/>
- *     &lt;enumeration value="ESM"/>
- *     &lt;enumeration value="ESR"/>
- *     &lt;enumeration value="ESZ"/>
- *     &lt;enumeration value="ESU"/>
- *     &lt;enumeration value="EUE"/>
- *     &lt;enumeration value="GAB"/>
- *     &lt;enumeration value="GAK"/>
- *     &lt;enumeration value="GKT"/>
- *     &lt;enumeration value="IDD"/>
- *     &lt;enumeration value="IIB"/>
- *     &lt;enumeration value="IIK"/>
- *     &lt;enumeration value="INT"/>
- *     &lt;enumeration value="IZG"/>
- *     &lt;enumeration value="IZL"/>
- *     &lt;enumeration value="IZV"/>
- *     &lt;enumeration value="MAO"/>
- *     &lt;enumeration value="MCV"/>
- *     &lt;enumeration value="MC2"/>
- *     &lt;enumeration value="MC4"/>
- *     &lt;enumeration value="POZ"/>
- *     &lt;enumeration value="RDT"/>
- *     &lt;enumeration value="RFT"/>
- *     &lt;enumeration value="STA"/>
- *     &lt;enumeration value="VMK"/>
- *     &lt;enumeration value="WPA"/>
- *     &lt;enumeration value="WPB"/>
- *     &lt;enumeration value="WPC"/>
- *     &lt;enumeration value="WPD"/>
- *     &lt;enumeration value="INI"/>
- *     &lt;enumeration value="PTK"/>
- *     &lt;enumeration value="PUB"/>
- *     &lt;enumeration value="HCA"/>
- *     &lt;enumeration value="SPR"/>
- *     &lt;enumeration value="VPB"/>
- *     &lt;enumeration value="FIN"/>
- *     &lt;enumeration value="IZS"/>
- *     &lt;enumeration value="SSP"/>
- *     &lt;enumeration value="ATA"/>
- *     &lt;enumeration value="BKA"/>
- *     &lt;enumeration value="BZK"/>
- *     &lt;enumeration value="DKI"/>
- *     &lt;enumeration value="DMI"/>
- *     &lt;enumeration value="DSW"/>
- *     &lt;enumeration value="ESG"/>
- *     &lt;enumeration value="ESP"/>
- *     &lt;enumeration value="FTB"/>
- *     &lt;enumeration value="FTD"/>
- *     &lt;enumeration value="IBK"/>
- *     &lt;enumeration value="IBW"/>
- *     &lt;enumeration value="IBU"/>
- *     &lt;enumeration value="IKK"/>
- *     &lt;enumeration value="IKU"/>
- *     &lt;enumeration value="IKW"/>
- *     &lt;enumeration value="KTH"/>
- *     &lt;enumeration value="KTR"/>
- *     &lt;enumeration value="KKZ"/>
- *     &lt;enumeration value="TST"/>
- *     &lt;enumeration value="UPD"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "OrderTType")
-@XmlEnum
-public enum OrderTType {
-
-
-    /**
-     * Senden der Public Keys für Authentifikation und Verschlüsselung, 
bankfachlich signiert mit FTAM-Signaturschlüssel
-     * 
-     */
-    HSA("HSA"),
-
-    /**
-     * Senden der Public Keys zur Authentifikation und zur Verschlüsselung
-     * 
-     */
-    HIA("HIA"),
-
-    /**
-     * Abholen der Public Keys der Bank
-     * 
-     */
-    HPB("HPB"),
-
-    /**
-     * Ändern der Public Keys zur Authentifikation und zur Verschlüsselung
-     * 
-     */
-    HCA("HCA"),
-
-    /**
-     * Abholen Bankparameter für internetbasierten Standard
-     * 
-     */
-    HPD("HPD"),
-
-    /**
-     * Abholen VEU Übersicht
-     * 
-     */
-    HVU("HVU"),
-
-    /**
-     * Abholen VEU Auftragsdaten (Daten-trägerbegleitzettel)
-     * 
-     */
-    HVD("HVD"),
-
-    /**
-     * Abholen VEU Auftragsdaten ( Transakti-onsdetails gemäß Parametervorgabe)
-     * 
-     */
-    HVT("HVT"),
-
-    /**
-     * Senden EU zu bestehendem VEU-Auftrag
-     * 
-     */
-    HVE("HVE"),
-
-    /**
-     * Senden Stornierung für bestehenden VEU-Auftrag
-     * 
-     */
-    HVS("HVS"),
-
-    /**
-     * Abholen Konfigurationsdaten des Teilnehmers
-     * 
-     */
-    HKD("HKD"),
-
-    /**
-     * Abholen Übersicht zu abrufbaren Aufträgen
-     * 
-     */
-    HAA("HAA"),
-
-    /**
-     * Senden Importakkreditiv Änderung
-     * 
-     */
-    AAE("AAE"),
-
-    /**
-     * Senden Exportakkreditive
-     * 
-     */
-    AEA("AEA"),
-
-    /**
-     * Senden Import-Akkreditive Avisierung
-     * 
-     */
-    AIA("AIA"),
-
-    /**
-     * Abholen Import-Akkreditive
-     * 
-     */
-    AKA("AKA"),
-
-    /**
-     * AWV-Meldung senden
-     * 
-     */
-    AWV("AWV"),
-
-    /**
-     * AZV im Magnetbandformat senden (Satzlänge variabel)
-     * 
-     */
-    AZM("AZM"),
-
-    /**
-     * AZV im Diskettenformat senden
-     * 
-     */
-    AZV("AZV"),
-
-    /**
-     * AZV im Magnetbandformat senden (Satzlängenfeld 2 Bytes)
-     * 
-     */
-    @XmlEnumValue("AZ2")
-    AZ_2("AZ2"),
-
-    /**
-     * AZV im Magnetbandformat senden (Satzlängenfeld 4 Bytes)
-     * 
-     */
-    @XmlEnumValue("AZ4")
-    AZ_4("AZ4"),
-
-    /**
-     * Abholen Devisenhandelsbestätigung
-     * 
-     */
-    DDG("DDG"),
-
-    /**
-     * Senden Devisenhandelsbestätigung
-     * 
-     */
-    DHB("DHB"),
-
-    /**
-     * Eilauftrag (IZV im DTAUS0-Format) senden
-     * 
-     */
-    DTE("DTE"),
-
-    /**
-     * IZV-Datei abholen
-     * 
-     */
-    DTI("DTI"),
-
-    /**
-     * MCV-Datei abholen (Format analog MCV)
-     * 
-     */
-    DTM("DTM"),
-
-    /**
-     * Zahlungsverkehrsdateien von Service-Rechenzentren senden
-     * 
-     */
-    DTV("DTV"),
-
-    /**
-     * MC2-Datei abholen (Format analog MC2)
-     * 
-     */
-    @XmlEnumValue("DT2")
-    DT_2("DT2"),
-
-    /**
-     * MC4-Datei abholen (Format analog MC4)
-     * 
-     */
-    @XmlEnumValue("DT4")
-    DT_4("DT4"),
-
-    /**
-     * Exportakkreditive abholen
-     * 
-     */
-    EAB("EAB"),
-
-    /**
-     * Senden electronic-cash Lastschriftdatei
-     * 
-     */
-    ECS("ECS"),
-
-    /**
-     * Senden Maestro-Lastschriftdatei
-     * 
-     */
-    EDC("EDC"),
-
-    /**
-     * EDIFACT abholen ASCII
-     * 
-     */
-    EEA("EEA"),
-
-    /**
-     * EDIFACT abholen EBCDIC
-     * 
-     */
-    EEZ("EEZ"),
-
-    /**
-     * Ausführungsanzeige (Exportinkasso) Bank an Kunde abholen
-     * 
-     */
-    EIB("EIB"),
-
-    /**
-     * Senden Exportinkassi
-     * 
-     */
-    EIK("EIK"),
-
-    /**
-     * EDIFACT senden ASCII
-     * 
-     */
-    ESA("ESA"),
-
-    /**
-     * EU-Standardüberweisung (Zahlungsart 13) im Magnetbandformat 
(Satzlängenfeld 4 Bytes)
-     * 
-     */
-    ESM("ESM"),
-
-    /**
-     * Einreichung von EDIFACT-Lastschriften
-     * 
-     */
-    ESR("ESR"),
-
-    /**
-     * EDIFACT senden EBCDIC
-     * 
-     */
-    ESZ("ESZ"),
-
-    /**
-     * EU-Standardüberweisung (Zahlungsart 13)
-     * 
-     */
-    ESU("ESU"),
-
-    /**
-     * Taggleiche grenzüberschreitende Euro-Eilzahlung
-     * 
-     */
-    EUE("EUE"),
-
-    /**
-     * Abholen Garantien
-     * 
-     */
-    GAB("GAB"),
-
-    /**
-     * Senden Garantien
-     * 
-     */
-    GAK("GAK"),
-
-    /**
-     * GeldKarte-Umsatz senden (Datenaufbau gemäß GeldKarte-Spezifikation)
-     * 
-     */
-    GKT("GKT"),
-
-    /**
-     * Internationale Lastschriften
-     * 
-     */
-    IDD("IDD"),
-
-    /**
-     * Abholen Importinkassi
-     * 
-     */
-    IIB("IIB"),
-
-    /**
-     * Senden Importinkassi
-     * 
-     */
-    IIK("IIK"),
-
-    /**
-     * Internationaler Zahlungsverkehr
-     * 
-     */
-    INT("INT"),
-
-    /**
-     * Inlandszahlungsverkehrsauftrag senden (nur Gutschriften)
-     * 
-     */
-    IZG("IZG"),
-
-    /**
-     * Inlandszahlungsverkehrsauftrag senden (nur Lastschriften)
-     * 
-     */
-    IZL("IZL"),
-
-    /**
-     * Inlandszahlungsverkehrsauftrag senden
-     * 
-     */
-    IZV("IZV"),
-
-    /**
-     * Abholen Magnetband-Datei aus optischer Beleglesung
-     * 
-     */
-    MAO("MAO"),
-
-    /**
-     * Senden IZV-Magnetbandformat (Satzlängenfeld 4 Bytes)
-     * 
-     */
-    MCV("MCV"),
-
-    /**
-     * Senden IZV-Magnetbandformat (Satzlängenfeld 2 Bytes)
-     * 
-     */
-    @XmlEnumValue("MC2")
-    MC_2("MC2"),
-
-    /**
-     * Senden IZV-Magnetbandformat (Satzlänge variabel)
-     * 
-     */
-    @XmlEnumValue("MC4")
-    MC_4("MC4"),
-
-    /**
-     * Senden POZ-Datei
-     * 
-     */
-    POZ("POZ"),
-
-    /**
-     * Rücklastschrift an Kunde
-     * 
-     */
-    RDT("RDT"),
-
-    /**
-     * Request for Transfer
-     * 
-     */
-    RFT("RFT"),
-
-    /**
-     * Abholen Swift-Tagesauszüge
-     * 
-     */
-    STA("STA"),
-
-    /**
-     * Abholen kurzfristige Vormerkposten
-     * 
-     */
-    VMK("VMK"),
-
-    /**
-     * Abholen Wertpapierabrechnung
-     * 
-     */
-    WPA("WPA"),
-
-    /**
-     * Abholen Wertpapierausführungsanzeige
-     * 
-     */
-    WPB("WPB"),
-
-    /**
-     * Abholen Depotaufstellung
-     * 
-     */
-    WPC("WPC"),
-
-    /**
-     * Abholen sonstige WP-Umsätze
-     * 
-     */
-    WPD("WPD"),
-
-    /**
-     * Initialisierung der bankfachlichen EU des Teilnehmers.
-     * 
-     */
-    INI("INI"),
-
-    /**
-     * Abholen Kundenprotokoll
-     * 
-     */
-    PTK("PTK"),
-
-    /**
-     * Senden Public Key zur Unterschriftenverifizierung
-     * 
-     */
-    PUB("PUB"),
-
-    /**
-     * Sperren der Zugangsberechtigung
-     * 
-     */
-    SPR("SPR"),
-
-    /**
-     * Abholen Public Key der Bank zur Verschlüsselung
-     * 
-     */
-    VPB("VPB"),
-
-    /**
-     * EDIFACT-FINPAY senden
-     * 
-     */
-    FIN("FIN"),
-
-    /**
-     * Informationen von Zentralstellen
-     * 
-     */
-    IZS("IZS"),
-
-    /**
-     * ec-Karten-Sperrdatei
-     * 
-     */
-    SSP("SSP"),
-
-    /**
-     * Teilausnutzung Importakkreditiv (Kreditinstitut an Kunde)
-     * 
-     */
-    ATA("ATA"),
-
-    /**
-     * Auftragsart für elektronische Kontoauszüge
-     * 
-     */
-    BKA("BKA"),
-
-    /**
-     * Barzahlungskarte
-     * 
-     */
-    BZK("BZK"),
-
-    /**
-     * Devisenkursinformationen abholen (Euro)
-     * 
-     */
-    DKI("DKI"),
-
-    /**
-     * Abholen Devisenmarktinformationen
-     * 
-     */
-    DMI("DMI"),
-
-    /**
-     * Abholen Devisenswapinformationen
-     * 
-     */
-    DSW("DSW"),
-
-    /**
-     * ESG-Datei für Elektronische Zweitunterschrift abholen
-     * 
-     */
-    ESG("ESG"),
-
-    /**
-     * ESP-Datei für Elektronische Zweitunterschrift senden
-     * 
-     */
-    ESP("ESP"),
-
-    /**
-     * Abholen/Senden beliebige Datei
-     * 
-     */
-    FTB("FTB"),
-
-    /**
-     * Freie Textdatei senden/abholen
-     * 
-     */
-    FTD("FTD"),
-
-    /**
-     * Abholen Institutsbestätigungsdatei (Komplettbestand)
-     * 
-     */
-    IBK("IBK"),
-
-    /**
-     * Abholen Institutsbestätigungsdatei (Komplettbestand weitere Datei)
-     * 
-     */
-    IBW("IBW"),
-
-    /**
-     * Abholen Institutsbestätigungsdatei (tägliches Update)
-     * 
-     */
-    IBU("IBU"),
-
-    /**
-     * Senden Institutskonten (Komplettbestand begrenzt auf 170 MB)
-     * 
-     */
-    IKK("IKK"),
-
-    /**
-     * Senden Institutskonten (tägliches Update)
-     * 
-     */
-    IKU("IKU"),
-
-    /**
-     * Senden Institutskonten (Komplettbestand weitere Datei)
-     * 
-     */
-    IKW("IKW"),
-
-    /**
-     * KTOHIN: Automatisiertes Verfahren für die Änderung von Kontonummern und 
Bankleitzahlen
-     * 
-     */
-    KTH("KTH"),
-
-    /**
-     * KTORUECK: Automatisiertes Verfahren für die Änderung von Kontonummern 
und Bankleitzahlen 
-     * 
-     */
-    KTR("KTR"),
-
-    /**
-     * Kontenkonzentration und Saldenausgleich
-     * 
-     */
-    KKZ("KKZ"),
-
-    /**
-     * Senden/Abholen Testdatei (ASCII)
-     * 
-     */
-    TST("TST"),
-
-    /**
-     * Updates abholen
-     * 
-     */
-    UPD("UPD");
-    private final String value;
-
-    OrderTType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static OrderTType fromValue(String v) {
-        for (OrderTType c: OrderTType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PGPDataType.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PGPDataType.java
deleted file mode 100644
index 0b8efb3..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PGPDataType.java
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for PGPDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PGPDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;choice>
- *         &lt;sequence>
- *           &lt;element name="PGPKeyID" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           &lt;element name="PGPKeyPacket" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"; minOccurs="0"/>
- *           &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;/sequence>
- *         &lt;sequence>
- *           &lt;element name="PGPKeyPacket" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;/sequence>
- *       &lt;/choice>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PGPDataType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class PGPDataType {
-
-    @XmlElementRefs({
-        @XmlElementRef(name = "PGPKeyPacket", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "PGPKeyID", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false)
-    })
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-
-    /**
-     * Gets the rest of the content model. 
-     * 
-     * <p>
-     * You are getting this "catch-all" property because of the following 
reason: 
-     * The field name "PGPKeyPacket" is used by two different parts of a 
schema. See: 
-     * line 218 of 
file:/home/marcello/prog/libeufin/libeufin/sandbox/src/main/resources/xmldsig-core-schema.xsd
-     * line 213 of 
file:/home/marcello/prog/libeufin/libeufin/sandbox/src/main/resources/xmldsig-core-schema.xsd
-     * <p>
-     * To get rid of this property, apply a property customization to one 
-     * of both of the following declarations to change their names: 
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/Parameter.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/Parameter.java
deleted file mode 100644
index b067259..0000000
--- a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/Parameter.java
+++ /dev/null
@@ -1,196 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="Name" 
type="{http://www.w3.org/2001/XMLSchema}token"/>
- *         &lt;element name="Value">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension 
base="&lt;http://www.w3.org/2001/XMLSchema>anySimpleType">
- *                 &lt;attribute name="Type" use="required" 
type="{http://www.w3.org/2001/XMLSchema}NCName"; />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "name",
-    "value"
-})
-@XmlRootElement(name = "Parameter")
-public class Parameter {
-
-    @XmlElement(name = "Name", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String name;
-    @XmlElement(name = "Value", required = true)
-    protected Parameter.Value value;
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Parameter.Value }
-     *     
-     */
-    public Parameter.Value getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Parameter.Value }
-     *     
-     */
-    public void setValue(Parameter.Value value) {
-        this.value = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension 
base="&lt;http://www.w3.org/2001/XMLSchema>anySimpleType">
-     *       &lt;attribute name="Type" use="required" 
type="{http://www.w3.org/2001/XMLSchema}NCName"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Value {
-
-        @XmlValue
-        @XmlSchemaType(name = "anySimpleType")
-        protected Object value;
-        @XmlAttribute(name = "Type", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        @XmlSchemaType(name = "NCName")
-        protected String type;
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Object }
-         *     
-         */
-        public Object getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Object }
-         *     
-         */
-        public void setValue(Object value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the type property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getType() {
-            return type;
-        }
-
-        /**
-         * Sets the value of the type property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setType(String value) {
-            this.type = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PartnerInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PartnerInfoType.java
deleted file mode 100644
index 4563556..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PartnerInfoType.java
+++ /dev/null
@@ -1,310 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for customer data with regard to distributed signatures (order 
types HKD, HTD).
- * 
- * <p>Java class for PartnerInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PartnerInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="AddressInfo" 
type="{urn:org:ebics:H004}AddressInfoType"/>
- *         &lt;element name="BankInfo" 
type="{urn:org:ebics:H004}BankInfoType"/>
- *         &lt;element name="AccountInfo" maxOccurs="unbounded" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;extension base="{urn:org:ebics:H004}AccountType">
- *                 &lt;sequence>
- *                   &lt;element name="UsageOrderTypes" 
type="{urn:org:ebics:H004}OrderTListType" minOccurs="0"/>
- *                   &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *                 &lt;/sequence>
- *                 &lt;attribute name="ID" use="required" 
type="{urn:org:ebics:H004}AccountIDType" />
- *               &lt;/extension>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="OrderInfo" 
type="{urn:org:ebics:H004}AuthOrderInfoType" maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PartnerInfoType", propOrder = {
-    "addressInfo",
-    "bankInfo",
-    "accountInfo",
-    "orderInfo"
-})
-public class PartnerInfoType {
-
-    @XmlElement(name = "AddressInfo", required = true)
-    protected AddressInfoType addressInfo;
-    @XmlElement(name = "BankInfo", required = true)
-    protected BankInfoType bankInfo;
-    @XmlElement(name = "AccountInfo")
-    protected List<PartnerInfoType.AccountInfo> accountInfo;
-    @XmlElement(name = "OrderInfo", required = true)
-    protected List<AuthOrderInfoType> orderInfo;
-
-    /**
-     * Gets the value of the addressInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AddressInfoType }
-     *     
-     */
-    public AddressInfoType getAddressInfo() {
-        return addressInfo;
-    }
-
-    /**
-     * Sets the value of the addressInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AddressInfoType }
-     *     
-     */
-    public void setAddressInfo(AddressInfoType value) {
-        this.addressInfo = value;
-    }
-
-    /**
-     * Gets the value of the bankInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BankInfoType }
-     *     
-     */
-    public BankInfoType getBankInfo() {
-        return bankInfo;
-    }
-
-    /**
-     * Sets the value of the bankInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BankInfoType }
-     *     
-     */
-    public void setBankInfo(BankInfoType value) {
-        this.bankInfo = value;
-    }
-
-    /**
-     * Gets the value of the accountInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the accountInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAccountInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link PartnerInfoType.AccountInfo }
-     * 
-     * 
-     */
-    public List<PartnerInfoType.AccountInfo> getAccountInfo() {
-        if (accountInfo == null) {
-            accountInfo = new ArrayList<PartnerInfoType.AccountInfo>();
-        }
-        return this.accountInfo;
-    }
-
-    /**
-     * Gets the value of the orderInfo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderInfo 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderInfo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AuthOrderInfoType }
-     * 
-     * 
-     */
-    public List<AuthOrderInfoType> getOrderInfo() {
-        if (orderInfo == null) {
-            orderInfo = new ArrayList<AuthOrderInfoType>();
-        }
-        return this.orderInfo;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:org:ebics:H004}AccountType">
-     *       &lt;sequence>
-     *         &lt;element name="UsageOrderTypes" 
type="{urn:org:ebics:H004}OrderTListType" minOccurs="0"/>
-     *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
-     *       &lt;/sequence>
-     *       &lt;attribute name="ID" use="required" 
type="{urn:org:ebics:H004}AccountIDType" />
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "usageOrderTypes",
-        "any"
-    })
-    public static class AccountInfo
-        extends AccountType
-    {
-
-        @XmlList
-        @XmlElement(name = "UsageOrderTypes")
-        protected List<String> usageOrderTypes;
-        @XmlAnyElement(lax = true)
-        protected List<Object> any;
-        @XmlAttribute(name = "ID", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String id;
-
-        /**
-         * Gets the value of the usageOrderTypes property.
-         * 
-         * <p>
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a <CODE>set</CODE> method for the 
usageOrderTypes property.
-         * 
-         * <p>
-         * For example, to add a new item, do as follows:
-         * <pre>
-         *    getUsageOrderTypes().add(newItem);
-         * </pre>
-         * 
-         * 
-         * <p>
-         * Objects of the following type(s) are allowed in the list
-         * {@link String }
-         * 
-         * 
-         */
-        public List<String> getUsageOrderTypes() {
-            if (usageOrderTypes == null) {
-                usageOrderTypes = new ArrayList<String>();
-            }
-            return this.usageOrderTypes;
-        }
-
-        /**
-         * Gets the value of the any property.
-         * 
-         * <p>
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a <CODE>set</CODE> method for the any 
property.
-         * 
-         * <p>
-         * For example, to add a new item, do as follows:
-         * <pre>
-         *    getAny().add(newItem);
-         * </pre>
-         * 
-         * 
-         * <p>
-         * Objects of the following type(s) are allowed in the list
-         * {@link Element }
-         * {@link Object }
-         * 
-         * 
-         */
-        public List<Object> getAny() {
-            if (any == null) {
-                any = new ArrayList<Object>();
-            }
-            return this.any;
-        }
-
-        /**
-         * Gets the value of the id property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getID() {
-            return id;
-        }
-
-        /**
-         * Sets the value of the id property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setID(String value) {
-            this.id = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PreValidationAccountAuthType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PreValidationAccountAuthType.java
deleted file mode 100644
index ba24737..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PreValidationAccountAuthType.java
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Datentyp für Kontenberechtigungsdaten zur Vorabprüfung.
- * 
- * <p>Java class for PreValidationAccountAuthType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PreValidationAccountAuthType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}AccountType">
- *       &lt;sequence>
- *         &lt;element name="Amount" type="{urn:org:ebics:H004}AmountType" 
minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PreValidationAccountAuthType", propOrder = {
-    "amount"
-})
-public class PreValidationAccountAuthType
-    extends AccountType
-{
-
-    @XmlElement(name = "Amount")
-    protected AmountType amount;
-
-    /**
-     * Gets the value of the amount property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AmountType }
-     *     
-     */
-    public AmountType getAmount() {
-        return amount;
-    }
-
-    /**
-     * Sets the value of the amount property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AmountType }
-     *     
-     */
-    public void setAmount(AmountType value) {
-        this.amount = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PreValidationRequestType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PreValidationRequestType.java
deleted file mode 100644
index a2f2799..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PreValidationRequestType.java
+++ /dev/null
@@ -1,147 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for pre-validation (request).
- * 
- * <p>Java class for PreValidationRequestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PreValidationRequestType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="DataDigest" 
type="{urn:org:ebics:H004}DataDigestType" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="AccountAuthorisation" 
type="{urn:org:ebics:H004}PreValidationAccountAuthType" maxOccurs="unbounded" 
minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PreValidationRequestType", propOrder = {
-    "dataDigest",
-    "accountAuthorisation",
-    "any"
-})
-public class PreValidationRequestType {
-
-    @XmlElement(name = "DataDigest")
-    protected List<DataDigestType> dataDigest;
-    @XmlElement(name = "AccountAuthorisation")
-    protected List<PreValidationAccountAuthType> accountAuthorisation;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the dataDigest property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the dataDigest 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getDataDigest().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link DataDigestType }
-     * 
-     * 
-     */
-    public List<DataDigestType> getDataDigest() {
-        if (dataDigest == null) {
-            dataDigest = new ArrayList<DataDigestType>();
-        }
-        return this.dataDigest;
-    }
-
-    /**
-     * Gets the value of the accountAuthorisation property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
accountAuthorisation property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAccountAuthorisation().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link PreValidationAccountAuthType }
-     * 
-     * 
-     */
-    public List<PreValidationAccountAuthType> getAccountAuthorisation() {
-        if (accountAuthorisation == null) {
-            accountAuthorisation = new 
ArrayList<PreValidationAccountAuthType>();
-        }
-        return this.accountAuthorisation;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PubKeyDigestType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PubKeyDigestType.java
deleted file mode 100644
index 877ea43..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PubKeyDigestType.java
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-
-
-/**
- * Datentyp für Hashwerte und Attribute von öffentlichen Schlüsseln.
- * 
- * <p>Java class for PubKeyDigestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PubKeyDigestType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;urn:org:ebics:H004>DigestType">
- *       &lt;attribute name="Algorithm" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PubKeyDigestType", propOrder = {
-    "value"
-})
-@XmlSeeAlso({
-    
tech.libeufin.messages.ebics.response.DataEncryptionInfoType.EncryptionPubKeyDigest.class
-})
-public class PubKeyDigestType {
-
-    @XmlValue
-    protected byte[] value;
-    @XmlAttribute(name = "Algorithm", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String algorithm;
-
-    /**
-     * Datentyp für Hashwerte.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setValue(byte[] value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the algorithm property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAlgorithm() {
-        return algorithm;
-    }
-
-    /**
-     * Sets the value of the algorithm property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAlgorithm(String value) {
-        this.algorithm = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PubKeyInfoTypeAtEbicsSignatures.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PubKeyInfoTypeAtEbicsSignatures.java
deleted file mode 100644
index 09a21ae..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PubKeyInfoTypeAtEbicsSignatures.java
+++ /dev/null
@@ -1,143 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für die Darstellung eines öffentlichen RSA-Schlüssels als 
Exponent-Modulus-Kombination oder als X509-Zertifikat.
- * 
- * <p>Java class for PubKeyInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PubKeyInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;sequence>
- *           &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"; 
minOccurs="0"/>
- *           &lt;element name="PubKeyValue" 
type="{http://www.ebics.org/S001}PubKeyValueType"/>
- *         &lt;/sequence>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PubKeyInfoType", namespace = "http://www.ebics.org/S001";, 
propOrder = {
-    "x509Data",
-    "pubKeyValue",
-    "any"
-})
-@XmlSeeAlso({
-    SignaturePubKeyInfoType.class
-})
-public class PubKeyInfoTypeAtEbicsSignatures {
-
-    @XmlElement(name = "X509Data", namespace = 
"http://www.w3.org/2000/09/xmldsig#";)
-    protected X509DataType x509Data;
-    @XmlElement(name = "PubKeyValue", required = true)
-    protected PubKeyValueTypeAtEbicsSignatures pubKeyValue;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the x509Data property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link X509DataType }
-     *     
-     */
-    public X509DataType getX509Data() {
-        return x509Data;
-    }
-
-    /**
-     * Sets the value of the x509Data property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link X509DataType }
-     *     
-     */
-    public void setX509Data(X509DataType value) {
-        this.x509Data = value;
-    }
-
-    /**
-     * Gets the value of the pubKeyValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PubKeyValueTypeAtEbicsSignatures }
-     *     
-     */
-    public PubKeyValueTypeAtEbicsSignatures getPubKeyValue() {
-        return pubKeyValue;
-    }
-
-    /**
-     * Sets the value of the pubKeyValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PubKeyValueTypeAtEbicsSignatures }
-     *     
-     */
-    public void setPubKeyValue(PubKeyValueTypeAtEbicsSignatures value) {
-        this.pubKeyValue = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PubKeyInfoTypeAtEbicsTypes.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PubKeyInfoTypeAtEbicsTypes.java
deleted file mode 100644
index fd2421f..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PubKeyInfoTypeAtEbicsTypes.java
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für die Darstellung eines öffentlichen RSA-Schlüssels als 
Exponent-Modulus-Kombination oder als X509-Zertifikat.
- * 
- * <p>Java class for PubKeyInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PubKeyInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;sequence>
- *           &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"; 
minOccurs="0"/>
- *           &lt;element name="PubKeyValue" 
type="{urn:org:ebics:H004}PubKeyValueType"/>
- *         &lt;/sequence>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PubKeyInfoType", propOrder = {
-    "x509Data",
-    "pubKeyValue",
-    "any"
-})
-@XmlSeeAlso({
-    EncryptionPubKeyInfoType.class,
-    AuthenticationPubKeyInfoType.class
-})
-public class PubKeyInfoTypeAtEbicsTypes {
-
-    @XmlElement(name = "X509Data", namespace = 
"http://www.w3.org/2000/09/xmldsig#";)
-    protected X509DataType x509Data;
-    @XmlElement(name = "PubKeyValue", required = true)
-    protected PubKeyValueTypeAtEbicsTypes pubKeyValue;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the x509Data property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link X509DataType }
-     *     
-     */
-    public X509DataType getX509Data() {
-        return x509Data;
-    }
-
-    /**
-     * Sets the value of the x509Data property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link X509DataType }
-     *     
-     */
-    public void setX509Data(X509DataType value) {
-        this.x509Data = value;
-    }
-
-    /**
-     * Gets the value of the pubKeyValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PubKeyValueTypeAtEbicsTypes }
-     *     
-     */
-    public PubKeyValueTypeAtEbicsTypes getPubKeyValue() {
-        return pubKeyValue;
-    }
-
-    /**
-     * Sets the value of the pubKeyValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PubKeyValueTypeAtEbicsTypes }
-     *     
-     */
-    public void setPubKeyValue(PubKeyValueTypeAtEbicsTypes value) {
-        this.pubKeyValue = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PubKeyValueTypeAtEbicsSignatures.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PubKeyValueTypeAtEbicsSignatures.java
deleted file mode 100644
index 15102f8..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PubKeyValueTypeAtEbicsSignatures.java
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für die Exponent-Modulus-Darstellung eines öffentlichen 
RSA-Schlüssels.
- * 
- * <p>Java class for PubKeyValueType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PubKeyValueType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
- *         &lt;element name="TimeStamp" 
type="{http://www.ebics.org/S001}TimestampType"; minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PubKeyValueType", namespace = "http://www.ebics.org/S001";, 
propOrder = {
-    "rsaKeyValue",
-    "timeStamp",
-    "any"
-})
-public class PubKeyValueTypeAtEbicsSignatures {
-
-    @XmlElement(name = "RSAKeyValue", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, required = true)
-    protected RSAKeyValueType rsaKeyValue;
-    @XmlElement(name = "TimeStamp")
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar timeStamp;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the rsaKeyValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RSAKeyValueType }
-     *     
-     */
-    public RSAKeyValueType getRSAKeyValue() {
-        return rsaKeyValue;
-    }
-
-    /**
-     * Sets the value of the rsaKeyValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RSAKeyValueType }
-     *     
-     */
-    public void setRSAKeyValue(RSAKeyValueType value) {
-        this.rsaKeyValue = value;
-    }
-
-    /**
-     * Gets the value of the timeStamp property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getTimeStamp() {
-        return timeStamp;
-    }
-
-    /**
-     * Sets the value of the timeStamp property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setTimeStamp(XMLGregorianCalendar value) {
-        this.timeStamp = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PubKeyValueTypeAtEbicsTypes.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PubKeyValueTypeAtEbicsTypes.java
deleted file mode 100644
index f157547..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/PubKeyValueTypeAtEbicsTypes.java
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für die Exponent-Modulus-Darstellung eines öffentlichen 
RSA-Schlüssels.
- * 
- * <p>Java class for PubKeyValueType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="PubKeyValueType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
- *         &lt;element name="TimeStamp" 
type="{urn:org:ebics:H004}TimestampType" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PubKeyValueType", propOrder = {
-    "rsaKeyValue",
-    "timeStamp",
-    "any"
-})
-public class PubKeyValueTypeAtEbicsTypes {
-
-    @XmlElement(name = "RSAKeyValue", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, required = true)
-    protected RSAKeyValueType rsaKeyValue;
-    @XmlElement(name = "TimeStamp")
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar timeStamp;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the rsaKeyValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RSAKeyValueType }
-     *     
-     */
-    public RSAKeyValueType getRSAKeyValue() {
-        return rsaKeyValue;
-    }
-
-    /**
-     * Sets the value of the rsaKeyValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RSAKeyValueType }
-     *     
-     */
-    public void setRSAKeyValue(RSAKeyValueType value) {
-        this.rsaKeyValue = value;
-    }
-
-    /**
-     * Gets the value of the timeStamp property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getTimeStamp() {
-        return timeStamp;
-    }
-
-    /**
-     * Sets the value of the timeStamp property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setTimeStamp(XMLGregorianCalendar value) {
-        this.timeStamp = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/RSAKeyValueType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/RSAKeyValueType.java
deleted file mode 100644
index 8c63b52..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/RSAKeyValueType.java
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for RSAKeyValueType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="RSAKeyValueType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="Modulus" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         &lt;element name="Exponent" 
type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RSAKeyValueType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "modulus",
-    "exponent"
-})
-public class RSAKeyValueType {
-
-    @XmlElement(name = "Modulus", required = true)
-    protected byte[] modulus;
-    @XmlElement(name = "Exponent", required = true)
-    protected byte[] exponent;
-
-    /**
-     * Gets the value of the modulus property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getModulus() {
-        return modulus;
-    }
-
-    /**
-     * Sets the value of the modulus property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setModulus(byte[] value) {
-        this.modulus = value;
-    }
-
-    /**
-     * Gets the value of the exponent property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getExponent() {
-        return exponent;
-    }
-
-    /**
-     * Sets the value of the exponent property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setExponent(byte[] value) {
-        this.exponent = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/ReferenceType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/ReferenceType.java
deleted file mode 100644
index d7bd5ce..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/ReferenceType.java
+++ /dev/null
@@ -1,214 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for ReferenceType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="ReferenceType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms"; 
minOccurs="0"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *       &lt;attribute name="URI" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *       &lt;attribute name="Type" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ReferenceType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "transforms",
-    "digestMethod",
-    "digestValue"
-})
-public class ReferenceType {
-
-    @XmlElement(name = "Transforms")
-    protected TransformsType transforms;
-    @XmlElement(name = "DigestMethod", required = true)
-    protected DigestMethodType digestMethod;
-    @XmlElement(name = "DigestValue", required = true)
-    protected byte[] digestValue;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-    @XmlAttribute(name = "URI")
-    @XmlSchemaType(name = "anyURI")
-    protected String uri;
-    @XmlAttribute(name = "Type")
-    @XmlSchemaType(name = "anyURI")
-    protected String type;
-
-    /**
-     * Gets the value of the transforms property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TransformsType }
-     *     
-     */
-    public TransformsType getTransforms() {
-        return transforms;
-    }
-
-    /**
-     * Sets the value of the transforms property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TransformsType }
-     *     
-     */
-    public void setTransforms(TransformsType value) {
-        this.transforms = value;
-    }
-
-    /**
-     * Gets the value of the digestMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DigestMethodType }
-     *     
-     */
-    public DigestMethodType getDigestMethod() {
-        return digestMethod;
-    }
-
-    /**
-     * Sets the value of the digestMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DigestMethodType }
-     *     
-     */
-    public void setDigestMethod(DigestMethodType value) {
-        this.digestMethod = value;
-    }
-
-    /**
-     * Gets the value of the digestValue property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getDigestValue() {
-        return digestValue;
-    }
-
-    /**
-     * Sets the value of the digestValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setDigestValue(byte[] value) {
-        this.digestValue = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the uri property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getURI() {
-        return uri;
-    }
-
-    /**
-     * Sets the value of the uri property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setURI(String value) {
-        this.uri = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/ResponseMutableHeaderType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/ResponseMutableHeaderType.java
deleted file mode 100644
index ebd6f10..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/ResponseMutableHeaderType.java
+++ /dev/null
@@ -1,314 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for the mutable EBICS header.
- * 
- * <p>Java class for ResponseMutableHeaderType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="ResponseMutableHeaderType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="TransactionPhase" 
type="{urn:org:ebics:H004}TransactionPhaseType"/>
- *         &lt;element name="SegmentNumber" minOccurs="0">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension base="&lt;urn:org:ebics:H004>SegmentNumberType">
- *                 &lt;attribute name="lastSegment" use="required" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="OrderID" type="{urn:org:ebics:H004}OrderIDType" 
minOccurs="0"/>
- *         &lt;element name="ReturnCode" 
type="{urn:org:ebics:H004}ReturnCodeType"/>
- *         &lt;element name="ReportText" 
type="{urn:org:ebics:H004}ReportTextType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ResponseMutableHeaderType", propOrder = {
-    "transactionPhase",
-    "segmentNumber",
-    "orderID",
-    "returnCode",
-    "reportText",
-    "any"
-})
-public class ResponseMutableHeaderType {
-
-    @XmlElement(name = "TransactionPhase", required = true)
-    @XmlSchemaType(name = "token")
-    protected TransactionPhaseType transactionPhase;
-    @XmlElement(name = "SegmentNumber")
-    protected ResponseMutableHeaderType.SegmentNumber segmentNumber;
-    @XmlElement(name = "OrderID")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String orderID;
-    @XmlElement(name = "ReturnCode", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String returnCode;
-    @XmlElement(name = "ReportText", required = true)
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String reportText;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the transactionPhase property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TransactionPhaseType }
-     *     
-     */
-    public TransactionPhaseType getTransactionPhase() {
-        return transactionPhase;
-    }
-
-    /**
-     * Sets the value of the transactionPhase property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TransactionPhaseType }
-     *     
-     */
-    public void setTransactionPhase(TransactionPhaseType value) {
-        this.transactionPhase = value;
-    }
-
-    /**
-     * Gets the value of the segmentNumber property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ResponseMutableHeaderType.SegmentNumber }
-     *     
-     */
-    public ResponseMutableHeaderType.SegmentNumber getSegmentNumber() {
-        return segmentNumber;
-    }
-
-    /**
-     * Sets the value of the segmentNumber property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ResponseMutableHeaderType.SegmentNumber }
-     *     
-     */
-    public void setSegmentNumber(ResponseMutableHeaderType.SegmentNumber 
value) {
-        this.segmentNumber = value;
-    }
-
-    /**
-     * Gets the value of the orderID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderID() {
-        return orderID;
-    }
-
-    /**
-     * Sets the value of the orderID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderID(String value) {
-        this.orderID = value;
-    }
-
-    /**
-     * Gets the value of the returnCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getReturnCode() {
-        return returnCode;
-    }
-
-    /**
-     * Sets the value of the returnCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setReturnCode(String value) {
-        this.returnCode = value;
-    }
-
-    /**
-     * Gets the value of the reportText property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getReportText() {
-        return reportText;
-    }
-
-    /**
-     * Sets the value of the reportText property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setReportText(String value) {
-        this.reportText = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>SegmentNumberType">
-     *       &lt;attribute name="lastSegment" use="required" 
type="{http://www.w3.org/2001/XMLSchema}boolean"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class SegmentNumber {
-
-        @XmlValue
-        protected BigInteger value;
-        @XmlAttribute(name = "lastSegment", required = true)
-        protected boolean lastSegment;
-
-        /**
-         * Datentyp für die Segmentnummer.
-         * 
-         * @return
-         *     possible object is
-         *     {@link BigInteger }
-         *     
-         */
-        public BigInteger getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BigInteger }
-         *     
-         */
-        public void setValue(BigInteger value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the lastSegment property.
-         * 
-         */
-        public boolean isLastSegment() {
-            return lastSegment;
-        }
-
-        /**
-         * Sets the value of the lastSegment property.
-         * 
-         */
-        public void setLastSegment(boolean value) {
-            this.lastSegment = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/ResponseStaticHeaderType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/ResponseStaticHeaderType.java
deleted file mode 100644
index 3df5bf0..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/ResponseStaticHeaderType.java
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.math.BigInteger;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Data type for the static EBICS header.
- * 
- * <p>Java class for ResponseStaticHeaderType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="ResponseStaticHeaderType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="TransactionID" 
type="{urn:org:ebics:H004}TransactionIDType" minOccurs="0"/>
- *         &lt;element name="NumSegments" 
type="{urn:org:ebics:H004}SegmentNumberType" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ResponseStaticHeaderType", propOrder = {
-    "transactionID",
-    "numSegments"
-})
-public class ResponseStaticHeaderType {
-
-    @XmlElement(name = "TransactionID", type = String.class)
-    @XmlJavaTypeAdapter(HexBinaryAdapter.class)
-    @XmlSchemaType(name = "hexBinary")
-    protected byte[] transactionID;
-    @XmlElement(name = "NumSegments")
-    @XmlSchemaType(name = "positiveInteger")
-    protected BigInteger numSegments;
-
-    /**
-     * Gets the value of the transactionID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public byte[] getTransactionID() {
-        return transactionID;
-    }
-
-    /**
-     * Sets the value of the transactionID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTransactionID(byte[] value) {
-        this.transactionID = value;
-    }
-
-    /**
-     * Gets the value of the numSegments property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getNumSegments() {
-        return numSegments;
-    }
-
-    /**
-     * Sets the value of the numSegments property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setNumSegments(BigInteger value) {
-        this.numSegments = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/RetrievalMethodType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/RetrievalMethodType.java
deleted file mode 100644
index dcafb88..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/RetrievalMethodType.java
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for RetrievalMethodType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="RetrievalMethodType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms"; 
minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="URI" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *       &lt;attribute name="Type" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RetrievalMethodType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "transforms"
-})
-public class RetrievalMethodType {
-
-    @XmlElement(name = "Transforms")
-    protected TransformsType transforms;
-    @XmlAttribute(name = "URI")
-    @XmlSchemaType(name = "anyURI")
-    protected String uri;
-    @XmlAttribute(name = "Type")
-    @XmlSchemaType(name = "anyURI")
-    protected String type;
-
-    /**
-     * Gets the value of the transforms property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TransformsType }
-     *     
-     */
-    public TransformsType getTransforms() {
-        return transforms;
-    }
-
-    /**
-     * Sets the value of the transforms property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TransformsType }
-     *     
-     */
-    public void setTransforms(TransformsType value) {
-        this.transforms = value;
-    }
-
-    /**
-     * Gets the value of the uri property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getURI() {
-        return uri;
-    }
-
-    /**
-     * Sets the value of the uri property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setURI(String value) {
-        this.uri = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SPKIDataType.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SPKIDataType.java
deleted file mode 100644
index 70fcbb8..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SPKIDataType.java
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for SPKIDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SPKIDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence maxOccurs="unbounded">
- *         &lt;element name="SPKISexp" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         &lt;any processContents='lax' namespace='##other' minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SPKIDataType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "spkiSexpAndAny"
-})
-public class SPKIDataType {
-
-    @XmlElementRef(name = "SPKISexp", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class)
-    @XmlAnyElement(lax = true)
-    protected List<Object> spkiSexpAndAny;
-
-    /**
-     * Gets the value of the spkiSexpAndAny property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
spkiSexpAndAny property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSPKISexpAndAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getSPKISexpAndAny() {
-        if (spkiSexpAndAny == null) {
-            spkiSexpAndAny = new ArrayList<Object>();
-        }
-        return this.spkiSexpAndAny;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignatureCertificateInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignatureCertificateInfoType.java
deleted file mode 100644
index 5313e3e..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignatureCertificateInfoType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Data type for public authorisation (ES) key.
- * 
- * <p>Java class for SignatureCertificateInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignatureCertificateInfoType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:org:ebics:H004}CertificateInfoType">
- *       &lt;sequence>
- *         &lt;element name="SignatureVersion" 
type="{urn:org:ebics:H004}SignatureVersionType"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignatureCertificateInfoType", propOrder = {
-    "signatureVersion"
-})
-public class SignatureCertificateInfoType
-    extends CertificateInfoType
-{
-
-    @XmlElement(name = "SignatureVersion", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String signatureVersion;
-
-    /**
-     * Gets the value of the signatureVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSignatureVersion() {
-        return signatureVersion;
-    }
-
-    /**
-     * Sets the value of the signatureVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSignatureVersion(String value) {
-        this.signatureVersion = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignatureMethodType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignatureMethodType.java
deleted file mode 100644
index 985c71c..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignatureMethodType.java
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for SignatureMethodType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignatureMethodType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="HMACOutputLength" 
type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType"; minOccurs="0"/>
- *         &lt;any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Algorithm" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignatureMethodType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class SignatureMethodType {
-
-    @XmlElementRef(name = "HMACOutputLength", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false)
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Algorithm", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String algorithm;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-    /**
-     * Gets the value of the algorithm property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAlgorithm() {
-        return algorithm;
-    }
-
-    /**
-     * Sets the value of the algorithm property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAlgorithm(String value) {
-        this.algorithm = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignaturePropertiesType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignaturePropertiesType.java
deleted file mode 100644
index 4ca5d73..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignaturePropertiesType.java
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for SignaturePropertiesType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignaturePropertiesType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element 
ref="{http://www.w3.org/2000/09/xmldsig#}SignatureProperty"; 
maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignaturePropertiesType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "signatureProperty"
-})
-public class SignaturePropertiesType {
-
-    @XmlElement(name = "SignatureProperty", required = true)
-    protected List<SignaturePropertyType> signatureProperty;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the signatureProperty property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
signatureProperty property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSignatureProperty().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SignaturePropertyType }
-     * 
-     * 
-     */
-    public List<SignaturePropertyType> getSignatureProperty() {
-        if (signatureProperty == null) {
-            signatureProperty = new ArrayList<SignaturePropertyType>();
-        }
-        return this.signatureProperty;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignaturePropertyType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignaturePropertyType.java
deleted file mode 100644
index dc9cf89..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignaturePropertyType.java
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for SignaturePropertyType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignaturePropertyType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;choice maxOccurs="unbounded">
- *         &lt;any processContents='lax' namespace='##other'/>
- *       &lt;/choice>
- *       &lt;attribute name="Target" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignaturePropertyType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class SignaturePropertyType {
-
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Target", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String target;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-    /**
-     * Gets the value of the target property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTarget() {
-        return target;
-    }
-
-    /**
-     * Sets the value of the target property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTarget(String value) {
-        this.target = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignaturePubKeyInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignaturePubKeyInfoType.java
deleted file mode 100644
index 5b6a106..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignaturePubKeyInfoType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * Datentyp für öffentliche bankfachliche Schlüssel.
- * 
- * <p>Java class for SignaturePubKeyInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignaturePubKeyInfoType">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.ebics.org/S001}PubKeyInfoType";>
- *       &lt;sequence>
- *         &lt;element name="SignatureVersion" 
type="{http://www.ebics.org/S001}SignatureVersionType"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignaturePubKeyInfoType", namespace = 
"http://www.ebics.org/S001";, propOrder = {
-    "signatureVersion"
-})
-public class SignaturePubKeyInfoType
-    extends PubKeyInfoTypeAtEbicsSignatures
-{
-
-    @XmlElement(name = "SignatureVersion", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String signatureVersion;
-
-    /**
-     * Gets the value of the signatureVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSignatureVersion() {
-        return signatureVersion;
-    }
-
-    /**
-     * Sets the value of the signatureVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSignatureVersion(String value) {
-        this.signatureVersion = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignaturePubKeyOrderDataType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignaturePubKeyOrderDataType.java
deleted file mode 100644
index cf62d00..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignaturePubKeyOrderDataType.java
+++ /dev/null
@@ -1,172 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Public Key Dateien unabhängig von der Auftragsart / 
Geschäftsvorfall.
- * 
- * <p>Java class for SignaturePubKeyOrderDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignaturePubKeyOrderDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="SignaturePubKeyInfo" 
type="{http://www.ebics.org/S001}SignaturePubKeyInfoType"/>
- *         &lt;element name="PartnerID" 
type="{http://www.ebics.org/S001}PartnerIDType"/>
- *         &lt;element name="UserID" 
type="{http://www.ebics.org/S001}UserIDType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignaturePubKeyOrderDataType", namespace = 
"http://www.ebics.org/S001";, propOrder = {
-    "signaturePubKeyInfo",
-    "partnerID",
-    "userID",
-    "any"
-})
-public class SignaturePubKeyOrderDataType {
-
-    @XmlElement(name = "SignaturePubKeyInfo", required = true)
-    protected SignaturePubKeyInfoType signaturePubKeyInfo;
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the signaturePubKeyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignaturePubKeyInfoType }
-     *     
-     */
-    public SignaturePubKeyInfoType getSignaturePubKeyInfo() {
-        return signaturePubKeyInfo;
-    }
-
-    /**
-     * Sets the value of the signaturePubKeyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignaturePubKeyInfoType }
-     *     
-     */
-    public void setSignaturePubKeyInfo(SignaturePubKeyInfoType value) {
-        this.signaturePubKeyInfo = value;
-    }
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignatureType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignatureType.java
deleted file mode 100644
index c974150..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignatureType.java
+++ /dev/null
@@ -1,195 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for SignatureType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignatureType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SignedInfo"/>
- *         &lt;element 
ref="{http://www.w3.org/2000/09/xmldsig#}SignatureValue"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo"; 
minOccurs="0"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Object"; 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignatureType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "signedInfo",
-    "signatureValue",
-    "keyInfo",
-    "object"
-})
-public class SignatureType {
-
-    @XmlElement(name = "SignedInfo", required = true)
-    protected SignedInfoType signedInfo;
-    @XmlElement(name = "SignatureValue", required = true)
-    protected SignatureValueType signatureValue;
-    @XmlElement(name = "KeyInfo")
-    protected KeyInfoType keyInfo;
-    @XmlElement(name = "Object")
-    protected List<ObjectType> object;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the signedInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignedInfoType }
-     *     
-     */
-    public SignedInfoType getSignedInfo() {
-        return signedInfo;
-    }
-
-    /**
-     * Sets the value of the signedInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignedInfoType }
-     *     
-     */
-    public void setSignedInfo(SignedInfoType value) {
-        this.signedInfo = value;
-    }
-
-    /**
-     * Gets the value of the signatureValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignatureValueType }
-     *     
-     */
-    public SignatureValueType getSignatureValue() {
-        return signatureValue;
-    }
-
-    /**
-     * Sets the value of the signatureValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignatureValueType }
-     *     
-     */
-    public void setSignatureValue(SignatureValueType value) {
-        this.signatureValue = value;
-    }
-
-    /**
-     * Gets the value of the keyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link KeyInfoType }
-     *     
-     */
-    public KeyInfoType getKeyInfo() {
-        return keyInfo;
-    }
-
-    /**
-     * Sets the value of the keyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link KeyInfoType }
-     *     
-     */
-    public void setKeyInfo(KeyInfoType value) {
-        this.keyInfo = value;
-    }
-
-    /**
-     * Gets the value of the object property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the object 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getObject().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ObjectType }
-     * 
-     * 
-     */
-    public List<ObjectType> getObject() {
-        if (object == null) {
-            object = new ArrayList<ObjectType>();
-        }
-        return this.object;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignatureValueType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignatureValueType.java
deleted file mode 100644
index b598008..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignatureValueType.java
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for SignatureValueType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignatureValueType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>base64Binary">
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignatureValueType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "value"
-})
-public class SignatureValueType {
-
-    @XmlValue
-    protected byte[] value;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setValue(byte[] value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignedInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignedInfoType.java
deleted file mode 100644
index 756cde3..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignedInfoType.java
+++ /dev/null
@@ -1,167 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for SignedInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignedInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element 
ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod"/>
- *         &lt;element 
ref="{http://www.w3.org/2000/09/xmldsig#}SignatureMethod"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Reference"; 
maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignedInfoType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "canonicalizationMethod",
-    "signatureMethod",
-    "reference"
-})
-public class SignedInfoType {
-
-    @XmlElement(name = "CanonicalizationMethod", required = true)
-    protected CanonicalizationMethodType canonicalizationMethod;
-    @XmlElement(name = "SignatureMethod", required = true)
-    protected SignatureMethodType signatureMethod;
-    @XmlElement(name = "Reference", required = true)
-    protected List<ReferenceType> reference;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the canonicalizationMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CanonicalizationMethodType }
-     *     
-     */
-    public CanonicalizationMethodType getCanonicalizationMethod() {
-        return canonicalizationMethod;
-    }
-
-    /**
-     * Sets the value of the canonicalizationMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CanonicalizationMethodType }
-     *     
-     */
-    public void setCanonicalizationMethod(CanonicalizationMethodType value) {
-        this.canonicalizationMethod = value;
-    }
-
-    /**
-     * Gets the value of the signatureMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignatureMethodType }
-     *     
-     */
-    public SignatureMethodType getSignatureMethod() {
-        return signatureMethod;
-    }
-
-    /**
-     * Sets the value of the signatureMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignatureMethodType }
-     *     
-     */
-    public void setSignatureMethod(SignatureMethodType value) {
-        this.signatureMethod = value;
-    }
-
-    /**
-     * Gets the value of the reference property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the reference 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getReference().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ReferenceType }
-     * 
-     * 
-     */
-    public List<ReferenceType> getReference() {
-        if (reference == null) {
-            reference = new ArrayList<ReferenceType>();
-        }
-        return this.reference;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignerInfoType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignerInfoType.java
deleted file mode 100644
index 09f1b1a..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/SignerInfoType.java
+++ /dev/null
@@ -1,319 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für Informationen zu einem Unterzeichner eines VEU-Auftrags (HVU, 
HVD).
- * 
- * <p>Java class for SignerInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="SignerInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="PartnerID" 
type="{urn:org:ebics:H004}PartnerIDType"/>
- *         &lt;element name="UserID" type="{urn:org:ebics:H004}UserIDType"/>
- *         &lt;element name="Name" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;element name="Timestamp" 
type="{urn:org:ebics:H004}TimestampType"/>
- *         &lt;element name="Permission">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;attGroup ref="{urn:org:ebics:H004}SignerPermission"/>
- *                 &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignerInfoType", propOrder = {
-    "partnerID",
-    "userID",
-    "name",
-    "timestamp",
-    "permission",
-    "any"
-})
-public class SignerInfoType {
-
-    @XmlElement(name = "PartnerID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String partnerID;
-    @XmlElement(name = "UserID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String userID;
-    @XmlElement(name = "Name")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String name;
-    @XmlElement(name = "Timestamp", required = true)
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar timestamp;
-    @XmlElement(name = "Permission", required = true)
-    protected SignerInfoType.Permission permission;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the partnerID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerID() {
-        return partnerID;
-    }
-
-    /**
-     * Sets the value of the partnerID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerID(String value) {
-        this.partnerID = value;
-    }
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserID(String value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the timestamp property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getTimestamp() {
-        return timestamp;
-    }
-
-    /**
-     * Sets the value of the timestamp property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setTimestamp(XMLGregorianCalendar value) {
-        this.timestamp = value;
-    }
-
-    /**
-     * Gets the value of the permission property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignerInfoType.Permission }
-     *     
-     */
-    public SignerInfoType.Permission getPermission() {
-        return permission;
-    }
-
-    /**
-     * Sets the value of the permission property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignerInfoType.Permission }
-     *     
-     */
-    public void setPermission(SignerInfoType.Permission value) {
-        this.permission = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;attGroup ref="{urn:org:ebics:H004}SignerPermission"/>
-     *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Permission {
-
-        @XmlAttribute(name = "AuthorisationLevel", required = true)
-        protected AuthorisationLevelType authorisationLevel;
-        @XmlAnyAttribute
-        private Map<QName, String> otherAttributes = new HashMap<QName, 
String>();
-
-        /**
-         * Gets the value of the authorisationLevel property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link AuthorisationLevelType }
-         *     
-         */
-        public AuthorisationLevelType getAuthorisationLevel() {
-            return authorisationLevel;
-        }
-
-        /**
-         * Sets the value of the authorisationLevel property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link AuthorisationLevelType }
-         *     
-         */
-        public void setAuthorisationLevel(AuthorisationLevelType value) {
-            this.authorisationLevel = value;
-        }
-
-        /**
-         * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-         * 
-         * <p>
-         * the map is keyed by the name of the attribute and 
-         * the value is the string value of the attribute.
-         * 
-         * the map returned by this method is live, and you can add new 
attribute
-         * by updating the map directly. Because of this design, there's no 
setter.
-         * 
-         * 
-         * @return
-         *     always non-null
-         */
-        public Map<QName, String> getOtherAttributes() {
-            return otherAttributes;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/StandardOrderParamsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/StandardOrderParamsType.java
deleted file mode 100644
index afe5daf..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/StandardOrderParamsType.java
+++ /dev/null
@@ -1,169 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * Datentyp für zusätzliche Auftragsparameter bei Standard-Auftragsarten.
- * 
- * <p>Java class for StandardOrderParamsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="StandardOrderParamsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="DateRange" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction 
base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *                 &lt;sequence>
- *                   &lt;element name="Start" 
type="{urn:org:ebics:H004}DateType"/>
- *                   &lt;element name="End" 
type="{urn:org:ebics:H004}DateType"/>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "StandardOrderParamsType", propOrder = {
-    "dateRange"
-})
-public class StandardOrderParamsType {
-
-    @XmlElement(name = "DateRange")
-    protected StandardOrderParamsType.DateRange dateRange;
-
-    /**
-     * Gets the value of the dateRange property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link StandardOrderParamsType.DateRange }
-     *     
-     */
-    public StandardOrderParamsType.DateRange getDateRange() {
-        return dateRange;
-    }
-
-    /**
-     * Sets the value of the dateRange property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link StandardOrderParamsType.DateRange }
-     *     
-     */
-    public void setDateRange(StandardOrderParamsType.DateRange value) {
-        this.dateRange = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
-     *       &lt;sequence>
-     *         &lt;element name="Start" type="{urn:org:ebics:H004}DateType"/>
-     *         &lt;element name="End" type="{urn:org:ebics:H004}DateType"/>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "start",
-        "end"
-    })
-    public static class DateRange {
-
-        @XmlElement(name = "Start", required = true)
-        @XmlSchemaType(name = "date")
-        protected XMLGregorianCalendar start;
-        @XmlElement(name = "End", required = true)
-        @XmlSchemaType(name = "date")
-        protected XMLGregorianCalendar end;
-
-        /**
-         * Gets the value of the start property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public XMLGregorianCalendar getStart() {
-            return start;
-        }
-
-        /**
-         * Sets the value of the start property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public void setStart(XMLGregorianCalendar value) {
-            this.start = value;
-        }
-
-        /**
-         * Gets the value of the end property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public XMLGregorianCalendar getEnd() {
-            return end;
-        }
-
-        /**
-         * Sets the value of the end property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public void setEnd(XMLGregorianCalendar value) {
-            this.end = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/TransactionPhaseType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/TransactionPhaseType.java
deleted file mode 100644
index 6b66777..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/TransactionPhaseType.java
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for TransactionPhaseType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="TransactionPhaseType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token";>
- *     &lt;enumeration value="Initialisation"/>
- *     &lt;enumeration value="Transfer"/>
- *     &lt;enumeration value="Receipt"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "TransactionPhaseType")
-@XmlEnum
-public enum TransactionPhaseType {
-
-
-    /**
-     * Transaktionsinitialisierung
-     * 
-     */
-    @XmlEnumValue("Initialisation")
-    INITIALISATION("Initialisation"),
-
-    /**
-     * Auftragsdatentransfer
-     * 
-     */
-    @XmlEnumValue("Transfer")
-    TRANSFER("Transfer"),
-
-    /**
-     * Quittungstransfer
-     * 
-     */
-    @XmlEnumValue("Receipt")
-    RECEIPT("Receipt");
-    private final String value;
-
-    TransactionPhaseType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static TransactionPhaseType fromValue(String v) {
-        for (TransactionPhaseType c: TransactionPhaseType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/TransferReceiptRequestType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/TransferReceiptRequestType.java
deleted file mode 100644
index 8316596..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/TransferReceiptRequestType.java
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für den Transfer von Transferquittungen.
- * 
- * <p>Java class for TransferReceiptRequestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="TransferReceiptRequestType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="ReceiptCode" 
type="{urn:org:ebics:H004}ReceiptCodeType"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TransferReceiptRequestType", propOrder = {
-    "receiptCode",
-    "any"
-})
-public class TransferReceiptRequestType {
-
-    @XmlElement(name = "ReceiptCode")
-    @XmlSchemaType(name = "nonNegativeInteger")
-    protected int receiptCode;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the receiptCode property.
-     * 
-     */
-    public int getReceiptCode() {
-        return receiptCode;
-    }
-
-    /**
-     * Sets the value of the receiptCode property.
-     * 
-     */
-    public void setReceiptCode(int value) {
-        this.receiptCode = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/TransferReceiptResponseType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/TransferReceiptResponseType.java
deleted file mode 100644
index 80c9fda..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/TransferReceiptResponseType.java
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.datatype.XMLGregorianCalendar;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für den Transfer von Antwortcodes.
- * 
- * <p>Java class for TransferReceiptResponseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="TransferReceiptResponseType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="ReturnCodeReceipt" 
type="{urn:org:ebics:H004}ReturnCodeType"/>
- *         &lt;element name="TimestampBankParameter" 
type="{urn:org:ebics:H004}TimestampType" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TransferReceiptResponseType", propOrder = {
-    "returnCodeReceipt",
-    "timestampBankParameter",
-    "any"
-})
-public class TransferReceiptResponseType {
-
-    @XmlElement(name = "ReturnCodeReceipt", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String returnCodeReceipt;
-    @XmlElement(name = "TimestampBankParameter")
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar timestampBankParameter;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the returnCodeReceipt property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getReturnCodeReceipt() {
-        return returnCodeReceipt;
-    }
-
-    /**
-     * Sets the value of the returnCodeReceipt property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setReturnCodeReceipt(String value) {
-        this.returnCodeReceipt = value;
-    }
-
-    /**
-     * Gets the value of the timestampBankParameter property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getTimestampBankParameter() {
-        return timestampBankParameter;
-    }
-
-    /**
-     * Sets the value of the timestampBankParameter property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setTimestampBankParameter(XMLGregorianCalendar value) {
-        this.timestampBankParameter = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/TransferType.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/TransferType.java
deleted file mode 100644
index c4612b8..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/TransferType.java
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for TransferType.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="TransferType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token";>
- *     &lt;enumeration value="Upload"/>
- *     &lt;enumeration value="Download"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "TransferType")
-@XmlEnum
-public enum TransferType {
-
-
-    /**
-     * Auftragsdaten werden bei der Anfrage transferiert.
-     * 
-     */
-    @XmlEnumValue("Upload")
-    UPLOAD("Upload"),
-
-    /**
-     * Auftragsdaten werden bei der Antwort transferiert.
-     * 
-     */
-    @XmlEnumValue("Download")
-    DOWNLOAD("Download");
-    private final String value;
-
-    TransferType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static TransferType fromValue(String v) {
-        for (TransferType c: TransferType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/TransformType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/TransformType.java
deleted file mode 100644
index 2cc4fa5..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/TransformType.java
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for TransformType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="TransformType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;any processContents='lax' namespace='##other'/>
- *         &lt;element name="XPath" 
type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       &lt;/choice>
- *       &lt;attribute name="Algorithm" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anyURI"; />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TransformType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "content"
-})
-public class TransformType {
-
-    @XmlElementRef(name = "XPath", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false)
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Algorithm", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String algorithm;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link Element }
-     * {@link String }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
-
-    /**
-     * Gets the value of the algorithm property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAlgorithm() {
-        return algorithm;
-    }
-
-    /**
-     * Sets the value of the algorithm property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAlgorithm(String value) {
-        this.algorithm = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/TransformsType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/TransformsType.java
deleted file mode 100644
index fb0b6cf..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/TransformsType.java
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for TransformsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="TransformsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Transform"; 
maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TransformsType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "transform"
-})
-public class TransformsType {
-
-    @XmlElement(name = "Transform", required = true)
-    protected List<TransformType> transform;
-
-    /**
-     * Gets the value of the transform property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the transform 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getTransform().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link TransformType }
-     * 
-     * 
-     */
-    public List<TransformType> getTransform() {
-        if (transform == null) {
-            transform = new ArrayList<TransformType>();
-        }
-        return this.transform;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/UserInfoType.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/UserInfoType.java
deleted file mode 100644
index b8402f3..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/UserInfoType.java
+++ /dev/null
@@ -1,258 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für VEU-Teilnehmerinformationen (HKD, HTD).
- * 
- * <p>Java class for UserInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="UserInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="UserID">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension base="&lt;urn:org:ebics:H004>UserIDType">
- *                 &lt;attribute name="Status" use="required" 
type="{urn:org:ebics:H004}UserStatusType" />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="Name" type="{urn:org:ebics:H004}NameType" 
minOccurs="0"/>
- *         &lt;element name="Permission" 
type="{urn:org:ebics:H004}UserPermissionType" maxOccurs="unbounded"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "UserInfoType", propOrder = {
-    "userID",
-    "name",
-    "permission",
-    "any"
-})
-public class UserInfoType {
-
-    @XmlElement(name = "UserID", required = true)
-    protected UserInfoType.UserID userID;
-    @XmlElement(name = "Name")
-    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-    @XmlSchemaType(name = "normalizedString")
-    protected String name;
-    @XmlElement(name = "Permission", required = true)
-    protected List<UserPermissionType> permission;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the userID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link UserInfoType.UserID }
-     *     
-     */
-    public UserInfoType.UserID getUserID() {
-        return userID;
-    }
-
-    /**
-     * Sets the value of the userID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link UserInfoType.UserID }
-     *     
-     */
-    public void setUserID(UserInfoType.UserID value) {
-        this.userID = value;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the permission property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the permission 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getPermission().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link UserPermissionType }
-     * 
-     * 
-     */
-    public List<UserPermissionType> getPermission() {
-        if (permission == null) {
-            permission = new ArrayList<UserPermissionType>();
-        }
-        return this.permission;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:org:ebics:H004>UserIDType">
-     *       &lt;attribute name="Status" use="required" 
type="{urn:org:ebics:H004}UserStatusType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class UserID {
-
-        @XmlValue
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        protected String value;
-        @XmlAttribute(name = "Status", required = true)
-        protected int status;
-
-        /**
-         * Datentyp für eine Teilnehmer-ID.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the status property.
-         * 
-         */
-        public int getStatus() {
-            return status;
-        }
-
-        /**
-         * Sets the value of the status property.
-         * 
-         */
-        public void setStatus(int value) {
-            this.status = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/UserPermissionType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/UserPermissionType.java
deleted file mode 100644
index 73cad3a..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/UserPermissionType.java
+++ /dev/null
@@ -1,258 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-import org.w3c.dom.Element;
-
-
-/**
- * Datentyp für VEU-Berechtigungsinformationen des Teilnehmers (HKD, HTD).
- * 
- * <p>Java class for UserPermissionType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="UserPermissionType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="OrderTypes" 
type="{urn:org:ebics:H004}OrderTListType"/>
- *         &lt;element name="FileFormat" 
type="{urn:org:ebics:H004}FileFormatType" minOccurs="0"/>
- *         &lt;element name="AccountID" 
type="{urn:org:ebics:H004}AccountIDType" minOccurs="0"/>
- *         &lt;element name="MaxAmount" type="{urn:org:ebics:H004}AmountType" 
minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="AuthorisationLevel" 
type="{urn:org:ebics:H004}AuthorisationLevelType" />
- *       &lt;anyAttribute namespace='urn:org:ebics:H004'/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "UserPermissionType", propOrder = {
-    "orderTypes",
-    "fileFormat",
-    "accountID",
-    "maxAmount",
-    "any"
-})
-public class UserPermissionType {
-
-    @XmlList
-    @XmlElement(name = "OrderTypes", required = true)
-    protected List<String> orderTypes;
-    @XmlElement(name = "FileFormat")
-    protected FileFormatType fileFormat;
-    @XmlElement(name = "AccountID")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String accountID;
-    @XmlElement(name = "MaxAmount")
-    protected AmountType maxAmount;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-    @XmlAttribute(name = "AuthorisationLevel")
-    protected AuthorisationLevelType authorisationLevel;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-    /**
-     * Gets the value of the orderTypes property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the orderTypes 
property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderTypes().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getOrderTypes() {
-        if (orderTypes == null) {
-            orderTypes = new ArrayList<String>();
-        }
-        return this.orderTypes;
-    }
-
-    /**
-     * Gets the value of the fileFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public FileFormatType getFileFormat() {
-        return fileFormat;
-    }
-
-    /**
-     * Sets the value of the fileFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FileFormatType }
-     *     
-     */
-    public void setFileFormat(FileFormatType value) {
-        this.fileFormat = value;
-    }
-
-    /**
-     * Gets the value of the accountID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAccountID() {
-        return accountID;
-    }
-
-    /**
-     * Sets the value of the accountID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAccountID(String value) {
-        this.accountID = value;
-    }
-
-    /**
-     * Gets the value of the maxAmount property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AmountType }
-     *     
-     */
-    public AmountType getMaxAmount() {
-        return maxAmount;
-    }
-
-    /**
-     * Sets the value of the maxAmount property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AmountType }
-     *     
-     */
-    public void setMaxAmount(AmountType value) {
-        this.maxAmount = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-    /**
-     * Gets the value of the authorisationLevel property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthorisationLevelType }
-     *     
-     */
-    public AuthorisationLevelType getAuthorisationLevel() {
-        return authorisationLevel;
-    }
-
-    /**
-     * Sets the value of the authorisationLevel property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthorisationLevelType }
-     *     
-     */
-    public void setAuthorisationLevel(AuthorisationLevelType value) {
-        this.authorisationLevel = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed 
property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/UserSignatureDataSigBookType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/UserSignatureDataSigBookType.java
deleted file mode 100644
index 9767954..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/UserSignatureDataSigBookType.java
+++ /dev/null
@@ -1,211 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import org.w3c.dom.Element;
-
-
-/**
- * Data type for digital signature data transferred using EBICS.
- * 
- * <p>Java class for UserSignatureDataSigBookType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="UserSignatureDataSigBookType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;choice maxOccurs="unbounded">
- *           &lt;element name="OrderSignature">
- *             &lt;complexType>
- *               &lt;simpleContent>
- *                 &lt;extension 
base="&lt;http://www.ebics.org/S001>OrderSignatureType">
- *                   &lt;attribute name="PartnerID" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anySimpleType"; />
- *                 &lt;/extension>
- *               &lt;/simpleContent>
- *             &lt;/complexType>
- *           &lt;/element>
- *           &lt;element name="OrderSignatureData" 
type="{http://www.ebics.org/S001}OrderSignatureDataType"/>
- *         &lt;/choice>
- *         &lt;any processContents='lax' namespace='##other' 
maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "UserSignatureDataSigBookType", namespace = 
"http://www.ebics.org/S001";, propOrder = {
-    "orderSignatureOrOrderSignatureData",
-    "any"
-})
-public class UserSignatureDataSigBookType {
-
-    @XmlElements({
-        @XmlElement(name = "OrderSignature", type = 
UserSignatureDataSigBookType.OrderSignature.class),
-        @XmlElement(name = "OrderSignatureData", type = 
OrderSignatureDataType.class)
-    })
-    protected List<Object> orderSignatureOrOrderSignatureData;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the orderSignatureOrOrderSignatureData property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
orderSignatureOrOrderSignatureData property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOrderSignatureOrOrderSignatureData().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link UserSignatureDataSigBookType.OrderSignature }
-     * {@link OrderSignatureDataType }
-     * 
-     * 
-     */
-    public List<Object> getOrderSignatureOrOrderSignatureData() {
-        if (orderSignatureOrOrderSignatureData == null) {
-            orderSignatureOrOrderSignatureData = new ArrayList<Object>();
-        }
-        return this.orderSignatureOrOrderSignatureData;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content 
contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension 
base="&lt;http://www.ebics.org/S001>OrderSignatureType">
-     *       &lt;attribute name="PartnerID" use="required" 
type="{http://www.w3.org/2001/XMLSchema}anySimpleType"; />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class OrderSignature {
-
-        @XmlValue
-        protected byte[] value;
-        @XmlAttribute(name = "PartnerID", required = true)
-        @XmlSchemaType(name = "anySimpleType")
-        protected String partnerID;
-
-        /**
-         * Datentyp für kryptographische Unterschriften.
-         * 
-         * @return
-         *     possible object is
-         *     byte[]
-         */
-        public byte[] getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     byte[]
-         */
-        public void setValue(byte[] value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the partnerID property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getPartnerID() {
-            return partnerID;
-        }
-
-        /**
-         * Sets the value of the partnerID property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setPartnerID(String value) {
-            this.partnerID = value;
-        }
-
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/X509DataType.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/X509DataType.java
deleted file mode 100644
index 022da24..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/X509DataType.java
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for X509DataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="X509DataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence maxOccurs="unbounded">
- *         &lt;choice>
- *           &lt;element name="X509IssuerSerial" 
type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
- *           &lt;element name="X509SKI" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           &lt;element name="X509SubjectName" 
type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           &lt;element name="X509Certificate" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           &lt;element name="X509CRL" 
type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           &lt;any processContents='lax' namespace='##other'/>
- *         &lt;/choice>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "X509DataType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "x509IssuerSerialOrX509SKIOrX509SubjectName"
-})
-public class X509DataType {
-
-    @XmlElementRefs({
-        @XmlElementRef(name = "X509CRL", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "X509SubjectName", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "X509SKI", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "X509IssuerSerial", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false),
-        @XmlElementRef(name = "X509Certificate", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, type = JAXBElement.class, required = 
false)
-    })
-    @XmlAnyElement(lax = true)
-    protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName;
-
-    /**
-     * Gets the value of the x509IssuerSerialOrX509SKIOrX509SubjectName 
property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the 
x509IssuerSerialOrX509SKIOrX509SubjectName property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getX509IssuerSerialOrX509SKIOrX509SubjectName().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link Element }
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link Object }
-     * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * 
-     * 
-     */
-    public List<Object> getX509IssuerSerialOrX509SKIOrX509SubjectName() {
-        if (x509IssuerSerialOrX509SKIOrX509SubjectName == null) {
-            x509IssuerSerialOrX509SKIOrX509SubjectName = new 
ArrayList<Object>();
-        }
-        return this.x509IssuerSerialOrX509SKIOrX509SubjectName;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/X509IssuerSerialType.java
 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/X509IssuerSerialType.java
deleted file mode 100644
index c2def56..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/X509IssuerSerialType.java
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-
-package tech.libeufin.messages.ebics.response;
-
-import java.math.BigInteger;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for X509IssuerSerialType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained 
within this class.
- * 
- * <pre>
- * &lt;complexType name="X509IssuerSerialType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- *       &lt;sequence>
- *         &lt;element name="X509IssuerName" 
type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="X509SerialNumber" 
type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "X509IssuerSerialType", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, propOrder = {
-    "x509IssuerName",
-    "x509SerialNumber"
-})
-public class X509IssuerSerialType {
-
-    @XmlElement(name = "X509IssuerName", required = true)
-    protected String x509IssuerName;
-    @XmlElement(name = "X509SerialNumber", required = true)
-    protected BigInteger x509SerialNumber;
-
-    /**
-     * Gets the value of the x509IssuerName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getX509IssuerName() {
-        return x509IssuerName;
-    }
-
-    /**
-     * Sets the value of the x509IssuerName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setX509IssuerName(String value) {
-        this.x509IssuerName = value;
-    }
-
-    /**
-     * Gets the value of the x509SerialNumber property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getX509SerialNumber() {
-        return x509SerialNumber;
-    }
-
-    /**
-     * Sets the value of the x509SerialNumber property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setX509SerialNumber(BigInteger value) {
-        this.x509SerialNumber = value;
-    }
-
-}
diff --git 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/package-info.java 
b/sandbox/src/main/java/tech/libeufin/messages/ebics/response/package-info.java
deleted file mode 100644
index 43a270c..0000000
--- 
a/sandbox/src/main/java/tech/libeufin/messages/ebics/response/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) 
Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the 
source schema. 
-// Generated on: 2019.10.22 at 11:07:53 AM CEST 
-//
-
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:org:ebics:H004", 
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package tech.libeufin.messages.ebics.response;
diff --git a/sandbox/src/main/kotlin/DB.kt b/sandbox/src/main/kotlin/DB.kt
index bc07959..654e17b 100644
--- a/sandbox/src/main/kotlin/DB.kt
+++ b/sandbox/src/main/kotlin/DB.kt
@@ -1,4 +1,4 @@
-package tech.libeufin.sandbox
+package tech.libeufin.sandbox.db
 
 import org.jetbrains.exposed.dao.*
 import org.jetbrains.exposed.sql.*
@@ -139,7 +139,7 @@ object EbicsSystems: IntIdTable() {
 class EbicsSystem(id: EntityID<Int>) : IntEntity(id) {
     companion object : IntEntityClass<EbicsSystem>(EbicsSystems) {
         override fun new(init: EbicsSystem.() -> Unit): EbicsSystem {
-            var row = super.new(init)
+            val row = super.new(init)
             row.systemId = "s${row.id}"
             return row
         }
@@ -205,9 +205,9 @@ class EbicsSubscriber(id: EntityID<Int>) : IntEntity(id) {
 fun createSubscriber() : EbicsSubscriber {
 
     return EbicsSubscriber.new {
-        userId = EbicsUser.new {  }
+        userId = EbicsUser.new { }
         partnerId = EbicsPartner.new { }
-        systemId = EbicsSystem.new {  }
+        systemId = EbicsSystem.new { }
         state = SubscriberStates.NEW
     }
 }
diff --git a/sandbox/src/main/kotlin/EbicsResponse.kt 
b/sandbox/src/main/kotlin/EbicsResponse.kt
deleted file mode 100644
index 5e536ee..0000000
--- a/sandbox/src/main/kotlin/EbicsResponse.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package tech.libeufin.sandbox
-
-import tech.libeufin.messages.ebics.response.EbicsResponse
-import tech.libeufin.messages.ebics.response.ObjectFactory
-import javax.xml.bind.JAXBElement
-import javax.xml.namespace.QName
-
-/**
- * Convenience wrapper around the main JAXB value.
- *
- * @param returnCode return code
- * @param reportText EBICS-compliant error text token, e.g. "[EBICS_OK]" 
(mandatory brackets!)
- * @param description short description about the response, e.g. "invalid 
signature".
- */
-class EbicsResponse(
-    returnCode: String,
-    reportText: String
-) {
-
-    /**
-     * For now, the sandbox returns _only_ technical return codes,
-     * namely those that are _not_ related with business orders.  Therefore,
-     * the relevant fields to fill are 
"ebicsResponse/header/mutable/report{Text,Code}".
-     *
-     * Once business return code will be returned, then the following fields 
will
-     * also have to be filled out: "ebicsResponse/body/report{Text,Code}".
-     */
-    private val value = {
-        val of = ObjectFactory()
-        val tmp = of.createEbicsResponse()
-        tmp.header = of.createEbicsResponseHeader()
-        tmp.header.mutable = of.createResponseMutableHeaderType()
-        tmp.header.mutable.reportText = reportText
-        tmp.header.mutable.returnCode = returnCode
-        tmp
-    }()
-
-    fun get(): JAXBElement<EbicsResponse> {
-        return JAXBElement(
-            QName("urn:org:ebics:H004", "ebicsResponse"),
-            EbicsResponse::class.java,
-            value)
-    }
-}
diff --git a/sandbox/src/main/kotlin/HEVResponse.kt 
b/sandbox/src/main/kotlin/HEVResponse.kt
deleted file mode 100644
index bce4f4e..0000000
--- a/sandbox/src/main/kotlin/HEVResponse.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package tech.libeufin.sandbox
-
-import tech.libeufin.messages.ebics.hev.HEVResponseDataType
-import tech.libeufin.messages.ebics.hev.ObjectFactory
-import javax.xml.bind.JAXBElement
-
-/**
- * Convenience wrapper around the main JAXB value.
- */
-class HEVResponse(
-    returnCode: String,
-    reportText: String,
-    protocolAndVersion: Array<ProtocolAndVersion>?) {
-
-    constructor(
-        returnCode: String,
-        reportText: String
-    ) : this(returnCode, reportText, null)
-
-    private val value = {
-        val of = ObjectFactory()
-        val tmp = of.createHEVResponseDataType()
-        tmp.systemReturnCode = of.createSystemReturnCodeType()
-        tmp.systemReturnCode.reportText = reportText
-        tmp.systemReturnCode.returnCode = returnCode
-
-        protocolAndVersion?.forEach {
-            val entry = of.createHEVResponseDataTypeVersionNumber()
-            entry.protocolVersion = it.protocol
-            entry.value = it.version
-            tmp.versionNumber.add(entry)
-        }
-        of.createEbicsHEVResponse(tmp)
-    }()
-    
-    fun get(): JAXBElement<HEVResponseDataType> {
-        return value
-    }
-}
diff --git a/sandbox/src/main/kotlin/KeyManagementResponse.kt 
b/sandbox/src/main/kotlin/KeyManagementResponse.kt
deleted file mode 100644
index 7925523..0000000
--- a/sandbox/src/main/kotlin/KeyManagementResponse.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package tech.libeufin.sandbox
-
-import tech.libeufin.messages.ebics.keyresponse.EbicsKeyManagementResponse
-import tech.libeufin.messages.ebics.keyresponse.ObjectFactory
-import javax.xml.bind.JAXBElement
-import javax.xml.namespace.QName
-
-class KeyManagementResponse(
-    version: String = "H004",
-    revision: Int = 1,
-    returnCode: String,
-    orderId: String = "<automatically generated by the bank>",
-    reportText: String
-) {
-
-    private val value = {
-        val of = ObjectFactory()
-        val tmp = of.createEbicsKeyManagementResponse()
-        tmp.version = version
-        tmp.revision = revision
-        tmp.header = of.createEbicsKeyManagementResponseHeader()
-        tmp.header.mutable = of.createKeyMgmntResponseMutableHeaderType()
-        tmp.header.mutable.orderID = orderId
-        tmp.header.mutable.reportText = reportText
-        tmp.body = of.createEbicsKeyManagementResponseBody()
-        tmp.body.returnCode = 
of.createEbicsKeyManagementResponseBodyReturnCode()
-        tmp.body.returnCode.value = returnCode
-        tmp.body.returnCode.isAuthenticate = true
-        tmp
-    }()
-
-    fun get(): JAXBElement<EbicsKeyManagementResponse> {
-        return JAXBElement(
-            QName(
-                "urn:org:ebics:H004",
-                "EbicsKeyManagementResponse"
-            ),
-            EbicsKeyManagementResponse::class.java,
-            value
-        )
-    }
-}
\ No newline at end of file
diff --git a/sandbox/src/main/kotlin/Main.kt b/sandbox/src/main/kotlin/Main.kt
index 9e64892..b970a60 100644
--- a/sandbox/src/main/kotlin/Main.kt
+++ b/sandbox/src/main/kotlin/Main.kt
@@ -36,131 +36,33 @@ import io.ktor.routing.post
 import io.ktor.routing.routing
 import io.ktor.server.engine.embeddedServer
 import io.ktor.server.netty.Netty
-import io.ktor.util.pipeline.PipelineContext
 import org.jetbrains.exposed.dao.EntityID
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.slf4j.LoggerFactory
 import org.w3c.dom.Document
-import org.w3c.dom.Element
-import tech.libeufin.messages.ebics.keyrequest.EbicsUnsecuredRequest
-import tech.libeufin.messages.ebics.keyrequest.HIARequestOrderDataType
-import tech.libeufin.messages.ebics.keyrequest.SignaturePubKeyOrderDataType
+import tech.libeufin.sandbox.db.*
+import tech.libeufin.schema.ebics_h004.*
+import tech.libeufin.schema.ebics_hev.HEVResponse
+import tech.libeufin.schema.ebics_hev.SystemReturnCodeType
+import tech.libeufin.schema.ebics_s001.SignaturePubKeyOrderData
 import java.math.BigInteger
 import java.nio.charset.StandardCharsets.US_ASCII
-import java.text.DateFormat
+import java.nio.charset.StandardCharsets.UTF_8
 import java.security.KeyFactory
 import java.security.PrivateKey
 import java.security.PublicKey
 import java.security.spec.RSAPrivateKeySpec
 import java.security.spec.RSAPublicKeySpec
+import java.text.DateFormat
 import java.util.*
 import java.util.zip.InflaterInputStream
 
 val logger = LoggerFactory.getLogger("tech.libeufin.sandbox")
 val xmlProcess = XMLUtil()
-val getEbicsHostId = {"LIBEUFIN-SANDBOX"}
-val getEbicsVersion = {"H004"}
-val getEbicsRevision = {1}
-
-object UserUnknownHelper {
-
-    fun getCode(): String {
-        return "091003"
-    }
-
-    /**
-     * @param description: will be concatenated to the error token word.
-     * @return full error string: token + description
-     */
-    fun getMessage(description: String = ""): String {
-        return "[EBICS_UNKNOWN_USER] $description"
-    }
-}
-
-
-object InvalidHostIdHelper {
-
-    fun getCode(): String {
-        return "091011"
-    }
-
-    /**
-     * @param description: will be concatenated to the error token word.
-     * @return full error string: token + description
-     */
-    fun getMessage(description: String = ""): String {
-        return "[EBICS_INVALID_HOST_ID] $description"
-    }
-}
-
-object InvalidXmlHelper {
-
-    fun getCode(): String {
-        return "091010"
-    }
-
-    /**
-     * @param description: will be concatenated to the error token word.
-     * @return full error string: token + description
-     */
-    fun getMessage(description: String = ""): String {
-        return "[EBICS_INVALID_XML] $description"
-    }
-}
-
-object InternalErrorHelper {
-
-    fun getCode(): String {
-        return "061099"
-    }
-
-    fun getMessage(description: String = ""): String {
-        return "[EBICS_INTERNAL_ERROR] $description"
-    }
-}
-
-object OkHelper {
-
-    fun getCode(): String {
-        return "000000"
-    }
+val getEbicsHostId = { "LIBEUFIN-SANDBOX" }
+val getEbicsVersion = { "H004" }
+val getEbicsRevision = { 1 }
 
-    fun getMessage(description: String = ""): String {
-        return "[EBICS_OK] $description"
-    }
-}
-
-/**
- * Sometimes, JAXB is not able to figure out to which type
- * a certain XML node should be bound to.  This happens when
- * one element name can have multiple definitions therefore
- * JAXB renders it as a abstract class.  In that case, the
- * object factory must be instructed about the subtype to create,
- * and this is done via injecting the xsi:type attribute to the
- * "overloaded" XML element.
- *
- * Alternative methods of addressing this?
- *
- * @param document the XML Document to modify
- * @param node the name of the overloaded element (ideally this
- * parameter should be a XPATH address)
- * @param type the type to downcast @a node to
- * @return the modified document
- */
-fun downcastXml(document: Document, node: String, type: String) : Document {
-    logger.debug("Downcasting: ${XMLUtil.convertDomToString(document)}")
-    val x: Element = document.getElementsByTagNameNS(
-        "urn:org:ebics:H004",
-        "OrderDetails"
-    )?.item(0) as Element
-
-    x.setAttributeNS(
-        "http://www.w3.org/2001/XMLSchema-instance";,
-        "type",
-        type
-    )
-    return document
-}
 
 /**
  * Instantiate a new RSA public key.
@@ -169,7 +71,7 @@ fun downcastXml(document: Document, node: String, type: 
String) : Document {
  * @param modulus
  * @return key
  */
-fun loadRsaPublicKey (modulus: ByteArray, exponent: ByteArray) : PublicKey {
+fun loadRsaPublicKey(modulus: ByteArray, exponent: ByteArray): PublicKey {
 
     val modulusBigInt = BigInteger(1, modulus)
     val exponentBigInt = BigInteger(1, exponent)
@@ -196,7 +98,8 @@ fun getOrMakePrivateKey(): PrivateKey {
     // must generate one now
     if (tmp == null) {
 
-        val privateExponent = BigInteger(PRIVATE_KEY_EXPONENT_LENGTH, 
Random()) // shall be set to some well-known value?
+        val privateExponent =
+            BigInteger(PRIVATE_KEY_EXPONENT_LENGTH, Random()) // shall be set 
to some well-known value?
         val privateModulus = BigInteger(PRIVATE_KEY_MODULUS_LENGTH, Random())
 
         tmp = transaction {
@@ -331,7 +234,7 @@ private suspend fun 
ApplicationCall.adminCustomersKeyletter() {
     var modulusFromLetter = body.ini.public_modulus.toBigInteger(16)
     var exponentFromLetter = body.ini.public_modulus.toBigInteger(16)
 
-    if (! ((modulusFromDd == modulusFromLetter) && (exponentFromDb == 
exponentFromLetter))) {
+    if (!((modulusFromDd == modulusFromLetter) && (exponentFromDb == 
exponentFromLetter))) {
         logger.info("Signature key mismatches for ${ebicsUserID.userId}")
         respond(
             HttpStatusCode.NotAcceptable,
@@ -349,7 +252,7 @@ private suspend fun 
ApplicationCall.adminCustomersKeyletter() {
     modulusFromLetter = body.hia.ia_public_modulus.toBigInteger(16)
     exponentFromLetter = body.hia.ia_public_exponent.toBigInteger(16)
 
-    if (! ((modulusFromDd == modulusFromLetter) && (exponentFromDb == 
exponentFromLetter))) {
+    if (!((modulusFromDd == modulusFromLetter) && (exponentFromDb == 
exponentFromLetter))) {
         logger.info("Identification and authorization key mismatches for 
${ebicsUserID.userId}")
         respond(
             HttpStatusCode.NotAcceptable,
@@ -367,7 +270,7 @@ private suspend fun 
ApplicationCall.adminCustomersKeyletter() {
     modulusFromLetter = body.hia.enc_public_modulus.toBigInteger(16)
     exponentFromLetter = body.hia.enc_public_exponent.toBigInteger(16)
 
-    if (! ((modulusFromDd == modulusFromLetter) && (exponentFromDb == 
exponentFromLetter))) {
+    if (!((modulusFromDd == modulusFromLetter) && (exponentFromDb == 
exponentFromLetter))) {
         logger.info("Encryption key mismatches for ${ebicsUserID.userId}")
         respond(
             HttpStatusCode.NotAcceptable,
@@ -389,6 +292,27 @@ private suspend fun 
ApplicationCall.adminCustomersKeyletter() {
     )
 }
 
+private suspend fun ApplicationCall.respondEbicsKeyManagement(
+    errorText: String,
+    errorCode: String,
+    statusCode: HttpStatusCode
+) {
+    val responseXml = EbicsResponse().apply {
+        header = EbicsResponse.Header().apply {
+            mutable = ResponseMutableHeaderType().apply {
+                reportText = errorText
+                returnCode = errorCode
+            }
+        }
+    }
+    val text = XMLUtil.convertJaxbToString(responseXml)
+    respondText(text, ContentType.Application.Xml, statusCode)
+}
+
+private suspend fun ApplicationCall.respondEbicsInvalidXml() {
+    respondEbicsKeyManagement("[EBICS_INVALID_XML]", "091010", 
HttpStatusCode.BadRequest)
+}
+
 private suspend fun ApplicationCall.ebicsweb() {
 
     val body: String = receiveText()
@@ -397,15 +321,7 @@ private suspend fun ApplicationCall.ebicsweb() {
     val bodyDocument: Document? = XMLUtil.parseStringIntoDom(body)
 
     if (bodyDocument == null || (!xmlProcess.validateFromDom(bodyDocument))) {
-        val response = EbicsResponse(
-            returnCode = InvalidXmlHelper.getCode(),
-            reportText = InvalidXmlHelper.getMessage()
-        )
-
-        respondText(
-            contentType = ContentType.Application.Xml,
-            status = HttpStatusCode.BadRequest
-        ) { xmlProcess.convertJaxbToString(response.get())!! }
+        respondEbicsInvalidXml()
         return
     }
 
@@ -414,43 +330,22 @@ private suspend fun ApplicationCall.ebicsweb() {
     when (bodyDocument.documentElement.localName) {
         "ebicsUnsecuredRequest" -> {
 
-            val bodyJaxb = xmlProcess.convertDomToJaxb(
+            val bodyJaxb = XMLUtil.convertDomToJaxb(
                 EbicsUnsecuredRequest::class.java,
-                downcastXml(
-                    bodyDocument,
-                    "OrderDetails",
-                    "UnsecuredReqOrderDetailsType"
-                )
+                bodyDocument
             )
 
             if (bodyJaxb.value.header.static.hostID != getEbicsHostId()) {
-
-                // return INI response!
-                val response = KeyManagementResponse(
-                    returnCode = InvalidHostIdHelper.getCode(),
-                    reportText = InvalidHostIdHelper.getMessage( ))
-
-                respondText(
-                    contentType = ContentType.Application.Xml,
-                    status = HttpStatusCode.NotFound
-                ) { xmlProcess.convertJaxbToString(response.get())!! }
+                respondEbicsKeyManagement("[EBICS_INVALID_HOST_ID]", "091011", 
HttpStatusCode.NotFound)
                 return
             }
+
             val ebicsUserID = transaction {
                 EbicsUser.find { EbicsUsers.userId eq 
bodyJaxb.value.header.static.userID }.firstOrNull()
             }
-            if (ebicsUserID == null) {
-
-                val response = KeyManagementResponse(
-                    returnCode = UserUnknownHelper.getCode(),
-                    reportText = UserUnknownHelper.getMessage()
-                )
-
-                respondText(
-                    contentType = ContentType.Application.Xml,
-                    status = HttpStatusCode.NotFound
-                ) { xmlProcess.convertJaxbToString(response.get())!! }
 
+            if (ebicsUserID == null) {
+                respondEbicsKeyManagement("[EBICS_UNKNOWN_USER]", "091003", 
HttpStatusCode.NotFound)
                 return
             }
 
@@ -461,23 +356,12 @@ private suspend fun ApplicationCall.ebicsweb() {
             }
 
             if (ebicsSubscriber == null) {
-
-                val response = KeyManagementResponse(
-                    returnCode = InternalErrorHelper.getCode(),
-                    reportText = InternalErrorHelper.getMessage()
-                )
-
-                respondText(
-                    status = HttpStatusCode.InternalServerError,
-                    contentType = ContentType.Application.Xml
-                ) { InternalErrorHelper.getMessage() }
-
+                respondEbicsKeyManagement("[EBICS_INTERNAL_ERROR]", "061099", 
HttpStatusCode.InternalServerError)
                 return
             }
 
             logger.info("Serving a 
${bodyJaxb.value.header.static.orderDetails.orderType} request")
 
-
             /**
              * NOTE: the JAXB interface has some automagic mechanism that 
decodes
              * the Base64 string into its byte[] form _at the same time_ it 
instantiates
@@ -492,16 +376,7 @@ private suspend fun ApplicationCall.ebicsweb() {
              */
             if (zkey.isEmpty()) {
                 logger.info("0-length key element given, invalid request")
-                val response = KeyManagementResponse(
-                    returnCode = InvalidXmlHelper.getCode(),
-                    reportText = InvalidXmlHelper.getMessage("Key field was 
empty")
-                )
-
-                respondText(
-                    contentType = ContentType.Text.Plain,
-                    status = HttpStatusCode.BadRequest
-                ) { xmlProcess.convertJaxbToString(response.get())!! }
-
+                respondEbicsInvalidXml()
                 return
             }
 
@@ -512,18 +387,10 @@ private suspend fun ApplicationCall.ebicsweb() {
             val inflater = InflaterInputStream(zkey.inputStream())
 
             var payload = try {
-                ByteArray(1) {inflater.read().toByte()}
+                ByteArray(1) { inflater.read().toByte() }
             } catch (e: Exception) {
                 e.printStackTrace()
-                val response = KeyManagementResponse(
-                    returnCode = InvalidXmlHelper.getCode(),
-                    reportText = InvalidXmlHelper.getMessage("Badly compressed 
key")
-                )
-                respondText(
-                    contentType = ContentType.Application.Xml,
-                    status = HttpStatusCode.BadRequest
-                ) { xmlProcess.convertJaxbToString(response.get())!! }
-
+                respondEbicsInvalidXml()
                 return
             }
 
@@ -538,11 +405,7 @@ private suspend fun ApplicationCall.ebicsweb() {
             when (bodyJaxb.value.header.static.orderDetails.orderType) {
 
                 "INI" -> {
-
-                    val keyObject = xmlProcess.convertStringToJaxb(
-                        SignaturePubKeyOrderDataType::class.java,
-                        payload.toString(US_ASCII)
-                    )
+                    val keyObject = 
XMLUtil.convertStringToJaxb<SignaturePubKeyOrderData>(payload.toString(UTF_8))
 
                     try {
                         loadRsaPublicKey(
@@ -552,16 +415,7 @@ private suspend fun ApplicationCall.ebicsweb() {
                     } catch (e: Exception) {
                         logger.info("User gave bad key, not storing it")
                         e.printStackTrace()
-                        val response = KeyManagementResponse(
-                            returnCode = InvalidXmlHelper.getCode(),
-                            reportText = InvalidXmlHelper.getMessage("Invalid 
key given")
-                        )
-
-                        respondText(
-                            contentType = ContentType.Application.Xml,
-                            status = HttpStatusCode.BadRequest
-                        ) { xmlProcess.convertJaxbToString(response.get())!! }
-
+                        respondEbicsInvalidXml()
                         return
                     }
 
@@ -586,11 +440,7 @@ private suspend fun ApplicationCall.ebicsweb() {
                 }
 
                 "HIA" -> {
-
-                    val keyObject = xmlProcess.convertStringToJaxb(
-                        HIARequestOrderDataType::class.java,
-                        payload.toString(US_ASCII)
-                    )
+                    val keyObject = 
XMLUtil.convertStringToJaxb<HIARequestOrderDataType>(payload.toString(US_ASCII))
 
                     try {
                         loadRsaPublicKey(
@@ -604,16 +454,7 @@ private suspend fun ApplicationCall.ebicsweb() {
                     } catch (e: Exception) {
                         logger.info("User gave at least one invalid HIA key")
                         e.printStackTrace()
-                        val response = KeyManagementResponse(
-                            returnCode = InvalidXmlHelper.getCode(),
-                            reportText = InvalidXmlHelper.getMessage("Bad keys 
given")
-                        )
-
-                        respondText(
-                            contentType = ContentType.Application.Xml,
-                            status = HttpStatusCode.BadRequest
-                        ) { xmlProcess.convertJaxbToString(response.get())!! }
-
+                        respondEbicsInvalidXml()
                         return
                     }
 
@@ -636,33 +477,21 @@ private suspend fun ApplicationCall.ebicsweb() {
                 }
             }
 
-            val response = KeyManagementResponse(
-                returnCode = OkHelper.getCode(),
-                reportText = OkHelper.getMessage()
-            )
-
-            respondText(
-                contentType = ContentType.Application.Xml,
-                status = HttpStatusCode.OK
-            ) { xmlProcess.convertJaxbToString(response.get())!! }
-
+            respondEbicsKeyManagement("[EBICS_OK]", "000000", 
HttpStatusCode.OK)
             return
         }
 
         "ebicsHEVRequest" -> {
-            val hevResponse = HEVResponse(
-                "000000",
-                "EBICS_OK",
-                arrayOf(
-                    ProtocolAndVersion("H003", "02.40"),
-                    ProtocolAndVersion("H004", "02.50")
-                )
-            )
+            val hevResponse = HEVResponse().apply {
+                this.systemReturnCode = SystemReturnCodeType().apply {
+                    this.reportText = "[EBICS_OK]"
+                    this.returnCode = "000000"
+                }
+                this.versionNumber = 
listOf(HEVResponse.VersionNumber.create("H004", "02.50"))
+            }
 
-            respondText(
-                contentType = ContentType.Application.Xml,
-                status = HttpStatusCode.OK
-            ) { xmlProcess.convertJaxbToString(hevResponse.get())!! }
+            val strResp = XMLUtil.convertJaxbToString(hevResponse)
+            respondText(strResp, ContentType.Application.Xml, 
HttpStatusCode.OK)
             return
         }
         else -> {
@@ -702,7 +531,6 @@ fun main() {
             }
 
             get("/admin/customers/{id}") {
-
                 call.adminCustomersInfo()
                 return@get
             }
@@ -710,7 +538,6 @@ fun main() {
             post("/admin/customers/{id}/ebics/keyletter") {
                 call.adminCustomersKeyletter()
                 return@post
-
             }
 
             post("/ebicsweb") {
@@ -722,3 +549,4 @@ fun main() {
     logger.info("Up and running")
     server.start(wait = true)
 }
+
diff --git a/sandbox/src/main/kotlin/XMLUtil.kt 
b/sandbox/src/main/kotlin/XMLUtil.kt
index 5f16bf9..299df9b 100644
--- a/sandbox/src/main/kotlin/XMLUtil.kt
+++ b/sandbox/src/main/kotlin/XMLUtil.kt
@@ -36,7 +36,6 @@ import java.util.*
 import javax.xml.XMLConstants
 import javax.xml.bind.JAXBContext
 import javax.xml.bind.JAXBElement
-import javax.xml.bind.JAXBException
 import javax.xml.bind.Marshaller
 import javax.xml.crypto.*
 import javax.xml.crypto.dom.DOMURIReference
@@ -46,7 +45,6 @@ import javax.xml.crypto.dsig.dom.DOMValidateContext
 import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec
 import javax.xml.crypto.dsig.spec.TransformParameterSpec
 import javax.xml.parsers.DocumentBuilderFactory
-import javax.xml.parsers.ParserConfigurationException
 import javax.xml.transform.OutputKeys
 import javax.xml.transform.Source
 import javax.xml.transform.TransformerFactory
@@ -178,98 +176,31 @@ class XMLUtil {
         return this.validate(xmlSource)
     }
 
-    /**
-     * Convert a DOM document - of a XML document - to the JAXB representation.
-     *
-     * @param finalType class type of the output
-     * @param document the document to convert into JAXB.
-     * @return the JAXB object reflecting the original XML document.
-     */
-    fun <T> convertDomToJaxb(finalType: Class<T>, document: Document): 
JAXBElement<T> {
-
-        val jc = JAXBContext.newInstance(finalType)
-
-        /* Marshalling the object into the document.  */
-        val m = jc.createUnmarshaller()
-        return m.unmarshal(document, finalType) // document "went" into Jaxb
-    }
-
-    /**
-     * Convert a XML string to the JAXB representation.
-     *
-     * @param finalType class type of the object to instantiate
-     * @param documentString the string to convert into JAXB.
-     * @return the JAXB object reflecting the original XML document.
-     */
-    fun <T> convertStringToJaxb(finalType: Class<T>, documentString: String): 
JAXBElement<T> {
-
-        val jc = JAXBContext.newInstance(finalType.packageName)
-
-        /* Marshalling the object into the document.  */
-        val u = jc.createUnmarshaller()
-        return u.unmarshal(
-            StreamSource(StringReader(documentString)),
-            finalType
-        ) // document "went" into Jaxb
-    }
-
-
-    /**
-     * Return the DOM representation of the Java object, using the JAXB
-     * interface.  FIXME: narrow input type to JAXB type!
-     *
-     * @param object to be transformed into DOM.  Typically, the object
-     *               has already got its setters called.
-     * @return the DOM Document, or null (if errors occur).
-     */
-    fun <T> convertJaxbToDom(obj: JAXBElement<T>): Document? {
-
-        try {
-            val jc = JAXBContext.newInstance(obj.declaredType)
-
-            /* Make the target document.  */
-            val dbf = DocumentBuilderFactory.newInstance()
-            val db = dbf.newDocumentBuilder()
-            val document = db.newDocument()
-
-            /* Marshalling the object into the document.  */
-            val m = jc.createMarshaller()
-            m.marshal(obj, document) // document absorbed the XML!
-            return document
-
-        } catch (e: JAXBException) {
-            e.printStackTrace()
-        } catch (e: ParserConfigurationException) {
-            e.printStackTrace()
-        }
-        return null
-    }
-
-    /**
-     * Extract String from JAXB.
-     *
-     * @param obj the JAXB instance
-     * @return String representation of @a object, or null if errors occur
-     */
-    fun <T> convertJaxbToString(obj: JAXBElement<T>): String? {
-        val sw = StringWriter()
-
-        try {
-            val jc = JAXBContext.newInstance(obj.declaredType)
-            /* Getting the string.  */
+    companion object {
+        inline fun <reified T> convertJaxbToString(obj: T): String {
+            val sw = StringWriter()
+            val jc = JAXBContext.newInstance(T::class.java)
             val m = jc.createMarshaller()
-            m.marshal(obj, sw)
             m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true)
-
-        } catch (e: JAXBException) {
-            e.printStackTrace()
-            return "Bank fatal error."
+            m.marshal(obj, sw)
+            return sw.toString()
         }
 
-        return sw.toString()
-    }
+        /**
+         * Convert a XML string to the JAXB representation.
+         *
+         * @param documentString the string to convert into JAXB.
+         * @return the JAXB object reflecting the original XML document.
+         */
+        inline fun <reified T> convertStringToJaxb(documentString: String): 
JAXBElement<T> {
+            val jc = JAXBContext.newInstance(T::class.java)
+            val u = jc.createUnmarshaller()
+            return u.unmarshal(            /* Marshalling the object into the 
document.  */
+                StreamSource(StringReader(documentString)),
+                T::class.java
+            )
+        }
 
-    companion object {
         /**
          * Extract String from DOM.
          *
@@ -306,6 +237,22 @@ class XMLUtil {
             return sw.toString()
         }
 
+        /**
+         * Convert a DOM document - of a XML document - to the JAXB 
representation.
+         *
+         * @param finalType class type of the output
+         * @param document the document to convert into JAXB.
+         * @return the JAXB object reflecting the original XML document.
+         */
+        fun <T> convertDomToJaxb(finalType: Class<T>, document: Document): 
JAXBElement<T> {
+
+            val jc = JAXBContext.newInstance(finalType)
+
+            /* Marshalling the object into the document.  */
+            val m = jc.createUnmarshaller()
+            return m.unmarshal(document, finalType) // document "went" into 
Jaxb
+        }
+
         /**
          * Parse string into XML DOM.
          * @param xmlString the string to parse.
@@ -341,7 +288,7 @@ class XMLUtil {
                 )
             val canon: CanonicalizationMethod =
                 
fac.newCanonicalizationMethod(CanonicalizationMethod.INCLUSIVE, null as 
C14NMethodParameterSpec?)
-            val signatureMethod = 
fac.newSignatureMethod(SignatureMethod.RSA_SHA256, null)
+            val signatureMethod = 
fac.newSignatureMethod("http://www.w3.org/2001/04/xmldsig-more#rsa-sha256";, 
null)
             val si: SignedInfo = fac.newSignedInfo(canon, signatureMethod, 
listOf(ref))
             val sig: XMLSignature = fac.newXMLSignature(si, null)
             val dsc = DOMSignContext(signingPriv, authSigNode)
diff --git 
a/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_h004/EbicsMessages.kt 
b/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_h004/EbicsMessages.kt
new file mode 100644
index 0000000..986e7de
--- /dev/null
+++ b/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_h004/EbicsMessages.kt
@@ -0,0 +1,454 @@
+/*
+ * This file is part of LibEuFin.
+ * Copyright (C) 2019 Stanisci and Dold.
+
+ * LibEuFin is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation; either version 3, or
+ * (at your option) any later version.
+
+ * LibEuFin is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General
+ * Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public
+ * License along with LibEuFin; see the file COPYING.  If not, see
+ * <http://www.gnu.org/licenses/>
+ */
+
+package tech.libeufin.schema.ebics_h004
+
+import org.apache.xml.security.binding.xmldsig.RSAKeyValueType
+import org.apache.xml.security.binding.xmldsig.SignatureType
+import org.w3c.dom.Element
+import java.math.BigInteger
+import java.util.*
+import javax.xml.bind.annotation.*
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter
+import javax.xml.bind.annotation.adapters.HexBinaryAdapter
+import javax.xml.bind.annotation.adapters.NormalizedStringAdapter
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter
+import javax.xml.datatype.XMLGregorianCalendar
+import javax.xml.namespace.QName
+
+@XmlAccessorType(XmlAccessType.NONE)
+@XmlType(name = "Product", propOrder = ["value"])
+class Product {
+    @get:XmlValue
+    @get:XmlJavaTypeAdapter(NormalizedStringAdapter::class)
+    lateinit var value: String
+
+    @get:XmlAttribute(name = "Language", required = true)
+    @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+    lateinit var language: String
+
+    @get:XmlAttribute(name = "InstituteID")
+    @get:XmlJavaTypeAdapter(NormalizedStringAdapter::class)
+    var instituteID: String? = null
+}
+
+
+/**
+ * Order details for the static EBICS header.
+ */
+@XmlAccessorType(XmlAccessType.NONE)
+@XmlType(name = "OrderDetailsType", propOrder = ["orderType", 
"orderAttribute"])
+class OrderDetails {
+    @get:XmlElement(name = "OrderType", required = true)
+    @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+    lateinit var orderType: String
+
+    @get:XmlElement(name = "OrderAttribute", required = true)
+    @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+    lateinit var orderAttribute: String
+}
+
+
+@XmlAccessorType(XmlAccessType.NONE)
+@XmlType(
+    name = "StaticHeader",
+    propOrder = ["hostID", "nonce", "timestamp", "partnerID", "userID", 
"systemID", "product", "orderDetails", "securityMedium"]
+)
+class StaticHeader {
+    @get:XmlElement(name = "HostID", required = true)
+    @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+    lateinit var hostID: String
+
+    @get:XmlElement(name = "Nonce", type = String::class)
+    @get:XmlJavaTypeAdapter(HexBinaryAdapter::class)
+    @get:XmlSchemaType(name = "hexBinary")
+    var nonce: ByteArray? = null
+
+    @get:XmlElement(name = "Timestamp")
+    @get:XmlSchemaType(name = "dateTime")
+    var timestamp: XMLGregorianCalendar? = null
+
+    @get:XmlElement(name = "PartnerID", required = true)
+    @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+    lateinit var partnerID: String
+
+    @get:XmlElement(name = "UserID", required = true)
+    @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+    lateinit var userID: String
+
+    @get:XmlElement(name = "SystemID")
+    @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+    var systemID: String? = null
+
+    @get:XmlElement(name = "Product")
+    val product: Product? = null
+
+    @get:XmlElement(name = "OrderDetails", required = true)
+    lateinit var orderDetails: OrderDetails
+
+    @get:XmlElement(name = "SecurityMedium", required = true)
+    lateinit var securityMedium: String
+}
+
+
+@XmlAccessorType(XmlAccessType.NONE)
+@XmlType(name = "", propOrder = ["header", "body"])
+@XmlRootElement(name = "ebicsUnsecuredRequest")
+class EbicsUnsecuredRequest {
+    @XmlAccessorType(XmlAccessType.NONE)
+    @XmlType(name = "", propOrder = ["static", "mutable"])
+    class Header {
+        @XmlAccessorType(XmlAccessType.NONE)
+        @XmlType(name = "")
+        class EmptyMutableHeader
+
+        @get:XmlElement(name = "static", required = true)
+        lateinit var static: StaticHeader
+
+        @get:XmlElement(required = true)
+        lateinit var mutable: EmptyMutableHeader
+
+        @get:XmlAttribute(name = "authenticate", required = true)
+        var authenticate: Boolean = false
+    }
+
+    @XmlAccessorType(XmlAccessType.NONE)
+    @XmlType(name = "", propOrder = ["dataTransfer"])
+    class Body {
+        @get:XmlElement(name = "DataTransfer", required = true)
+        lateinit var dataTransfer: DataTransfer
+
+        @XmlAccessorType(XmlAccessType.NONE)
+        @XmlType(name = "", propOrder = ["orderData"])
+        class DataTransfer {
+            @get:XmlElement(name = "OrderData", required = true)
+            lateinit var orderData: OrderData
+
+            @XmlAccessorType(XmlAccessType.NONE)
+            @XmlType(name = "")
+            class OrderData {
+                @get:XmlValue
+                lateinit var value: ByteArray
+
+                @get:XmlAnyAttribute
+                val otherAttributes = HashMap<QName, String>()
+            }
+        }
+    }
+
+    @get:XmlAttribute(name = "Version", required = true)
+    @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+    lateinit var version: String
+
+    @get:XmlAttribute(name = "Revision")
+    var revision: Int? = null
+
+    @get:XmlElement(name = "header", required = true)
+    lateinit var header: Header
+
+    @get:XmlElement(required = true)
+    lateinit var body: Body
+}
+
+
+@XmlAccessorType(XmlAccessType.NONE)
+@XmlType(name = "DataTransferResponseType", propOrder = ["dataEncryptionInfo", 
"orderData", "any"])
+class DataTransferResponse {
+    @get:XmlElement(name = "DataEncryptionInfo")
+    var dataEncryptionInfo: DataEncryptionInfo? = null
+
+    @get:XmlElement(name = "OrderData", required = true)
+    lateinit var orderData: OrderData
+
+    @get:XmlAnyElement(lax = true)
+    var any: List<Any>? = null
+
+    @XmlAccessorType(XmlAccessType.NONE)
+    class OrderData {
+        @get:XmlValue
+        lateinit var value: ByteArray
+
+        @get:XmlAnyAttribute
+        var otherAttributes = HashMap<QName, String>()
+    }
+
+    @XmlAccessorType(XmlAccessType.NONE)
+    class DataEncryptionInfo {
+        @get:XmlAttribute(name = "authenticate", required = true)
+        var authenticate: Boolean = false
+
+        @get:XmlElement(name = "EncryptionPubKeyDigest", required = true)
+        lateinit var encryptionPubKeyDigest: EncryptionPubKeyDigest
+
+        @get:XmlElement(name = "TransactionKey", required = true)
+        lateinit var transactionKey: ByteArray
+
+        @get:XmlAnyElement(lax = true)
+        var any: List<Any>? = null
+
+        @XmlAccessorType(XmlAccessType.NONE)
+        class EncryptionPubKeyDigest {
+            @get:XmlAttribute(name = "Version", required = true)
+            @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+            lateinit var version: String
+
+            @XmlAttribute(name = "Algorithm", required = true)
+            @XmlSchemaType(name = "anyURI")
+            lateinit var algorithm: String
+
+            @get:XmlValue
+            lateinit var value: ByteArray
+        }
+    }
+}
+
+
+@XmlAccessorType(XmlAccessType.NONE)
+@XmlType(
+    name = "ResponseMutableHeaderType",
+    propOrder = ["transactionPhase", "segmentNumber", "orderID", "returnCode", 
"reportText", "any"]
+)
+class ResponseMutableHeaderType {
+    @XmlElement(name = "TransactionPhase", required = true)
+    @XmlSchemaType(name = "token")
+    lateinit var transactionPhase: TransactionPhaseType
+
+    @XmlElement(name = "SegmentNumber")
+    var segmentNumber: SegmentNumber? = null
+
+    @XmlElement(name = "OrderID")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+    @XmlSchemaType(name = "token")
+    var orderID: String? = null
+
+    @XmlElement(name = "ReturnCode", required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+    @XmlSchemaType(name = "token")
+    lateinit var returnCode: String
+
+    @XmlElement(name = "ReportText", required = true)
+    @XmlJavaTypeAdapter(NormalizedStringAdapter::class)
+    @XmlSchemaType(name = "normalizedString")
+    lateinit var reportText: String
+
+    @XmlAnyElement(lax = true)
+    var any: List<Any>? = null
+
+    @XmlAccessorType(XmlAccessType.NONE)
+    @XmlType(name = "", propOrder = ["value"])
+    class SegmentNumber {
+        @XmlValue
+        lateinit var value: BigInteger
+
+        @XmlAttribute(name = "lastSegment", required = true)
+        var lastSegment: Boolean = false
+    }
+}
+
+@Suppress("UNUSED_PARAMETER")
+enum class TransactionPhaseType(value: String) {
+    @XmlEnumValue("Initialisation")
+    INITIALISATION("Initialisation"),
+
+    /**
+     * Auftragsdatentransfer
+     *
+     */
+    @XmlEnumValue("Transfer")
+    TRANSFER("Transfer"),
+
+    /**
+     * Quittungstransfer
+     *
+     */
+    @XmlEnumValue("Receipt")
+    RECEIPT("Receipt");
+}
+
+@XmlAccessorType(XmlAccessType.NONE)
+@XmlType(name = "ResponseStaticHeaderType", propOrder = ["transactionID", 
"numSegments"])
+class ResponseStaticHeaderType {
+    @XmlElement(name = "TransactionID", type = String::class)
+    @XmlJavaTypeAdapter(HexBinaryAdapter::class)
+    @XmlSchemaType(name = "hexBinary")
+    var transactionID: ByteArray? = null
+
+    @XmlElement(name = "NumSegments")
+    @XmlSchemaType(name = "positiveInteger")
+    var numSegments: BigInteger? = null
+}
+
+
+@XmlAccessorType(XmlAccessType.NONE)
+@XmlType(name = "", propOrder = ["header", "authSignature", "body"])
+@XmlRootElement(name = "ebicsResponse")
+class EbicsResponse {
+    @get:XmlElement(required = true)
+    lateinit var header: EbicsResponse.Header
+
+    @get:XmlElement(name = "AuthSignature", required = true)
+    lateinit var authSignature: SignatureType
+
+    @get:XmlElement(required = true)
+    lateinit var body: Body
+
+    @get:XmlAttribute(name = "Version", required = true)
+    @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+    lateinit var version: String
+
+    @get:XmlAttribute(name = "Revision")
+    var revision: Int? = null
+
+    @get:XmlAnyAttribute
+    var otherAttributes = HashMap<QName, String>()
+
+    @XmlAccessorType(XmlAccessType.NONE)
+    @XmlType(name = "", propOrder = ["_static", "mutable"])
+    class Header {
+
+        init {
+            println("creating header")
+        }
+
+        @get:XmlElement(name = "static", required = true)
+        var _static: ResponseStaticHeaderType? = null
+
+        @get:XmlElement(required = true)
+        var mutable: ResponseMutableHeaderType? = null
+
+        @get:XmlAttribute(name = "authenticate", required = true)
+        var authenticate: Boolean = false
+    }
+
+    @XmlAccessorType(XmlAccessType.NONE)
+    @XmlType(name = "", propOrder = ["dataTransfer", "returnCode", 
"timestampBankParameter"])
+    class Body {
+        @XmlElement(name = "DataTransfer")
+        var dataTransfer: DataTransferResponse? = null
+
+        @XmlElement(name = "ReturnCode", required = true)
+        lateinit var returnCode: ReturnCode
+
+        @XmlElement(name = "TimestampBankParameter")
+        var timestampBankParameter: TimestampBankParameter? = null
+
+        @XmlAccessorType(XmlAccessType.NONE)
+        class TimestampBankParameter {
+            @XmlValue
+            lateinit var value: XMLGregorianCalendar
+
+            @XmlAttribute(name = "authenticate", required = true)
+            var authenticate: Boolean = false
+        }
+
+        @XmlAccessorType(XmlAccessType.NONE)
+        class ReturnCode {
+            @get:XmlValue
+            @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+            lateinit var value: String
+
+            @get:XmlAttribute(name = "authenticate", required = true)
+            var authenticate: Boolean = false
+        }
+    }
+}
+
+
+class PubKeyValueType {
+    @XmlElement(name = "RSAKeyValue", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, required = true)
+    lateinit var rsaKeyValue: RSAKeyValueType
+
+    @XmlElement(name = "TimeStamp")
+    @XmlSchemaType(name = "dateTime")
+    var timeStamp: XMLGregorianCalendar? = null
+
+    @XmlAnyElement(lax = true)
+    var any: List<Any>? = null
+}
+
+
+@XmlAccessorType(XmlAccessType.NONE)
+@XmlType(
+    name = "AuthenticationPubKeyInfoType", propOrder = [
+        "x509Data",
+        "pubKeyValue",
+        "authenticationVersion"
+    ]
+)
+class AuthenticationPubKeyInfoType {
+    @get:XmlAnyElement()
+    var x509Data: Element? = null
+
+    @get:XmlElement(name = "PubKeyValue", required = true)
+    lateinit var pubKeyValue: PubKeyValueType
+
+    @get:XmlElement(name = "AuthenticationVersion", required = true)
+    @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+    @get:XmlSchemaType(name = "token")
+    lateinit var authenticationVersion: String
+}
+
+
+@XmlAccessorType(XmlAccessType.NONE)
+@XmlType(
+    name = "AuthenticationPubKeyInfoType", propOrder = [
+        "x509Data",
+        "pubKeyValue",
+        "encryptionVersion"
+    ]
+)
+class EncryptionPubKeyInfoType {
+    @get:XmlAnyElement()
+    var x509Data: Element? = null
+
+    @get:XmlElement(name = "PubKeyValue", required = true)
+    lateinit var pubKeyValue: PubKeyValueType
+
+    @get:XmlElement(name = "EncryptionVersion", required = true)
+    @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+    @get:XmlSchemaType(name = "token")
+    lateinit var encryptionVersion: String
+}
+
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(
+    name = "HIARequestOrderDataType",
+    propOrder = ["authenticationPubKeyInfo", "encryptionPubKeyInfo", 
"partnerID", "userID", "any"]
+)
+class HIARequestOrderDataType {
+    @XmlElement(name = "AuthenticationPubKeyInfo", required = true)
+    lateinit var authenticationPubKeyInfo: AuthenticationPubKeyInfoType
+
+    @XmlElement(name = "EncryptionPubKeyInfo", required = true)
+    lateinit var encryptionPubKeyInfo: EncryptionPubKeyInfoType
+
+    @XmlElement(name = "PartnerID", required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+    @XmlSchemaType(name = "token")
+    lateinit var partnerID: String
+
+    @XmlElement(name = "UserID", required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+    @XmlSchemaType(name = "token")
+    lateinit var userID: String
+
+    @XmlAnyElement(lax = true)
+    var any: List<Any>? = null
+}
diff --git 
a/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_h004/package-info.java 
b/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_h004/package-info.java
new file mode 100644
index 0000000..4dc9c42
--- /dev/null
+++ b/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_h004/package-info.java
@@ -0,0 +1,13 @@
+/**
+ * This package-info.java file defines the default namespace for the JAXB 
bindings
+ * defined in the package.
+ */
+
+@XmlSchema(
+        namespace = "urn:org:ebics:H004",
+        elementFormDefault = XmlNsForm.QUALIFIED
+)
+package tech.libeufin.schema.ebics_h004;
+
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlSchema;
\ No newline at end of file
diff --git 
a/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_hev/EbicsMessages.kt 
b/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_hev/EbicsMessages.kt
new file mode 100644
index 0000000..d0939d5
--- /dev/null
+++ b/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_hev/EbicsMessages.kt
@@ -0,0 +1,81 @@
+/*
+ * This file is part of LibEuFin.
+ * Copyright (C) 2019 Stanisci and Dold.
+
+ * LibEuFin is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation; either version 3, or
+ * (at your option) any later version.
+
+ * LibEuFin is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General
+ * Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public
+ * License along with LibEuFin; see the file COPYING.  If not, see
+ * <http://www.gnu.org/licenses/>
+ */
+
+package tech.libeufin.schema.ebics_hev
+
+import javax.xml.bind.annotation.*
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter
+import javax.xml.bind.annotation.adapters.NormalizedStringAdapter
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter
+
+@XmlAccessorType(XmlAccessType.NONE)
+@XmlType(
+    name = "HEVResponseDataType",
+    propOrder = ["systemReturnCode", "versionNumber", "any"]
+)
+@XmlRootElement(name = "ebicsHEVResponse")
+class HEVResponse {
+    @get:XmlElement(name = "SystemReturnCode", required = true)
+    lateinit var systemReturnCode: SystemReturnCodeType
+
+    @get:XmlElement(name = "VersionNumber", namespace = 
"http://www.ebics.org/H000";)
+    var versionNumber: List<VersionNumber>? = null
+
+    @get:XmlAnyElement(lax = true)
+    var any: List<Any>? = null
+
+    @XmlAccessorType(XmlAccessType.NONE)
+    class VersionNumber {
+        @get:XmlValue
+        @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+        lateinit var value: String
+
+        @get:XmlAttribute(name = "ProtocolVersion", required = true)
+        @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+        lateinit var protocolVersion: String
+
+        companion object {
+            fun create(protocolVersion: String, versionNumber: String): 
VersionNumber {
+                return VersionNumber().apply {
+                    this.protocolVersion = protocolVersion
+                    this.value = versionNumber
+                }
+            }
+        }
+    }
+}
+
+
+@XmlAccessorType(XmlAccessType.NONE)
+@XmlType(
+    name = "SystemReturnCodeType",
+    propOrder = [
+        "returnCode",
+        "reportText"
+    ]
+)
+class SystemReturnCodeType {
+    @get:XmlElement(name = "ReturnCode", required = true)
+    @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+    lateinit var returnCode: String
+
+    @get:XmlElement(name = "ReportText", required = true)
+    @get:XmlJavaTypeAdapter(NormalizedStringAdapter::class)
+    lateinit var reportText: String
+}
diff --git 
a/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_hev/package-info.java 
b/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_hev/package-info.java
new file mode 100644
index 0000000..ca84376
--- /dev/null
+++ b/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_hev/package-info.java
@@ -0,0 +1,13 @@
+/**
+ * This package-info.java file defines the default namespace for the JAXB 
bindings
+ * defined in the package.
+ */
+
+@XmlSchema(
+        namespace = "http://www.ebics.org/H000";,
+        elementFormDefault = XmlNsForm.QUALIFIED
+)
+package tech.libeufin.schema.ebics_hev;
+
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlSchema;
diff --git 
a/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_s001/EbicsMessages.kt 
b/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_s001/EbicsMessages.kt
new file mode 100644
index 0000000..6d99c8c
--- /dev/null
+++ b/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_s001/EbicsMessages.kt
@@ -0,0 +1,98 @@
+/*
+ * This file is part of LibEuFin.
+ * Copyright (C) 2019 Stanisci and Dold.
+
+ * LibEuFin is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation; either version 3, or
+ * (at your option) any later version.
+
+ * LibEuFin is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General
+ * Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public
+ * License along with LibEuFin; see the file COPYING.  If not, see
+ * <http://www.gnu.org/licenses/>
+ */
+
+package tech.libeufin.schema.ebics_s001
+
+import org.apache.xml.security.binding.xmldsig.RSAKeyValueType
+import org.apache.xml.security.binding.xmldsig.X509DataType
+import javax.xml.bind.annotation.*
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter
+import javax.xml.datatype.XMLGregorianCalendar
+
+
+@XmlAccessorType(XmlAccessType.NONE)
+@XmlType(
+    name = "PubKeyValueType", namespace = "http://www.ebics.org/S001";, 
propOrder = [
+        "rsaKeyValue",
+        "timeStamp",
+        "any"
+    ]
+)
+class PubKeyValueType {
+    @XmlElement(name = "RSAKeyValue", namespace = 
"http://www.w3.org/2000/09/xmldsig#";, required = true)
+    lateinit var rsaKeyValue: RSAKeyValueType
+
+    @XmlElement(name = "TimeStamp")
+    @XmlSchemaType(name = "dateTime")
+    var timeStamp: XMLGregorianCalendar? = null
+
+    @XmlAnyElement(lax = true)
+    var any: List<Any>? = null
+}
+
+
+@XmlAccessorType(XmlAccessType.NONE)
+@XmlType(
+    name = "",
+    propOrder = [
+        "x509Data",
+        "pubKeyValue",
+        "signatureVersion"
+    ]
+)
+class SignaturePubKeyInfoType {
+    @get:XmlElement(name = "X509Data")
+    var x509Data: X509DataType? = null
+
+    @get:XmlElement(name = "PubKeyValue", required = true)
+    lateinit var pubKeyValue: PubKeyValueType
+
+    @get:XmlElement(name = "SignatureVersion", required = true)
+    @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+    lateinit var signatureVersion: String
+}
+
+
+/**
+ * EBICS INI payload.
+ */
+@XmlAccessorType(XmlAccessType.NONE)
+@XmlType(
+    name = "",
+    propOrder = ["signaturePubKeyInfo", "partnerID", "userID", "any"]
+)
+@XmlRootElement(name = "SignaturePubKeyOrderData")
+class SignaturePubKeyOrderData {
+    @get:XmlElement(name = "SignaturePubKeyInfo", required = true)
+    lateinit var signaturePubKeyInfo: SignaturePubKeyInfoType
+
+    @get:XmlElement(name = "PartnerID", required = true)
+    @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+    @get:XmlSchemaType(name = "token")
+    lateinit var partnerID: String
+
+    @get:XmlElement(name = "UserID", required = true)
+    @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class)
+    @get:XmlSchemaType(name = "token")
+    lateinit var userID: String
+
+    @get:XmlAnyElement(lax = true)
+    var any: List<Any>? = null
+}
diff --git 
a/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_s001/package-info.java 
b/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_s001/package-info.java
new file mode 100644
index 0000000..224ea72
--- /dev/null
+++ b/sandbox/src/main/kotlin/tech/libeufin/schema/ebics_s001/package-info.java
@@ -0,0 +1,13 @@
+/**
+ * This package-info.java file defines the default namespace for the JAXB 
bindings
+ * defined in the package.
+ */
+
+@XmlSchema(
+        namespace = "http://www.ebics.org/S001";,
+        elementFormDefault = XmlNsForm.QUALIFIED
+)
+package tech.libeufin.schema.ebics_s001;
+
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlSchema;
\ No newline at end of file
diff --git a/sandbox/src/main/resources/bindings.xjb 
b/sandbox/src/main/resources/bindings.xjb
deleted file mode 100644
index 809c5f4..0000000
--- a/sandbox/src/main/resources/bindings.xjb
+++ /dev/null
@@ -1,35 +0,0 @@
-
-<jaxb:bindings version="1.0"
-               xmlns:jaxb="http://java.sun.com/xml/ns/jaxb";
-               xmlns:xsd="http://www.w3.org/2001/XMLSchema";
-               xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc";
-               jaxb:extensionBindingPrefixes="xjc">
-
-  <jaxb:bindings schemaLocation="ebics_types_H004.xsd" node="/xsd:schema">
-    <jaxb:bindings node="//xsd:complexType[@name='PubKeyInfoType']">
-      <jaxb:class name="PubKeyInfoTypeAtEbicsTypes" />
-    </jaxb:bindings>
-    <jaxb:bindings node="//xsd:complexType[@name='PubKeyValueType']">
-      <jaxb:class name="PubKeyValueTypeAtEbicsTypes" />
-    </jaxb:bindings>
-  </jaxb:bindings>
-
-  <jaxb:bindings schemaLocation="ebics_orders_H004.xsd" node="/xsd:schema">
-    <jaxb:bindings node="//xsd:element[@name='EBICSSignatureData']">
-      <jaxb:factoryMethod name="ebicsSignatureDataAtEbicsOrders" />
-    </jaxb:bindings>
-  </jaxb:bindings>
-
-  <jaxb:bindings schemaLocation="ebics_signatures.xsd" node="/xsd:schema">
-    <jaxb:bindings node="//xsd:complexType[@name='PubKeyInfoType']">
-      <jaxb:class name="PubKeyInfoTypeAtEbicsSignatures" />
-    </jaxb:bindings>
-    <jaxb:bindings node="//xsd:complexType[@name='PubKeyValueType']">
-      <jaxb:class name="PubKeyValueTypeAtEbicsSignatures" />
-    </jaxb:bindings>
-    <jaxb:bindings node="//xsd:element[@name='EBICSSignatureData']">
-      <jaxb:factoryMethod name="ebicsSignatureDataAtEbicsSignatures" />
-    </jaxb:bindings>
-  </jaxb:bindings>
-
-</jaxb:bindings>
diff --git a/sandbox/src/test/kotlin/DbTest.kt 
b/sandbox/src/test/kotlin/DbTest.kt
index 3ce1ee7..1c50dd1 100644
--- a/sandbox/src/test/kotlin/DbTest.kt
+++ b/sandbox/src/test/kotlin/DbTest.kt
@@ -2,15 +2,10 @@ package tech.libeufin.sandbox
 
 import junit.framework.TestCase.assertFalse
 import org.jetbrains.exposed.dao.EntityID
-import org.jetbrains.exposed.dao.IntEntityClass
-import org.jetbrains.exposed.sql.Column
 import org.jetbrains.exposed.sql.transactions.transaction
-import org.junit.BeforeClass
-import junit.framework.TestCase.assertTrue
 import org.junit.Test
 import org.junit.Before
-import tech.libeufin.sandbox.createSubscriber
-import tech.libeufin.sandbox.dbCreateTables
+import tech.libeufin.sandbox.db.*
 
 class DbTest {
 
diff --git a/sandbox/src/test/kotlin/GeneratePrivateKeyTest.kt 
b/sandbox/src/test/kotlin/GeneratePrivateKeyTest.kt
index cddd900..4dad69c 100644
--- a/sandbox/src/test/kotlin/GeneratePrivateKeyTest.kt
+++ b/sandbox/src/test/kotlin/GeneratePrivateKeyTest.kt
@@ -4,6 +4,8 @@ import org.junit.Test
 import junit.framework.TestCase.assertTrue
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.junit.Before
+import tech.libeufin.sandbox.db.EbicsBankPrivateKey
+import tech.libeufin.sandbox.db.dbCreateTables
 
 class GeneratePrivateKeyTest {
 
diff --git a/sandbox/src/test/kotlin/HiaLoadTest.kt 
b/sandbox/src/test/kotlin/HiaLoadTest.kt
index bf34ccb..489685a 100644
--- a/sandbox/src/test/kotlin/HiaLoadTest.kt
+++ b/sandbox/src/test/kotlin/HiaLoadTest.kt
@@ -2,7 +2,7 @@ package tech.libeufin.sandbox
 
 import org.junit.Test
 import org.w3c.dom.Element
-import tech.libeufin.messages.ebics.keyrequest.EbicsUnsecuredRequest
+import tech.libeufin.schema.ebics_h004.EbicsUnsecuredRequest
 
 class HiaLoadTest {
 
@@ -24,7 +24,7 @@ class HiaLoadTest {
             "UnsecuredReqOrderDetailsType"
         )
 
-        processor.convertDomToJaxb<EbicsUnsecuredRequest>(
+        XMLUtil.convertDomToJaxb<EbicsUnsecuredRequest>(
             EbicsUnsecuredRequest::class.java,
             hiaDom
         )
diff --git a/sandbox/src/test/kotlin/InnerIniLoadTest.kt 
b/sandbox/src/test/kotlin/InnerIniLoadTest.kt
index 7831893..664ece3 100644
--- a/sandbox/src/test/kotlin/InnerIniLoadTest.kt
+++ b/sandbox/src/test/kotlin/InnerIniLoadTest.kt
@@ -1,7 +1,7 @@
 package tech.libeufin.sandbox
 
 import org.junit.Test
-import tech.libeufin.messages.ebics.keyrequest.SignaturePubKeyOrderDataType
+import tech.libeufin.schema.ebics_s001.SignaturePubKeyOrderData
 
 class InnerIniLoadTest {
 
@@ -10,10 +10,7 @@ class InnerIniLoadTest {
         val file = classLoader.getResource(
             "ebics_ini_inner_key.xml"
         )
-        xmlProcess.convertStringToJaxb(
-            SignaturePubKeyOrderDataType::class.java,
-            file.readText()
-        )
+        XMLUtil.convertStringToJaxb<SignaturePubKeyOrderData>(file.readText())
     }()
 
     @Test
diff --git a/sandbox/src/test/kotlin/JaxbTest.kt 
b/sandbox/src/test/kotlin/JaxbTest.kt
index a5a788f..11942ac 100644
--- a/sandbox/src/test/kotlin/JaxbTest.kt
+++ b/sandbox/src/test/kotlin/JaxbTest.kt
@@ -2,23 +2,12 @@ package tech.libeufin.sandbox
 
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
-import tech.libeufin.messages.ebics.keyrequest.EbicsUnsecuredRequest
-import tech.libeufin.messages.ebics.keyrequest.SignaturePubKeyOrderDataType
+import tech.libeufin.schema.ebics_h004.EbicsUnsecuredRequest
+import tech.libeufin.schema.ebics_hev.HEVResponse
+import tech.libeufin.schema.ebics_hev.SystemReturnCodeType
+import tech.libeufin.schema.ebics_s001.SignaturePubKeyOrderData
 
 class JaxbTest {
-
-    val processor = XMLUtil()
-    val classLoader = ClassLoader.getSystemClassLoader()
-    val hevResponseJaxb = HEVResponse(
-        "000000",
-        "EBICS_OK",
-        arrayOf(
-            ProtocolAndVersion("H003", "02.40"),
-            ProtocolAndVersion("H004", "02.50")
-        )
-    )
-
-
     /**
      * Tests the JAXB instantiation of non-XmlRootElement documents,
      * as notably are the inner XML strings carrying keys in INI/HIA
@@ -26,16 +15,9 @@ class JaxbTest {
      */
     @Test
     fun importNonRoot() {
-
-        val ini = classLoader.getResource(
-            "ebics_ini_inner_key.xml"
-        )
-
-        val jaxb = xmlProcess.convertStringToJaxb(
-            SignaturePubKeyOrderDataType::class.java,
-            ini.readText()
-        )
-
+        val classLoader = ClassLoader.getSystemClassLoader()
+        val ini = classLoader.getResource("ebics_ini_inner_key.xml")
+        val jaxb = 
XMLUtil.convertStringToJaxb<SignaturePubKeyOrderData>(ini.readText())
         assertEquals("A006", jaxb.value.signaturePubKeyInfo.signatureVersion)
     }
 
@@ -44,14 +26,10 @@ class JaxbTest {
      */
     @Test
     fun stringToJaxb() {
-
+        val classLoader = ClassLoader.getSystemClassLoader()
         val ini = 
classLoader.getResource("ebics_ini_request_sample_patched.xml")
-
-        val jaxb = xmlProcess.convertStringToJaxb(
-            EbicsUnsecuredRequest::class.java,
-            ini.readText()
-        )
-
+        val jaxb = 
XMLUtil.convertStringToJaxb<EbicsUnsecuredRequest>(ini.readText())
+        println("jaxb loaded")
         assertEquals(
             "INI",
             jaxb.value.header.static.orderDetails.orderType
@@ -63,15 +41,14 @@ class JaxbTest {
      */
     @Test
     fun jaxbToString() {
-        processor.convertJaxbToString(hevResponseJaxb.get())
-    }
-
-    /**
-     * Test JAXB -> DOM
-     */
-    @Test
-    fun jaxbToDom() {
-        processor.convertJaxbToDom(hevResponseJaxb.get())
+        val hevResponseJaxb = HEVResponse().apply {
+            this.systemReturnCode = SystemReturnCodeType().apply {
+                this.reportText = "[EBICS_OK]"
+                this.returnCode = "000000"
+            }
+            this.versionNumber = 
listOf(HEVResponse.VersionNumber.create("H004", "02.50"))
+        }
+        XMLUtil.convertJaxbToString(hevResponseJaxb)
     }
 
 
@@ -80,9 +57,10 @@ class JaxbTest {
      */
     @Test
     fun domToJaxb() {
+        val classLoader = ClassLoader.getSystemClassLoader()
         val ini = 
classLoader.getResource("ebics_ini_request_sample_patched.xml")
         val iniDom = XMLUtil.parseStringIntoDom(ini.readText())
-        processor.convertDomToJaxb<EbicsUnsecuredRequest>(
+        XMLUtil.convertDomToJaxb<EbicsUnsecuredRequest>(
             EbicsUnsecuredRequest::class.java,
             iniDom
         )
diff --git a/sandbox/src/test/kotlin/MarshalNonJaxbTest.kt 
b/sandbox/src/test/kotlin/MarshalNonJaxbTest.kt
deleted file mode 100644
index ce88953..0000000
--- a/sandbox/src/test/kotlin/MarshalNonJaxbTest.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package tech.libeufin.sandbox
-
-import org.junit.Test
-import tech.libeufin.messages.ebics.keyresponse.EbicsKeyManagementResponse
-import tech.libeufin.messages.ebics.keyresponse.ObjectFactory
-import java.io.StringWriter
-import javax.xml.bind.JAXBContext
-import javax.xml.bind.Marshaller
-
-class MarshalNonJaxbTest {
-
-    @Test
-    fun marshalNonJaxbNative() {
-
-        val jc = 
JAXBContext.newInstance(EbicsKeyManagementResponse::class.java)
-        val proc = jc.createMarshaller()
-        val sw = StringWriter()
-        val obj = ObjectFactory().createEbicsKeyManagementResponse()
-
-        proc.marshal(obj, sw)
-        proc.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true)
-
-        println(sw.toString())
-    }
-
-    @Test
-    fun marshalArtificialJaxb() {
-
-        val obj = KeyManagementResponse(
-            "H004",
-            1,
-            "000000",
-            "fake",
-            "EBICS_NON_OK"
-        )
-
-        val proc = XMLUtil()
-        println(proc.convertJaxbToString(obj.get()))
-    }
-}
\ No newline at end of file
diff --git a/sandbox/src/test/kotlin/ResponseTest.kt 
b/sandbox/src/test/kotlin/ResponseTest.kt
index d13c1c3..e187cb5 100644
--- a/sandbox/src/test/kotlin/ResponseTest.kt
+++ b/sandbox/src/test/kotlin/ResponseTest.kt
@@ -1,21 +1,21 @@
 package tech.libeufin.sandbox
 
+import org.apache.xml.security.binding.xmldsig.SignatureType
 import org.junit.Test
+import tech.libeufin.schema.ebics_h004.EbicsResponse
 
 class ResponseTest {
 
-    val xmlprocess = XMLUtil()
-
     @Test
     fun loadResponse() {
-        val response = EbicsResponse(
-        "0000",
-        "[EBICS_OK] All is okay"
-        )
-
-        print(xmlprocess.convertJaxbToString(response.get()))
-
-
+        val response = EbicsResponse().apply {
+            version = "H004"
+            header = EbicsResponse.Header().apply {
+            }
+            authSignature = SignatureType()
+            body = EbicsResponse.Body()
+        }
+        print(XMLUtil.convertJaxbToString(response))
     }
 
 }
\ No newline at end of file
diff --git a/sandbox/src/test/kotlin/XsiTypeAttributeTest.kt 
b/sandbox/src/test/kotlin/XsiTypeAttributeTest.kt
index 84eb1eb..212dcb5 100644
--- a/sandbox/src/test/kotlin/XsiTypeAttributeTest.kt
+++ b/sandbox/src/test/kotlin/XsiTypeAttributeTest.kt
@@ -2,7 +2,7 @@ package tech.libeufin.sandbox
 
 import org.junit.Test
 import org.w3c.dom.Element
-import tech.libeufin.messages.ebics.keyrequest.EbicsUnsecuredRequest
+import tech.libeufin.schema.ebics_h004.EbicsUnsecuredRequest
 
 class XsiTypeAttributeTest {
 
@@ -21,7 +21,7 @@ class XsiTypeAttributeTest {
             "UnsecuredReqOrderDetailsType"
         )
 
-        processor.convertDomToJaxb<EbicsUnsecuredRequest>(
+        XMLUtil.convertDomToJaxb(
             EbicsUnsecuredRequest::class.java,
             iniDom)
     }
diff --git a/settings.gradle b/settings.gradle
index dcf5bb7..64989d7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,3 @@
 rootProject.name = 'libeufin'
 include("sandbox")
 include("nexus")
-

-- 
To stop receiving notification emails like this one, please contact
address@hidden.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]