From 7e57f962c77977fbf218a9784c76897008a79680 Mon Sep 17 00:00:00 2001 From: JensBuehring Date: Wed, 5 Jan 2022 00:05:20 +0100 Subject: [PATCH] Vorbereitung Release 1.7: Entfernen der Teile, die nicht veroeffentlicht werden sollen, Sourcen neu generiert. --- OMDSServiceDefinition/.classpath | 32 - .../Maven_CodeGen_ReadMe.txt | 5 + OMDSServiceDefinition/pom.xml | 124 ++- .../types/omds2Types/v2_14/BBArtCdType.java | 1 - .../types/omds2Types/v2_14/Entsch2Type.java | 1 - .../types/omds2Types/v2_14/EstArtCdType.java | 1 - .../v2_14/FlaechenAttributCdType.java | 1 - .../types/omds2Types/v2_14/GesFormCdType.java | 1 - .../types/omds2Types/v2_14/GrwArtCdType.java | 1 - .../types/omds2Types/v2_14/IdfArtCdType.java | 1 - .../types/omds2Types/v2_14/LoeschCdType.java | 1 - .../types/omds2Types/v2_14/ObjectFactory.java | 276 ++++- .../omds2Types/v2_14/PaketInhCdType.java | 1 - .../omds2Types/v2_14/PaketUmfCdType.java | 1 - .../types/omds2Types/v2_14/PersArtCdType.java | 1 - .../types/omds2Types/v2_14/PolArtCdType.java | 1 - .../omds2Types/v2_14/PraemFristCdType.java | 1 - .../types/omds2Types/v2_14/RISIKOType.java | 2 +- .../omds2Types/v2_14/RisikoArtCdType.java | 1 - .../types/omds2Types/v2_14/SbhArtCdType.java | 1 - .../types/omds2Types/v2_14/SchlArtCdType.java | 1 - .../types/omds2Types/v2_14/SprachCdType.java | 1 - .../types/omds2Types/v2_14/TxtArtCdType.java | 1 - .../omds2Types/v2_14/VERSOBJEKTType.java | 2 +- .../types/omds2Types/v2_14/VSArtCdType.java | 1 - .../omds2Types/v2_14/VtgRolleCdType.java | 1 - .../omds2Types/v2_14/WaehrungsCdType.java | 1 - .../r1_7_0/common/AListenAttributType.java | 108 -- .../r1_7_0/common/ASingleAttributType.java | 74 -- .../r1_7_0/common/AbgelehnteRisikenType.java | 32 - ...AbstraktesEreignisStatusAenderungType.java | 32 - .../r1_7_0/common/AbtretungType.java | 66 -- .../r1_7_0/common/AdresseArtCdType.java | 41 - .../omds3Types/r1_7_0/common/AdresseType.java | 302 ------ .../r1_7_0/common/AgentFilterType.java | 101 -- .../r1_7_0/common/AntragsartType.java | 69 -- .../r1_7_0/common/AttributDatumType.java | 192 ---- .../r1_7_0/common/AttributDezimalType.java | 186 ---- .../r1_7_0/common/AttributDoubleType.java | 185 ---- .../r1_7_0/common/AttributEnumType.java | 94 -- .../r1_7_0/common/AttributIntType.java | 185 ---- .../common/AttributMetadatenDatumType.java | 163 --- .../common/AttributMetadatenDezimalType.java | 158 --- .../common/AttributMetadatenEnumType.java | 101 -- .../common/AttributMetadatenIntType.java | 157 --- .../common/AttributMetadatenStringType.java | 188 ---- .../r1_7_0/common/AttributMetadatenType.java | 148 --- .../r1_7_0/common/AttributMsgType.java | 129 --- .../r1_7_0/common/AttributMultiEnumType.java | 134 --- .../r1_7_0/common/AttributStringType.java | 216 ---- .../r1_7_0/common/AttributType.java | 154 --- .../r1_7_0/common/AuthorizationFilter.java | 36 - .../r1_7_0/common/AutorisierungAsyncType.java | 73 -- .../r1_7_0/common/AutorisierungType.java | 153 --- .../common/AutorisierungsAnforderungType.java | 155 --- ...ngsartClientsidePhysischeUnterschrift.java | 34 - .../AutorisierungsartClientsideType.java | 38 - ...utorisierungsartPhysischeUnterschrift.java | 34 - .../AutorisierungsartServersideType.java | 34 - .../r1_7_0/common/AutorisierungsartType.java | 36 - .../r1_7_0/common/BankverbindungType.java | 152 --- .../common/BasisProduktbausteinType.java | 164 --- .../common/BerechnungsvarianteType.java | 54 - .../common/BeteiligtePersonVertragType.java | 86 -- ...ezugsberechtigungGesetzlicheErbenType.java | 34 - .../common/BezugsberechtigungIndividuell.java | 66 -- .../common/BezugsberechtigungNamentlich.java | 93 -- ...berechtigungTestamentarischeErbenType.java | 34 - .../r1_7_0/common/BezugsberechtigungType.java | 73 -- .../BezugsberechtigungUeberbringerType.java | 34 - ...zugsberechtigungVersichertePersonType.java | 34 - ...gsberechtigungVersicherungsnehmerType.java | 34 - .../r1_7_0/common/BezugsrechtType.java | 65 -- .../r1_7_0/common/BonusMalusSystemType.java | 157 --- .../common/BonusMalusVorversicherungType.java | 57 -- .../common/CommonProcessRequestType.java | 79 -- .../common/CommonProcessResponseType.java | 79 -- .../r1_7_0/common/CommonRequestType.java | 237 ----- .../r1_7_0/common/CommonResponseType.java | 208 ---- .../common/CommonSearchRequestType.java | 205 ---- .../common/CommonSearchResponseType.java | 107 -- .../r1_7_0/common/DateianhangType.java | 192 ---- .../r1_7_0/common/DatenverwendungType.java | 112 --- .../r1_7_0/common/DirectionCdType.java | 48 - .../r1_7_0/common/DokumentBinaryDataType.java | 156 --- .../r1_7_0/common/DokumentDataType.java | 36 - .../r1_7_0/common/DokumentFormDataType.java | 64 -- .../r1_7_0/common/DokumentInfoType.java | 309 ------ .../r1_7_0/common/DokumentenReferenzType.java | 262 ----- .../common/EintragSchluessellisteType.java | 92 -- .../r1_7_0/common/EinwGesDatenVNType.java | 34 - .../r1_7_0/common/EinwSprachaufzType.java | 34 - .../r1_7_0/common/EinwVerarbGesDatenType.java | 34 - .../common/EinwilligungPersDatenType.java | 66 -- .../r1_7_0/common/EinwilligungType.java | 96 -- .../common/ElementFondsauswahlType.java | 164 --- .../r1_7_0/common/ElementIdType.java | 114 --- .../common/ElementarproduktGenerischType.java | 191 ---- .../r1_7_0/common/ElementarproduktType.java | 141 --- .../common/ErsatzpolizzeMitAendGrundType.java | 94 -- .../r1_7_0/common/ErsatzpolizzeType.java | 96 -- .../r1_7_0/common/ErsatzpolizzenType.java | 120 --- .../r1_7_0/common/FATCANatPersonType.java | 76 -- .../r1_7_0/common/FATCASonstPersonType.java | 132 --- .../omds3Types/r1_7_0/common/FATCAType.java | 120 --- .../r1_7_0/common/FahrzeugType.java | 863 ---------------- .../omds3Types/r1_7_0/common/Formular.java | 195 ---- .../r1_7_0/common/FormularfrageType.java | 86 -- .../omds3Types/r1_7_0/common/GMSGType.java | 165 --- .../common/GeschaeftsobjektArtType.java | 62 -- .../common/GlaeubigerSicherstellungType.java | 148 --- .../r1_7_0/common/KontierungType.java | 177 ---- .../common/KostenFixOderProzentType.java | 97 -- .../r1_7_0/common/KreditkarteType.java | 189 ---- .../r1_7_0/common/LegitimationType.java | 61 -- .../r1_7_0/common/ObjectFactory.java | 885 ---------------- .../r1_7_0/common/ObjektIdType.java | 129 --- .../common/ObjektSpezifikationType.java | 39 - .../r1_7_0/common/OffeneSchaedenType.java | 120 --- .../r1_7_0/common/OffenerSchadenType.java | 93 -- .../omds3Types/r1_7_0/common/PEPType.java | 84 -- .../r1_7_0/common/PartnerRoleType.java | 49 - .../r1_7_0/common/PersBankverbindungType.java | 64 -- .../PersonNamentlichesBezugsrechtType.java | 84 -- .../omds3Types/r1_7_0/common/PersonType.java | 421 -------- .../r1_7_0/common/PfandglaeubigerType.java | 84 -- .../PolizzenObjektSpezifikationType.java | 130 --- .../r1_7_0/common/PolizzenversandType.java | 76 -- .../omds3Types/r1_7_0/common/PraemieType.java | 271 ----- .../r1_7_0/common/ProduktGenerischType.java | 157 --- .../r1_7_0/common/ProduktMitVpType.java | 104 -- .../omds3Types/r1_7_0/common/ProduktType.java | 254 ----- .../common/ProduktbausteinGenerischType.java | 149 --- .../r1_7_0/common/ProduktbausteinType.java | 141 --- .../r1_7_0/common/ProzessDokAnforderung.java | 220 ---- .../r1_7_0/common/ProzessDokFuerKunde.java | 93 -- .../ProzessDokFuerKundeZumUnterschreiben.java | 182 ---- .../r1_7_0/common/ProzessDokHandoutType.java | 93 -- .../common/ProzessDokRequirementType.java | 187 ---- .../r1_7_0/common/ProzessDokToSignType.java | 182 ---- .../common/ProzessDokumentBasisType.java | 104 -- .../r1_7_0/common/ProzessDokumentType.java | 234 ----- .../omds3Types/r1_7_0/common/RaucherType.java | 34 - .../omds3Types/r1_7_0/common/Referenz.java | 92 -- .../r1_7_0/common/ResponseStatusType.java | 162 --- .../r1_7_0/common/RisikoNatPersonType.java | 501 --------- .../SchadenObjektSpezifikationType.java | 94 -- .../r1_7_0/common/SelbstbehaltType.java | 151 --- .../r1_7_0/common/ServiceFault.java | 156 --- .../r1_7_0/common/SicherstellungType.java | 121 --- .../omds3Types/r1_7_0/common/StatusType.java | 55 - .../r1_7_0/common/TechnicalKeyValueType.java | 92 -- .../r1_7_0/common/TechnischesObjektType.java | 32 - .../r1_7_0/common/TreuhaenderfrageType.java | 84 -- .../r1_7_0/common/UploadDokumentType.java | 143 --- .../common/VerkaufsproduktGenerischType.java | 162 --- .../r1_7_0/common/VerkaufsproduktType.java | 224 ----- .../r1_7_0/common/VerpfaendungType.java | 73 -- .../common/VersicherteLiegenschaftType.java | 138 --- .../r1_7_0/common/VersichertePersonType.java | 96 -- .../common/VersicherteVeranstaltungType.java | 36 - ...rtesInteresseMitAttributMetadatenType.java | 85 -- .../common/VersichertesInteresseType.java | 67 -- .../common/VersicherungssteuerType.java | 123 --- .../r1_7_0/common/VertragspersonType.java | 88 -- .../r1_7_0/common/VinkularglaeubigerType.java | 176 ---- .../common/VinkulierungPersonenType.java | 66 -- .../r1_7_0/common/VinkulierungType.java | 65 -- .../r1_7_0/common/VorversicherungType.java | 129 --- .../common/VorversicherungenDetailType.java | 191 ---- .../common/VorversicherungenImplType.java | 73 -- .../r1_7_0/common/VorversicherungenType.java | 38 - .../r1_7_0/common/ZahlungsdatenType.java | 148 --- .../r1_7_0/common/ZahlwegImplType.java | 210 ---- .../omds3Types/r1_7_0/common/ZahlwegType.java | 36 - .../r1_7_0/common/ZeitraumType.java | 88 -- .../r1_7_0/common/ZulassungsdatenType.java | 120 --- ...ZusaetzlicheElementarproduktdatenType.java | 32 - .../common/ZusaetzlicheFondsdatenType.java | 30 - .../common/ZusaetzlicheProduktdatenType.java | 32 - .../common/ZusaetzlicheRisikodatenType.java | 32 - .../ZusaetzlicheVerkaufproduktdatenType.java | 32 - ...ZusaetzlicheVorversicherungsdatenType.java | 32 - .../ZusaetzlicheZusatzproduktdatenType.java | 32 - .../common/ZusatzproduktGenerischType.java | 183 ---- .../r1_7_0/common/ZusatzproduktType.java | 108 -- .../r1_7_0/common/package-info.java | 2 - .../AbstractStateChangeEventType.java | 36 - .../AbstractStatusGeschaeftsfallType.java | 36 - .../AddDocToBusinessCaseRequestType.java | 122 --- .../AddDocToBusinessCaseResponseType.java | 79 -- .../r1_7_0/on1basis/CreateFormRequest.java | 102 -- .../r1_7_0/on1basis/CreateFormResponse.java | 68 -- .../r1_7_0/on1basis/CredentialsType.java | 32 - .../on1basis/DeclareEndpointRequestType.java | 183 ---- .../on1basis/DeclareEndpointResponseType.java | 99 -- .../DeclareStateChangesRequestType.java | 71 -- .../DeclareStateChangesResponseType.java | 32 - .../DocumentInfosResponseResultType.java | 165 --- .../GetDocumentsOfObjectRequestType.java | 272 ----- .../GetDocumentsOfObjectResponseType.java | 100 -- .../GetDocumentsOfPeriodRequestType.java | 272 ----- .../GetDocumentsOfPeriodResponseType.java | 100 -- .../on1basis/GetElementListRequest.java | 95 -- .../on1basis/GetElementListResponse.java | 161 --- .../GetNumberOfDocumentsRequestType.java | 179 ---- .../GetNumberOfDocumentsResponseType.java | 96 -- .../on1basis/GetStateChangesRequestType.java | 70 -- .../on1basis/GetStateChangesResponseType.java | 74 -- .../on1basis/GetStateSignaturesRequest.java | 68 -- .../on1basis/GetStateSignaturesResponse.java | 74 -- .../r1_7_0/on1basis/ObjectFactory.java | 461 --------- .../on1basis/ProzessDokumentStatusType.java | 188 ---- .../SecurityContextTokenRequestType.java | 64 -- .../SecurityContextTokenResponseType.java | 115 --- .../r1_7_0/on1basis/StateChangeEventType.java | 270 ----- .../on1basis/StatusAntragsGeschaeftsfall.java | 58 -- .../r1_7_0/on1basis/SubmitFormRequest.java | 68 -- .../r1_7_0/on1basis/SubmitFormResponse.java | 68 -- .../on1basis/UnderwriteDocumentRequest.java | 104 -- .../on1basis/UnderwriteDocumentResponse.java | 104 -- .../UsernamePasswordCredentialsType.java | 87 -- .../r1_7_0/on1basis/package-info.java | 2 - .../common/BOAProcessRequestType.java | 110 -- .../common/BOAProcessResponseType.java | 110 -- .../common/CalculateRequestGenType.java | 71 -- .../common/CalculateRequestType.java | 64 -- .../common/CalculateResponseGenType.java | 47 - .../common/CalculateResponseType.java | 40 - .../CreateApplicationRequestGenType.java | 71 -- .../common/CreateApplicationRequestType.java | 80 -- .../CreateApplicationResponseGenType.java | 47 - .../common/CreateApplicationResponseType.java | 171 ---- .../common/CreateOfferRequestGenType.java | 71 -- .../common/CreateOfferRequestType.java | 40 - .../common/CreateOfferResponseGenType.java | 47 - .../common/CreateOfferResponseType.java | 114 --- .../common/FetchPolicyRequestType.java | 95 -- .../common/FetchPolicyResponseType.java | 72 -- .../GetApplicationDocumentRequestType.java | 67 -- .../GetApplicationDocumentResponseType.java | 68 -- .../on2antrag/common/ObjectFactory.java | 119 --- .../on2antrag/common/SpezAntragBasisType.java | 531 ---------- .../common/SpezAntragPersonenType.java | 159 --- .../on2antrag/common/SpezAntragType.java | 120 --- .../on2antrag/common/SpezBerechnungType.java | 87 -- .../on2antrag/common/SpezOffertType.java | 138 --- .../on2antrag/common/SpezVertragType.java | 321 ------ .../common/StartPolicyChangeRequest.java | 75 -- .../common/StartPolicyChangeResponse.java | 67 -- .../SubmitApplicationRequestGenType.java | 71 -- .../common/SubmitApplicationRequestType.java | 143 --- .../SubmitApplicationResponseGenType.java | 47 - .../common/SubmitApplicationResponseType.java | 163 --- .../common/ZusaetzlicheAntragsdatenType.java | 32 - .../common/ZusaetzlicheVertragsdatenType.java | 32 - .../r1_7_0/on2antrag/common/package-info.java | 2 - .../on2antrag/kfz/ArtBesichtigungType.java | 57 -- .../on2antrag/kfz/AssistanceKfzType.java | 34 - .../kfz/CalculateKfzRequestType.java | 67 -- .../kfz/CalculateKfzResponseType.java | 95 -- .../kfz/CreateApplicationKfzRequestType.java | 67 -- .../kfz/CreateApplicationKfzResponseType.java | 67 -- .../kfz/CreateOfferKfzRequestType.java | 67 -- .../kfz/CreateOfferKfzResponseType.java | 100 -- .../kfz/ElementarproduktKfzType.java | 103 -- .../on2antrag/kfz/FetchPolicyKfzResponse.java | 85 -- .../kfz/FzZustandBesichtigungType.java | 295 ------ .../on2antrag/kfz/HaftpflichtKfzType.java | 211 ---- .../on2antrag/kfz/InsassenUnfallKfzType.java | 68 -- .../kfz/InsassenUnfallSystemType.java | 63 -- .../r1_7_0/on2antrag/kfz/KaskoKfzType.java | 264 ----- .../on2antrag/kfz/LenkerUnfallKfzType.java | 34 - .../r1_7_0/on2antrag/kfz/ObjectFactory.java | 386 ------- .../kfz/ProduktKfzRechtsschutzType.java | 66 -- .../r1_7_0/on2antrag/kfz/ProduktKfzType.java | 198 ---- .../on2antrag/kfz/SchaedenAmFahrzeugType.java | 51 - .../kfz/SchaedenAnScheibenKleinglasType.java | 51 - .../on2antrag/kfz/SpezAntragKfzType.java | 153 --- .../on2antrag/kfz/SpezBerechnungKfzType.java | 67 -- .../on2antrag/kfz/SpezOffertKfzType.java | 71 -- .../on2antrag/kfz/SpezVertragKfzType.java | 153 --- .../kfz/SubmitApplicationKfzRequestType.java | 67 -- .../kfz/SubmitApplicationKfzResponseType.java | 67 -- .../on2antrag/kfz/TeilkaskoKfzType.java | 58 -- .../kfz/UpsellingKfzResponseType.java | 71 -- .../on2antrag/kfz/VarianteLeihwagenType.java | 48 - .../on2antrag/kfz/VerkaufsproduktKfzType.java | 237 ----- .../kfz/VerkehrsrechtsschutzKfzType.java | 35 - .../on2antrag/kfz/VollkaskoKfzType.java | 94 -- .../kfz/VorversicherungenKfzType.java | 165 --- .../on2antrag/kfz/WechselkennzeichenType.java | 127 --- .../kfz/ZusaetzlicheAntragsdatenKfzType.java | 32 - .../kfz/ZusaetzlicheKfzdatenType.java | 270 ----- .../on2antrag/kfz/ZusatzproduktKfzType.java | 39 - .../r1_7_0/on2antrag/kfz/package-info.java | 2 - .../sachPrivat/AntragSachPrivatType.java | 67 -- .../sachPrivat/BerechnungSachPrivatType.java | 67 -- .../CalculateSachPrivatRequestType.java | 67 -- .../CalculateSachPrivatResponseType.java | 95 -- ...reateApplicationSachPrivatRequestType.java | 67 -- ...eateApplicationSachPrivatResponseType.java | 67 -- .../CreateOfferSachPrivatRequestType.java | 67 -- .../CreateOfferSachPrivatResponseType.java | 67 -- .../ElementarproduktGebaeudeType.java | 38 - .../ElementarproduktHaushaltType.java | 38 - .../ElementarproduktSachPrivatType.java | 281 ------ .../GenElementarproduktGebaeudeType.java | 66 -- .../GenElementarproduktHaushaltType.java | 66 -- .../sachPrivat/NebengebaeudeType.java | 99 -- .../on2antrag/sachPrivat/ObjectFactory.java | 367 ------- .../sachPrivat/OffertSachPrivatType.java | 67 -- .../ProduktGebaeudeversicherungType.java | 73 -- .../ProduktHaushaltsversicherungType.java | 73 -- .../sachPrivat/ProduktSachPrivatType.java | 81 -- .../sachPrivat/RisikoAdresseType.java | 181 ---- .../sachPrivat/RisikoGebaeudeType.java | 427 -------- .../sachPrivat/RisikoHaushaltType.java | 152 --- .../sachPrivat/RisikoVorschaedenType.java | 54 - ...ubmitApplicationSachPrivatRequestType.java | 67 -- ...bmitApplicationSachPrivatResponseType.java | 67 -- .../UpsellingSachPrivatResponseType.java | 32 - .../VerkaufsproduktSachPrivatType.java | 172 ---- .../VersichertesObjektSachPrivatType.java | 159 --- ...etzlicheGebaeudedatenPhotovoltaikType.java | 36 - ...saetzlicheGebaeudedatenSchwimmbadType.java | 36 - ...etzlicheGebaeudedatenSolarthermieType.java | 36 - .../ZusaetzlicheGebaeudedatenType.java | 39 - ...etzlicheGebaeudedatenWintergartenType.java | 36 - .../ZusaetzlicheHaushaltsdatenType.java | 32 - .../on2antrag/sachPrivat/package-info.java | 2 - .../r1_7_0/on7schaden/BasisSchadenType.java | 395 -------- .../on7schaden/BasisSchadenereignisType.java | 339 ------- .../on7schaden/BelegeinreichungRequest.java | 189 ---- .../on7schaden/BelegeinreichungResponse.java | 35 - .../on7schaden/BeteiligtePersonType.java | 87 -- .../on7schaden/CheckClaimRequestType.java | 103 -- .../on7schaden/CheckClaimResponseType.java | 67 -- .../on7schaden/CheckCoverageRequest.java | 226 ----- .../on7schaden/CheckCoverageResponse.java | 320 ------ .../on7schaden/DeckungsauskunftRequest.java | 165 --- .../on7schaden/DeckungsauskunftResponse.java | 259 ----- .../r1_7_0/on7schaden/GeokoordinatenType.java | 87 -- .../GeschaedigtesInteresseType.java | 97 -- .../GeschaedigtesObjektImmobilieType.java | 128 --- .../GeschaedigtesObjektKfzType.java | 351 ------- .../on7schaden/GetClaimRequestType.java | 155 --- .../on7schaden/GetClaimResponseType.java | 67 -- .../r1_7_0/on7schaden/NatPersonType.java | 117 --- .../r1_7_0/on7schaden/ObjectFactory.java | 426 -------- .../omds3Types/r1_7_0/on7schaden/OrtType.java | 121 --- ...eferenzAufBeteiligtePersonSchadenType.java | 91 -- .../r1_7_0/on7schaden/SachbearbVUType.java | 100 -- .../r1_7_0/on7schaden/SchadenLightType.java | 94 -- .../r1_7_0/on7schaden/SchadenType.java | 415 -------- .../on7schaden/SchadenereignisLightType.java | 73 -- .../on7schaden/SchadenereignisType.java | 263 ----- .../r1_7_0/on7schaden/SchadenmelderType.java | 32 - .../SchadenmelderVermittlerType.java | 67 -- .../on7schaden/SchadenzuordnungType.java | 148 --- .../on7schaden/SearchClaimRequestType.java | 311 ------ .../SearchClaimResponseResultType.java | 135 --- .../on7schaden/SearchClaimResponseType.java | 100 -- .../SpartendetailSchadenKfzType.java | 122 --- .../SpartendetailSchadenKrankenType.java | 199 ---- .../on7schaden/SpartendetailSchadenType.java | 38 - .../SpartendetailSchadenUnfallType.java | 154 --- .../on7schaden/SubmitClaimRequestType.java | 103 -- .../on7schaden/SubmitClaimResponseType.java | 67 -- .../on7schaden/SubmitReceiptRequest.java | 250 ----- .../on7schaden/SubmitReceiptResponse.java | 35 - ...usaetzlicheBelegeinreichungsdatenType.java | 32 - ...usaetzlicheDeckungsauskunftsdatenType.java | 32 - .../ZusaetzlicheRollendatenType.java | 32 - .../ZusaetzlicheSchadensdatenType.java | 32 - ...ZusaetzlicheSchadensereignisdatenType.java | 32 - .../r1_7_0/on7schaden/package-info.java | 2 - .../r1_7_0/service/OmdsService.java | 87 -- .../r1_7_0/service/OmdsServicePortImpl.java | 947 ------------------ .../r1_7_0/service/OmdsServicePortType.java | 419 -------- ...ervicePortType_OmdsServicePort_Client.java | 739 -------------- .../r1_7_0/service/ServiceFaultMsg.java | 43 - .../r1_7_0/servicetypes/ArcContent.java | 95 -- .../r1_7_0/servicetypes/ArcImageInfo.java | 231 ----- .../servicetypes/ArcImageInfosRequest.java | 273 ----- .../servicetypes/ArcImageInfosResponse.java | 99 -- .../r1_7_0/servicetypes/ArcImageRequest.java | 127 --- .../r1_7_0/servicetypes/ArcImageResponse.java | 93 -- .../DeepLinkBusinessObjectResponse.java | 102 -- .../servicetypes/DeepLinkClaimRequest.java | 146 --- .../servicetypes/DeepLinkOfferRequest.java | 146 --- .../servicetypes/DeepLinkPartnerRequest.java | 146 --- .../servicetypes/DeepLinkPolicyRequest.java | 146 --- .../servicetypes/HttpActionLinkType.java | 142 --- .../r1_7_0/servicetypes/LoginRequestType.java | 93 -- .../servicetypes/OMDSPackageInfoType.java | 238 ----- .../servicetypes/OMDSPackageListRequest.java | 148 --- .../servicetypes/OMDSPackageListResponse.java | 104 -- .../servicetypes/OMDSPackageRequest.java | 125 --- .../servicetypes/OMDSPackageResponse.java | 102 -- .../r1_7_0/servicetypes/ObjectFactory.java | 457 --------- .../servicetypes/PolicyPartnerRole.java | 101 -- .../servicetypes/RequestedOMDSPackage.java | 231 ----- .../r1_7_0/servicetypes/UserDataRequest.java | 62 -- .../r1_7_0/servicetypes/UserDataResponse.java | 200 ---- .../r1_7_0/servicetypes/package-info.java | 2 - .../omds/vvo/at/CalculateKrankenRequest.java | 69 -- .../omds/vvo/at/CalculateKrankenResponse.java | 69 -- .../at/CreateApplicationKrankenRequest.java | 69 -- .../at/CreateApplicationKrankenResponse.java | 69 -- .../vvo/at/CreateOfferKrankenRequest.java | 69 -- .../vvo/at/CreateOfferKrankenResponse.java | 69 -- .../vvo/at/ElementarproduktKrankenType.java | 68 -- .../types/omds/vvo/at/ObjectFactory.java | 144 --- .../types/omds/vvo/at/ProduktKrankenType.java | 103 -- .../omds/vvo/at/SpezAntragKrankenType.java | 67 -- .../vvo/at/SpezBerechnungKrankenType.java | 67 -- .../omds/vvo/at/SpezOffertKrankenType.java | 67 -- .../at/SubmitApplicationKrankenRequest.java | 69 -- .../at/SubmitApplicationKrankenResponse.java | 69 -- .../vvo/at/VerkaufsproduktKrankenType.java | 170 ---- .../types/omds/vvo/at/package-info.java | 2 - .../vvo/at/CalculateLebenRequestType.java | 67 -- .../vvo/at/CalculateLebenResponseType.java | 102 -- .../at/CreateApplicationLebenRequestType.java | 67 -- .../CreateApplicationLebenResponseType.java | 67 -- .../vvo/at/CreateOfferLebenRequestType.java | 67 -- .../vvo/at/CreateOfferLebenResponseType.java | 67 -- .../types/omds/vvo/at/ObjectFactory.java | 318 ------ .../types/omds/vvo/at/ProduktLebenType.java | 74 -- .../types/omds/vvo/at/RentenoptionType.java | 32 - .../omds/vvo/at/SpezAntragLebenType.java | 67 -- .../omds/vvo/at/SpezBerechnungLebenType.java | 67 -- .../omds/vvo/at/SpezOffertLebenType.java | 67 -- .../at/SubmitApplicationLebenRequestType.java | 67 -- .../SubmitApplicationLebenResponseType.java | 67 -- .../types/omds/vvo/at/TarifLebenType.java | 164 --- .../omds/vvo/at/VerkaufsproduktLebenType.java | 172 ---- .../VersicherungssummeZusatzbausteinType.java | 94 -- .../types/omds/vvo/at/WartefristType.java | 32 - .../omds/vvo/at/ZusatzproduktLebenType.java | 32 - ...atzversicherungBerufsunfaehigkeitType.java | 66 -- ...tzversicherungErwerbsunfaehigkeitType.java | 66 -- .../vvo/at/ZusatzversicherungLebenType.java | 43 - ...icherungPraemienuebernahmeAblebenType.java | 66 -- ...atzversicherungUnfallinvaliditaetType.java | 84 -- .../at/ZusatzversicherungUnfalltodType.java | 84 -- .../types/omds/vvo/at/package-info.java | 2 - .../omds/vvo/at/CollectionChangeRequest.java | 192 ---- .../omds/vvo/at/CollectionChangeResponse.java | 156 --- .../vvo/at/CollectionRhythmChangeRequest.java | 127 --- .../at/CollectionRhythmChangeResponse.java | 183 ---- .../vvo/at/CollectionRhythmInfoRequest.java | 68 -- .../vvo/at/CollectionRhythmInfoResponse.java | 134 --- .../at/GetPoliciesOfPartnerRequestType.java | 97 -- .../at/GetPoliciesOfPartnerResponseType.java | 85 -- .../types/omds/vvo/at/ObjectFactory.java | 187 ---- .../types/omds/vvo/at/PraemienInfoType.java | 92 -- .../vvo/at/SetMailingAddressRequestType.java | 128 --- .../vvo/at/SetMailingAddressResponseType.java | 126 --- .../types/omds/vvo/at/ZahlwegType.java | 418 -------- .../types/omds/vvo/at/package-info.java | 2 - .../at/AddCommunicationObjectRequestType.java | 143 --- .../AddCommunicationObjectResponseType.java | 68 -- .../ChangeCommunicationObjectRequestType.java | 184 ---- .../at/ChangeCommunicationObjectResponse.java | 34 - ...ChangeCommunicationObjectResponseType.java | 72 -- .../ChangePartnerMainAddressRequestType.java | 341 ------- .../ChangePartnerMainAddressResponseType.java | 166 --- .../vvo/at/ChangePersonDataRequestType.java | 223 ----- .../vvo/at/ChangePersonDataResponseType.java | 198 ---- .../omds/vvo/at/CheckAddressRequestType.java | 68 -- .../omds/vvo/at/CheckAddressResponseType.java | 103 -- .../DeleteCommunicationObjectRequestType.java | 143 --- ...DeleteCommunicationObjectResponseType.java | 68 -- .../omds/vvo/at/GetPartnerRequestType.java | 97 -- .../omds/vvo/at/GetPartnerResponseType.java | 68 -- .../types/omds/vvo/at/ObjectFactory.java | 322 ------ .../types/omds/vvo/at/package-info.java | 2 - .../types/omds/vvo/at/FinderRequestType.java | 103 -- .../types/omds/vvo/at/FinderResponseType.java | 39 - .../types/omds/vvo/at/ObjectFactory.java | 103 -- .../vvo/at/ProduktFinderResponseType.java | 211 ---- .../at/VerkaufsproduktFinderRequestType.java | 66 -- .../at/VerkaufsproduktFinderResponseType.java | 350 ------- .../types/omds/vvo/at/package-info.java | 2 - .../vvo/at/CalculateRechtsschutzRequest.java | 67 -- .../vvo/at/CalculateRechtsschutzResponse.java | 67 -- .../CreateApplicationRechtsschutzRequest.java | 67 -- ...CreateApplicationRechtsschutzResponse.java | 67 -- .../at/CreateOfferRechtsschutzRequest.java | 67 -- .../at/CreateOfferRechtsschutzResponse.java | 67 -- .../at/ElementarproduktRechtsschutzType.java | 76 -- .../types/omds/vvo/at/ObjectFactory.java | 144 --- .../omds/vvo/at/ProduktRechtsschutzType.java | 109 -- .../vvo/at/SpezAntragRechtsschutzType.java | 67 -- .../at/SpezBerechnungRechtsschutzType.java | 67 -- .../vvo/at/SpezOffertRechtsschutzType.java | 67 -- .../SubmitApplicationRechtsschutzRequest.java | 67 -- ...SubmitApplicationRechtsschutzResponse.java | 67 -- .../at/VerkaufsproduktRechtsschutzType.java | 142 --- .../types/omds/vvo/at/package-info.java | 2 - .../vvo/at/CalculateUnfallRequestType.java | 67 -- .../vvo/at/CalculateUnfallResponseType.java | 67 -- .../CreateApplicationUnfallRequestType.java | 67 -- .../CreateApplicationUnfallResponseType.java | 67 -- .../vvo/at/CreateOfferUnfallRequestType.java | 67 -- .../vvo/at/CreateOfferUnfallResponseType.java | 67 -- .../omds/vvo/at/LeistungsartUnfallType.java | 68 -- .../types/omds/vvo/at/ObjectFactory.java | 227 ----- .../types/omds/vvo/at/ProduktUnfallType.java | 103 -- .../omds/vvo/at/SpezAntragUnfallType.java | 67 -- .../omds/vvo/at/SpezBerechnungUnfallType.java | 67 -- .../omds/vvo/at/SpezOffertUnfallType.java | 67 -- .../SubmitApplicationUnfallRequestType.java | 67 -- .../SubmitApplicationUnfallResponseType.java | 67 -- .../vvo/at/VerkaufsproduktUnfallType.java | 172 ---- .../types/omds/vvo/at/package-info.java | 2 - .../def/r1_7_0/ReleaseNotes-1-7-0.txt | 15 +- .../def/r1_7_0/omds3CommonServiceTypes.xsd | 13 +- .../resources/def/r1_7_0/omds3Services.wsdl | 541 +--------- .../def/r1_7_0/omds3ServicesBroker.wsdl | 174 ---- .../def/r1_7_0/omds3_ON2_Antrag_Common.xsd | 73 -- .../def/r1_7_0/omds3_ON2_Antrag_Kfz.xsd | 23 - .../def/r1_7_0/omds3_ON2_Antrag_Kranken.xsd | 245 ----- .../r1_7_0/omds3_ON2_Antrag_Produktfinder.xsd | 117 --- .../r1_7_0/omds3_ON2_Antrag_Rechtsschutz.xsd | 240 ----- .../def/r1_7_0/omds3_ON3_Vertrag.xsd | 296 ------ .../def/r1_7_0/omds3_ON4_Partner.xsd | 377 ------- .../def/r1_7_0/omds3_ON7_Schaden.xsd | 146 --- .../def/r1_7_0/omds3_ON7_SchadenErg.xsd | 308 ------ 531 files changed, 334 insertions(+), 61434 deletions(-) delete mode 100644 OMDSServiceDefinition/.classpath delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AListenAttributType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ASingleAttributType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AbgelehnteRisikenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AbstraktesEreignisStatusAenderungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AbtretungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AdresseArtCdType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AdresseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AgentFilterType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AntragsartType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributDatumType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributDezimalType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributDoubleType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributEnumType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributIntType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenDatumType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenDezimalType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenEnumType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenIntType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenStringType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMsgType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMultiEnumType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributStringType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AuthorizationFilter.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungAsyncType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsAnforderungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartClientsidePhysischeUnterschrift.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartClientsideType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartPhysischeUnterschrift.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartServersideType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BankverbindungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BasisProduktbausteinType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BerechnungsvarianteType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BeteiligtePersonVertragType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungGesetzlicheErbenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungIndividuell.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungNamentlich.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungTestamentarischeErbenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungUeberbringerType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungVersichertePersonType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungVersicherungsnehmerType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsrechtType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BonusMalusSystemType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BonusMalusVorversicherungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonProcessRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonProcessResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonSearchRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonSearchResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DateianhangType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DatenverwendungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DirectionCdType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentBinaryDataType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentDataType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentFormDataType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentInfoType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentenReferenzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EintragSchluessellisteType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EinwGesDatenVNType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EinwSprachaufzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EinwVerarbGesDatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EinwilligungPersDatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EinwilligungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ElementFondsauswahlType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ElementIdType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ElementarproduktGenerischType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ElementarproduktType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ErsatzpolizzeMitAendGrundType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ErsatzpolizzeType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ErsatzpolizzenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/FATCANatPersonType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/FATCASonstPersonType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/FATCAType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/FahrzeugType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/Formular.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/FormularfrageType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/GMSGType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/GeschaeftsobjektArtType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/GlaeubigerSicherstellungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/KontierungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/KostenFixOderProzentType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/KreditkarteType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/LegitimationType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ObjectFactory.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ObjektIdType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ObjektSpezifikationType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/OffeneSchaedenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/OffenerSchadenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PEPType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PartnerRoleType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PersBankverbindungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PersonNamentlichesBezugsrechtType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PersonType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PfandglaeubigerType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PolizzenObjektSpezifikationType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PolizzenversandType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PraemieType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktGenerischType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktMitVpType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktbausteinGenerischType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktbausteinType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokAnforderung.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokFuerKunde.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokFuerKundeZumUnterschreiben.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokHandoutType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokRequirementType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokToSignType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokumentBasisType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokumentType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/RaucherType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/Referenz.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ResponseStatusType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/RisikoNatPersonType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/SchadenObjektSpezifikationType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/SelbstbehaltType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ServiceFault.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/SicherstellungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/StatusType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/TechnicalKeyValueType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/TechnischesObjektType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/TreuhaenderfrageType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/UploadDokumentType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VerkaufsproduktGenerischType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VerkaufsproduktType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VerpfaendungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersicherteLiegenschaftType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersichertePersonType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersicherteVeranstaltungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersichertesInteresseMitAttributMetadatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersichertesInteresseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersicherungssteuerType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VertragspersonType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VinkularglaeubigerType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VinkulierungPersonenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VinkulierungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VorversicherungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VorversicherungenDetailType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VorversicherungenImplType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VorversicherungenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZahlungsdatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZahlwegImplType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZahlwegType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZeitraumType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZulassungsdatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheElementarproduktdatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheFondsdatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheProduktdatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheRisikodatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheVerkaufproduktdatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheVorversicherungsdatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheZusatzproduktdatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusatzproduktGenerischType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusatzproduktType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/package-info.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/AbstractStateChangeEventType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/AbstractStatusGeschaeftsfallType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/AddDocToBusinessCaseRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/AddDocToBusinessCaseResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/CreateFormRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/CreateFormResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/CredentialsType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/DeclareEndpointRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/DeclareEndpointResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/DeclareStateChangesRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/DeclareStateChangesResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/DocumentInfosResponseResultType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetDocumentsOfObjectRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetDocumentsOfObjectResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetDocumentsOfPeriodRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetDocumentsOfPeriodResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetElementListRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetElementListResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetNumberOfDocumentsRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetNumberOfDocumentsResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetStateChangesRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetStateChangesResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetStateSignaturesRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetStateSignaturesResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/ObjectFactory.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/ProzessDokumentStatusType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/SecurityContextTokenRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/SecurityContextTokenResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/StateChangeEventType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/StatusAntragsGeschaeftsfall.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/SubmitFormRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/SubmitFormResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/UnderwriteDocumentRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/UnderwriteDocumentResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/UsernamePasswordCredentialsType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/package-info.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/BOAProcessRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/BOAProcessResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateRequestGenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateResponseGenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationRequestGenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationResponseGenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferRequestGenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferResponseGenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/FetchPolicyRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/FetchPolicyResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/GetApplicationDocumentRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/GetApplicationDocumentResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/ObjectFactory.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezAntragBasisType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezAntragPersonenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezAntragType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezBerechnungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezOffertType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezVertragType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/StartPolicyChangeRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/StartPolicyChangeResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationRequestGenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationResponseGenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/ZusaetzlicheAntragsdatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/ZusaetzlicheVertragsdatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/package-info.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ArtBesichtigungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/AssistanceKfzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CalculateKfzRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CalculateKfzResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CreateApplicationKfzRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CreateApplicationKfzResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CreateOfferKfzRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CreateOfferKfzResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ElementarproduktKfzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/FetchPolicyKfzResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/FzZustandBesichtigungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/HaftpflichtKfzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/InsassenUnfallKfzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/InsassenUnfallSystemType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/KaskoKfzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/LenkerUnfallKfzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ObjectFactory.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ProduktKfzRechtsschutzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ProduktKfzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SchaedenAmFahrzeugType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SchaedenAnScheibenKleinglasType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SpezAntragKfzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SpezBerechnungKfzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SpezOffertKfzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SpezVertragKfzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SubmitApplicationKfzRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SubmitApplicationKfzResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/TeilkaskoKfzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/UpsellingKfzResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VarianteLeihwagenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VerkaufsproduktKfzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VerkehrsrechtsschutzKfzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VollkaskoKfzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VorversicherungenKfzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/WechselkennzeichenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ZusaetzlicheAntragsdatenKfzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ZusaetzlicheKfzdatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ZusatzproduktKfzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/package-info.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/AntragSachPrivatType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/BerechnungSachPrivatType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CalculateSachPrivatRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CalculateSachPrivatResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CreateApplicationSachPrivatRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CreateApplicationSachPrivatResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CreateOfferSachPrivatRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CreateOfferSachPrivatResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ElementarproduktGebaeudeType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ElementarproduktHaushaltType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ElementarproduktSachPrivatType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/GenElementarproduktGebaeudeType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/GenElementarproduktHaushaltType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/NebengebaeudeType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ObjectFactory.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/OffertSachPrivatType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ProduktGebaeudeversicherungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ProduktHaushaltsversicherungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ProduktSachPrivatType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/RisikoAdresseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/RisikoGebaeudeType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/RisikoHaushaltType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/RisikoVorschaedenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/SubmitApplicationSachPrivatRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/SubmitApplicationSachPrivatResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/UpsellingSachPrivatResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/VerkaufsproduktSachPrivatType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/VersichertesObjektSachPrivatType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheGebaeudedatenPhotovoltaikType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheGebaeudedatenSchwimmbadType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheGebaeudedatenSolarthermieType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheGebaeudedatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheGebaeudedatenWintergartenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheHaushaltsdatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/package-info.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/BasisSchadenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/BasisSchadenereignisType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/BelegeinreichungRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/BelegeinreichungResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/BeteiligtePersonType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/CheckClaimRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/CheckClaimResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/CheckCoverageRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/CheckCoverageResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/DeckungsauskunftRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/DeckungsauskunftResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GeokoordinatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GeschaedigtesInteresseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GeschaedigtesObjektImmobilieType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GeschaedigtesObjektKfzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GetClaimRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GetClaimResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/NatPersonType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ObjectFactory.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/OrtType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ReferenzAufBeteiligtePersonSchadenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SachbearbVUType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenLightType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenereignisLightType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenereignisType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenmelderType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenmelderVermittlerType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenzuordnungType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SearchClaimRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SearchClaimResponseResultType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SearchClaimResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SpartendetailSchadenKfzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SpartendetailSchadenKrankenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SpartendetailSchadenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SpartendetailSchadenUnfallType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SubmitClaimRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SubmitClaimResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SubmitReceiptRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SubmitReceiptResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ZusaetzlicheBelegeinreichungsdatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ZusaetzlicheDeckungsauskunftsdatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ZusaetzlicheRollendatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ZusaetzlicheSchadensdatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ZusaetzlicheSchadensereignisdatenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/package-info.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/OmdsService.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/OmdsServicePortImpl.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/OmdsServicePortType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/OmdsServicePortType_OmdsServicePort_Client.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/ServiceFaultMsg.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcContent.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcImageInfo.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcImageInfosRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcImageInfosResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcImageRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcImageResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/DeepLinkBusinessObjectResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/DeepLinkClaimRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/DeepLinkOfferRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/DeepLinkPartnerRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/DeepLinkPolicyRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/HttpActionLinkType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/LoginRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/OMDSPackageInfoType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/OMDSPackageListRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/OMDSPackageListResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/OMDSPackageRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/OMDSPackageResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ObjectFactory.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/PolicyPartnerRole.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/RequestedOMDSPackage.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/UserDataRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/UserDataResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/package-info.java delete mode 100644 OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CalculateKrankenRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CalculateKrankenResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CreateApplicationKrankenRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CreateApplicationKrankenResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CreateOfferKrankenRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CreateOfferKrankenResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/ElementarproduktKrankenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/ObjectFactory.java delete mode 100644 OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/ProduktKrankenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/SpezAntragKrankenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/SpezBerechnungKrankenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/SpezOffertKrankenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/SubmitApplicationKrankenRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/SubmitApplicationKrankenResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/VerkaufsproduktKrankenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/package-info.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CalculateLebenRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CalculateLebenResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CreateApplicationLebenRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CreateApplicationLebenResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CreateOfferLebenRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CreateOfferLebenResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ObjectFactory.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ProduktLebenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/RentenoptionType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/SpezAntragLebenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/SpezBerechnungLebenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/SpezOffertLebenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/SubmitApplicationLebenRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/SubmitApplicationLebenResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/TarifLebenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/VerkaufsproduktLebenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/VersicherungssummeZusatzbausteinType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/WartefristType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzproduktLebenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungBerufsunfaehigkeitType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungErwerbsunfaehigkeitType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungLebenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungPraemienuebernahmeAblebenType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungUnfallinvaliditaetType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungUnfalltodType.java delete mode 100644 OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/package-info.java delete mode 100644 OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionChangeRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionChangeResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionRhythmChangeRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionRhythmChangeResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionRhythmInfoRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionRhythmInfoResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/GetPoliciesOfPartnerRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/GetPoliciesOfPartnerResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/ObjectFactory.java delete mode 100644 OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/PraemienInfoType.java delete mode 100644 OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/SetMailingAddressRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/SetMailingAddressResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/ZahlwegType.java delete mode 100644 OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/package-info.java delete mode 100644 OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/AddCommunicationObjectRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/AddCommunicationObjectResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangeCommunicationObjectRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangeCommunicationObjectResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangeCommunicationObjectResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangePartnerMainAddressRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangePartnerMainAddressResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangePersonDataRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangePersonDataResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/CheckAddressRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/CheckAddressResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/DeleteCommunicationObjectRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/DeleteCommunicationObjectResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/GetPartnerRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/GetPartnerResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ObjectFactory.java delete mode 100644 OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/package-info.java delete mode 100644 OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/FinderRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/FinderResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/ObjectFactory.java delete mode 100644 OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/ProduktFinderResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/VerkaufsproduktFinderRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/VerkaufsproduktFinderResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/package-info.java delete mode 100644 OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CalculateRechtsschutzRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CalculateRechtsschutzResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateApplicationRechtsschutzRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateApplicationRechtsschutzResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateOfferRechtsschutzRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateOfferRechtsschutzResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/ElementarproduktRechtsschutzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/ObjectFactory.java delete mode 100644 OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/ProduktRechtsschutzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezAntragRechtsschutzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezBerechnungRechtsschutzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezOffertRechtsschutzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SubmitApplicationRechtsschutzRequest.java delete mode 100644 OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SubmitApplicationRechtsschutzResponse.java delete mode 100644 OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/VerkaufsproduktRechtsschutzType.java delete mode 100644 OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/package-info.java delete mode 100644 OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CalculateUnfallRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CalculateUnfallResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateApplicationUnfallRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateApplicationUnfallResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateOfferUnfallRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateOfferUnfallResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/LeistungsartUnfallType.java delete mode 100644 OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/ObjectFactory.java delete mode 100644 OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/ProduktUnfallType.java delete mode 100644 OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezAntragUnfallType.java delete mode 100644 OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezBerechnungUnfallType.java delete mode 100644 OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezOffertUnfallType.java delete mode 100644 OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SubmitApplicationUnfallRequestType.java delete mode 100644 OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SubmitApplicationUnfallResponseType.java delete mode 100644 OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/VerkaufsproduktUnfallType.java delete mode 100644 OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/package-info.java delete mode 100644 OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3ServicesBroker.wsdl delete mode 100644 OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Kranken.xsd delete mode 100644 OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Produktfinder.xsd delete mode 100644 OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Rechtsschutz.xsd delete mode 100644 OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON3_Vertrag.xsd delete mode 100644 OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON4_Partner.xsd delete mode 100644 OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON7_SchadenErg.xsd diff --git a/OMDSServiceDefinition/.classpath b/OMDSServiceDefinition/.classpath deleted file mode 100644 index de003db3..00000000 --- a/OMDSServiceDefinition/.classpath +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OMDSServiceDefinition/Maven_CodeGen_ReadMe.txt b/OMDSServiceDefinition/Maven_CodeGen_ReadMe.txt index 10ab3147..fb108680 100644 --- a/OMDSServiceDefinition/Maven_CodeGen_ReadMe.txt +++ b/OMDSServiceDefinition/Maven_CodeGen_ReadMe.txt @@ -1,4 +1,9 @@ +Build mit Maven +=============== +Build mit Maven 3.8 auf Java 1.8 + Maven Goals +=========== Mit Maven Goal "clean package" kann ein Release als ZIP-File mit XSDs und WSDLs sowie der Dokumentation gebaut werden. Mit Maven Goal "clean deploy" wird der Release in das Kap Dion- Maven - OMDS Repository hochgeladen. diff --git a/OMDSServiceDefinition/pom.xml b/OMDSServiceDefinition/pom.xml index 2a8aa087..1cff10d2 100644 --- a/OMDSServiceDefinition/pom.xml +++ b/OMDSServiceDefinition/pom.xml @@ -17,20 +17,25 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs omds3Services.wsdl /src/main/resources/bind/${currentReleaseDir} - ${basedir}/src/main/java - ${basedir}${bindings.location.rel} + ${basedir}/src/main/java + ${basedir}${bindings.location.rel} src/main/resources/def/${currentReleaseDir}/${wsdl.name} - 1.7 - ${jdk.version} - ${jdk.version} + 1.8 + ${jdk.version} + ${jdk.version} - 3.2.0 + 3.5.0 + + org.apache.cxf + cxf-codegen-plugin + ${cxf.version} + org.apache.maven.plugins maven-help-plugin @@ -152,64 +157,113 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs - + + + + + + org.apache.cxf + cxf-rt-frontend-simple + ${cxf.version} + + + + org.apache.cxf + cxf-rt-frontend-jaxws + ${cxf.version} + + + + org.apache.cxf + cxf-rt-bindings-soap + ${cxf.version} + + + + org.apache.cxf + cxf-rt-transports-http + ${cxf.version} + + + + org.apache.cxf + cxf-rt-transports-http-jetty + ${cxf.version} + + + + org.apache.cxf + cxf-rt-ws-security + ${cxf.version} + + + + org.apache.cxf + cxf-rt-features-logging + ${cxf.version} + + + + + junit + junit + 3.8.2 + test + + + org.apache.cxf cxf-rt-frontend-simple - ${cxf.version} - + org.apache.cxf cxf-rt-frontend-jaxws - ${cxf.version} + org.apache.cxf cxf-rt-bindings-soap - ${cxf.version} + org.apache.cxf cxf-rt-transports-http - ${cxf.version} org.apache.cxf cxf-rt-transports-http-jetty - ${cxf.version} org.apache.cxf cxf-rt-ws-security - ${cxf.version} org.apache.cxf cxf-rt-features-logging - ${cxf.version} - - log4j - log4j - 1.2.12 - + + + + + + - - junit - junit - 3.8.2 - test - + + + + + @@ -245,12 +299,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs - - org.apache.cxf cxf-codegen-plugin - ${cxf.version} -Djavax.xml.accessExternalSchema=all @@ -266,7 +317,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs true - + ${bindings.location}/omds20Types_binding.xml ${bindings.location}/omdsServiceTypes_binding.xml ${bindings.location}/omdsCommonServiceTypes_binding.xml @@ -274,16 +325,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs ${bindings.location}/omds3_ON2_Antrag_Common_binding.xml ${bindings.location}/omds3_ON2_Antrag_Kfz_binding.xml ${bindings.location}/omds3_ON2_Antrag_SachPrivat_binding.xml - - - - - - - - ${bindings.location}/omds3_ON7_Schaden_binding.xml + ${bindings.location}/omds3_ON2_Antrag_Unfall_binding.xml + ${bindings.location}/omds3_ON2_Antrag_Leben_binding.xml + ${bindings.location}/omds3_ON7_Schaden_binding.xml ${bindings.location}/${wsdl.binding.xml} - @@ -324,7 +369,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.apache.cxf cxf-codegen-plugin - ${cxf.version} -Djavax.xml.accessExternalSchema=all diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/BBArtCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/BBArtCdType.java index 71e84f3a..f33cb57a 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/BBArtCdType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/BBArtCdType.java @@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlType; *

Java-Klasse für BBArtCd_Type. * *

Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist. - *

* 

  * <simpleType name="BBArtCd_Type">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/Entsch2Type.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/Entsch2Type.java
index c76bfbd0..ad68c031 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/Entsch2Type.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/Entsch2Type.java
@@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlType;
  * 
Java-Klasse für Entsch2_Type.
  * 
  * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

  * 
  * <simpleType name="Entsch2_Type">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/EstArtCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/EstArtCdType.java
index f472ceac..93f3016a 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/EstArtCdType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/EstArtCdType.java
@@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlType;
  * 
Java-Klasse für EstArtCd_Type.
  * 
  * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

  * 
  * <simpleType name="EstArtCd_Type">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/FlaechenAttributCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/FlaechenAttributCdType.java
index b0e7afdf..2a86a6f9 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/FlaechenAttributCdType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/FlaechenAttributCdType.java
@@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlType;
  * 
Java-Klasse für FlaechenAttributCd_Type.
  * 
  * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

  * 
  * <simpleType name="FlaechenAttributCd_Type">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/GesFormCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/GesFormCdType.java
index 8f1ccdb5..edc5a807 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/GesFormCdType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/GesFormCdType.java
@@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlType;
  * 
Java-Klasse für GesFormCd_Type.
  * 
  * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

  * 
  * <simpleType name="GesFormCd_Type">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/GrwArtCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/GrwArtCdType.java
index f2d16566..0ce09880 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/GrwArtCdType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/GrwArtCdType.java
@@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlType;
  * 
Java-Klasse für GrwArtCd_Type.
  * 
  * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

  * 
  * <simpleType name="GrwArtCd_Type">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/IdfArtCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/IdfArtCdType.java
index c3f87e5e..7ba7d2e1 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/IdfArtCdType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/IdfArtCdType.java
@@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlType;
  * 
Java-Klasse für IdfArtCd_Type.
  * 
  * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

  * 
  * <simpleType name="IdfArtCd_Type">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/LoeschCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/LoeschCdType.java
index a2516ca1..754e0ae6 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/LoeschCdType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/LoeschCdType.java
@@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlType;
  * 
Java-Klasse für LoeschCd_Type.
  * 
  * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

  * 
  * <simpleType name="LoeschCd_Type">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/ObjectFactory.java
index 6cf624c1..70feca61 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/ObjectFactory.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/ObjectFactory.java
@@ -559,8 +559,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELKommunikationType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELKommunikationType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELKommunikationType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Kommunikation")
     public JAXBElement createELKommunikation(ELKommunikationType value) {
@@ -568,8 +572,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link KLAUSELType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link KLAUSELType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link KLAUSELType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "KLAUSEL")
     public JAXBElement createKLAUSEL(KLAUSELType value) {
@@ -577,8 +585,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link LOESCHANSTOSSType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link LOESCHANSTOSSType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link LOESCHANSTOSSType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "LOESCHANSTOSS")
     public JAXBElement createLOESCHANSTOSS(LOESCHANSTOSSType value) {
@@ -586,8 +598,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PERSONType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link PERSONType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link PERSONType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "PERSON")
     public JAXBElement createPERSON(PERSONType value) {
@@ -595,8 +611,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELAntragType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELAntragType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELAntragType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Antrag")
     public JAXBElement createELAntrag(ELAntragType value) {
@@ -604,8 +624,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELAnzahlType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELAnzahlType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELAnzahlType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Anzahl")
     public JAXBElement createELAnzahl(ELAnzahlType value) {
@@ -613,8 +637,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELBetragType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELBetragType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELBetragType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Betrag")
     public JAXBElement createELBetrag(ELBetragType value) {
@@ -622,8 +650,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELBezugsberechtigungType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELBezugsberechtigungType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELBezugsberechtigungType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Bezugsberechtigung")
     public JAXBElement createELBezugsberechtigung(ELBezugsberechtigungType value) {
@@ -631,8 +663,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELEinstufungType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELEinstufungType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELEinstufungType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Einstufung")
     public JAXBElement createELEinstufung(ELEinstufungType value) {
@@ -640,8 +676,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELEntscheidungsfrageType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELEntscheidungsfrageType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELEntscheidungsfrageType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Entscheidungsfrage")
     public JAXBElement createELEntscheidungsfrage(ELEntscheidungsfrageType value) {
@@ -649,8 +689,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELIdentifizierungType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELIdentifizierungType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELIdentifizierungType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Identifizierung")
     public JAXBElement createELIdentifizierung(ELIdentifizierungType value) {
@@ -658,8 +702,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELKlauselType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELKlauselType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELKlauselType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Klausel")
     public JAXBElement createELKlausel(ELKlauselType value) {
@@ -667,8 +715,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELPolizzennummerType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELPolizzennummerType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELPolizzennummerType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Polizzennummer")
     public JAXBElement createELPolizzennummer(ELPolizzennummerType value) {
@@ -676,8 +728,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELPraemienfreistellungType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELPraemienfreistellungType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELPraemienfreistellungType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Praemienfreistellung")
     public JAXBElement createELPraemienfreistellung(ELPraemienfreistellungType value) {
@@ -685,8 +741,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELPraemienkorrekturType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELPraemienkorrekturType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELPraemienkorrekturType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Praemienkorrektur")
     public JAXBElement createELPraemienkorrektur(ELPraemienkorrekturType value) {
@@ -694,8 +754,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELRahmenvereinbarungType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELRahmenvereinbarungType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELRahmenvereinbarungType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Rahmenvereinbarung")
     public JAXBElement createELRahmenvereinbarung(ELRahmenvereinbarungType value) {
@@ -703,8 +767,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELRahmenvertragType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELRahmenvertragType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELRahmenvertragType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Rahmenvertrag")
     public JAXBElement createELRahmenvertrag(ELRahmenvertragType value) {
@@ -712,8 +780,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELTextType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELTextType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELTextType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Text")
     public JAXBElement createELText(ELTextType value) {
@@ -721,8 +793,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link VERTRAGSPERSONType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link VERTRAGSPERSONType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link VERTRAGSPERSONType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "VERTRAGSPERSON")
     public JAXBElement createVERTRAGSPERSON(VERTRAGSPERSONType value) {
@@ -730,8 +806,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link VERSOBJEKTType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link VERSOBJEKTType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link VERSOBJEKTType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "VERS_OBJEKT")
     public JAXBElement createVERSOBJEKT(VERSOBJEKTType value) {
@@ -739,8 +819,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SPARTEType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SPARTEType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link SPARTEType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "SPARTE")
     public JAXBElement createSPARTE(SPARTEType value) {
@@ -748,8 +832,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SCHADENType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SCHADENType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link SCHADENType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "SCHADEN")
     public JAXBElement createSCHADEN(SCHADENType value) {
@@ -757,8 +845,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PROVISIONType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link PROVISIONType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link PROVISIONType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "PROVISION")
     public JAXBElement createPROVISION(PROVISIONType value) {
@@ -766,8 +858,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MAHNUNGType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link MAHNUNGType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link MAHNUNGType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "MAHNUNG")
     public JAXBElement createMAHNUNG(MAHNUNGType value) {
@@ -775,8 +871,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link VERTRAGSFONDSType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link VERTRAGSFONDSType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link VERTRAGSFONDSType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "VERTRAGSFONDS")
     public JAXBElement createVERTRAGSFONDS(VERTRAGSFONDSType value) {
@@ -784,8 +884,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link NATUERLICHEPERSONType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link NATUERLICHEPERSONType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link NATUERLICHEPERSONType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "NATUERLICHE_PERSON")
     public JAXBElement createNATUERLICHEPERSON(NATUERLICHEPERSONType value) {
@@ -793,8 +897,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SONSTIGEPERSONType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SONSTIGEPERSONType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link SONSTIGEPERSONType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "SONSTIGE_PERSON")
     public JAXBElement createSONSTIGEPERSON(SONSTIGEPERSONType value) {
@@ -802,8 +910,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link VERSPERSONType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link VERSPERSONType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link VERSPERSONType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "VERS_PERSON")
     public JAXBElement createVERSPERSON(VERSPERSONType value) {
@@ -811,8 +923,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link VERSSACHEType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link VERSSACHEType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link VERSSACHEType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "VERS_SACHE")
     public JAXBElement createVERSSACHE(VERSSACHEType value) {
@@ -820,8 +936,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RISIKOType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link RISIKOType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link RISIKOType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "RISIKO")
     public JAXBElement createRISIKO(RISIKOType value) {
@@ -829,8 +949,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link FONDSType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link FONDSType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link FONDSType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "FONDS")
     public JAXBElement createFONDS(FONDSType value) {
@@ -838,8 +962,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SCHADENBETEILIGTERType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SCHADENBETEILIGTERType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link SCHADENBETEILIGTERType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "SCHADEN_BETEILIGTER")
     public JAXBElement createSCHADENBETEILIGTER(SCHADENBETEILIGTERType value) {
@@ -847,8 +975,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GESCHAEDIGTESOBJEKTType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link GESCHAEDIGTESOBJEKTType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link GESCHAEDIGTESOBJEKTType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "GESCHAEDIGTES_OBJEKT")
     public JAXBElement createGESCHAEDIGTESOBJEKT(GESCHAEDIGTESOBJEKTType value) {
@@ -856,8 +988,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ZAHLUNGType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ZAHLUNGType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ZAHLUNGType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "ZAHLUNG")
     public JAXBElement createZAHLUNG(ZAHLUNGType value) {
@@ -865,8 +1001,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELGewinnbeteiligungType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELGewinnbeteiligungType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELGewinnbeteiligungType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Gewinnbeteiligung")
     public JAXBElement createELGewinnbeteiligung(ELGewinnbeteiligungType value) {
@@ -874,8 +1014,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELGrenzwertType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELGrenzwertType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELGrenzwertType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Grenzwert")
     public JAXBElement createELGrenzwert(ELGrenzwertType value) {
@@ -883,8 +1027,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELIndexType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELIndexType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELIndexType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Index")
     public JAXBElement createELIndex(ELIndexType value) {
@@ -892,8 +1040,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELLegitimationType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELLegitimationType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELLegitimationType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Legitimation")
     public JAXBElement createELLegitimation(ELLegitimationType value) {
@@ -901,8 +1053,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELObjektType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELObjektType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELObjektType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Objekt")
     public JAXBElement createELObjekt(ELObjektType value) {
@@ -910,8 +1066,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELObjektdatenType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELObjektdatenType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELObjektdatenType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Objektdaten")
     public JAXBElement createELObjektdaten(ELObjektdatenType value) {
@@ -919,8 +1079,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELFlaecheType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELFlaecheType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELFlaecheType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Flaeche")
     public JAXBElement createELFlaeche(ELFlaecheType value) {
@@ -928,8 +1092,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELRenteType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELRenteType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELRenteType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Rente")
     public JAXBElement createELRente(ELRenteType value) {
@@ -937,8 +1105,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELSteuerType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELSteuerType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELSteuerType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Steuer")
     public JAXBElement createELSteuer(ELSteuerType value) {
@@ -946,8 +1118,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELVersicherungssummeType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELVersicherungssummeType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELVersicherungssummeType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Versicherungssumme")
     public JAXBElement createELVersicherungssumme(ELVersicherungssummeType value) {
@@ -955,8 +1131,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELZeitraumType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELZeitraumType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELZeitraumType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-Zeitraum")
     public JAXBElement createELZeitraum(ELZeitraumType value) {
@@ -964,8 +1144,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELKFZKennzeichenType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ELKFZKennzeichenType }{@code >}
      * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ELKFZKennzeichenType }{@code >}
      */
     @XmlElementDecl(namespace = "urn:omds20", name = "EL-KFZ-Kennzeichen")
     public JAXBElement createELKFZKennzeichen(ELKFZKennzeichenType value) {
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/PaketInhCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/PaketInhCdType.java
index 7dcaab72..49ffccf9 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/PaketInhCdType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/PaketInhCdType.java
@@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlType;
  * 
Java-Klasse für PaketInhCd_Type.
  * 
  * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

  * 
  * <simpleType name="PaketInhCd_Type">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/PaketUmfCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/PaketUmfCdType.java
index 4f5ae117..d444fa51 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/PaketUmfCdType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/PaketUmfCdType.java
@@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlType;
  * 
Java-Klasse für PaketUmfCd_Type.
  * 
  * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

  * 
  * <simpleType name="PaketUmfCd_Type">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/PersArtCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/PersArtCdType.java
index 22e756b0..c8d28710 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/PersArtCdType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/PersArtCdType.java
@@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlType;
  * 
Java-Klasse für PersArtCd_Type.
  * 
  * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

  * 
  * <simpleType name="PersArtCd_Type">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/PolArtCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/PolArtCdType.java
index 289b959b..891d92d5 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/PolArtCdType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/PolArtCdType.java
@@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlType;
  * 
Java-Klasse für PolArtCd_Type.
  * 
  * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

  * 
  * <simpleType name="PolArtCd_Type">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/PraemFristCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/PraemFristCdType.java
index 96ca2239..71fbac7d 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/PraemFristCdType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/PraemFristCdType.java
@@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlType;
  * 
Java-Klasse für PraemFristCd_Type.
  * 
  * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

  * 
  * <simpleType name="PraemFristCd_Type">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/RISIKOType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/RISIKOType.java
index 25c6b92b..4be9f5f5 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/RISIKOType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/RISIKOType.java
@@ -127,8 +127,8 @@ public class RISIKOType {
      * {@link ELEntscheidungsfrageType }
      * {@link ELGewinnbeteiligungType }
      * {@link ELGrenzwertType }
-     * {@link ELIndexType }
      * {@link ELIdentifizierungType }
+     * {@link ELIndexType }
      * {@link ELKlauselType }
      * {@link ELObjektType }
      * {@link ELPraemienkorrekturType }
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/RisikoArtCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/RisikoArtCdType.java
index ce27f176..d94d4f7f 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/RisikoArtCdType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/RisikoArtCdType.java
@@ -10,7 +10,6 @@ import javax.xml.bind.annotation.XmlType;
  * 
Java-Klasse für RisikoArtCd_Type.
  * 
  * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

  * 
  * <simpleType name="RisikoArtCd_Type">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/SbhArtCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/SbhArtCdType.java
index cd15f3ec..42f5b5f7 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/SbhArtCdType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/SbhArtCdType.java
@@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlType;
  * 
Java-Klasse für SbhArtCd_Type.
  * 
  * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

  * 
  * <simpleType name="SbhArtCd_Type">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/SchlArtCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/SchlArtCdType.java
index d00d2bea..d1731746 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/SchlArtCdType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/SchlArtCdType.java
@@ -10,7 +10,6 @@ import javax.xml.bind.annotation.XmlType;
  * 
Java-Klasse für SchlArtCd_Type.
  * 
  * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

  * 
  * <simpleType name="SchlArtCd_Type">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/SprachCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/SprachCdType.java
index ffc92002..b169dee2 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/SprachCdType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/SprachCdType.java
@@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlType;
  * 
Java-Klasse für SprachCd_Type.
  * 
  * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

  * 
  * <simpleType name="SprachCd_Type">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/TxtArtCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/TxtArtCdType.java
index 09b736d3..46045201 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/TxtArtCdType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/TxtArtCdType.java
@@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlType;
  * 
Java-Klasse für TxtArtCd_Type.
  * 
  * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

  * 
  * <simpleType name="TxtArtCd_Type">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/VERSOBJEKTType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/VERSOBJEKTType.java
index 902f2f55..a0fb9520 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/VERSOBJEKTType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/VERSOBJEKTType.java
@@ -177,8 +177,8 @@ public class VERSOBJEKTType {
      * {@link ELBetragType }
      * {@link ELEinstufungType }
      * {@link ELEntscheidungsfrageType }
-     * {@link ELIdentifizierungType }
      * {@link ELGrenzwertType }
+     * {@link ELIdentifizierungType }
      * {@link ELTextType }
      * 
      * 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/VSArtCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/VSArtCdType.java
index e5c9f341..f1f22dc9 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/VSArtCdType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/VSArtCdType.java
@@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlType;
  * 
Java-Klasse für VSArtCd_Type.
  * 
  * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

  * 
  * <simpleType name="VSArtCd_Type">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/VtgRolleCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/VtgRolleCdType.java
index 6ccc0ef6..a432f86d 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/VtgRolleCdType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/VtgRolleCdType.java
@@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlType;
  * 
Java-Klasse für VtgRolleCd_Type.
  * 
  * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

  * 
  * <simpleType name="VtgRolleCd_Type">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/WaehrungsCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/WaehrungsCdType.java
index ea65a3da..be68a221 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/WaehrungsCdType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/WaehrungsCdType.java
@@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlType;
  * 
Java-Klasse für WaehrungsCd_Type.
  * 
  * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

  * 
  * <simpleType name="WaehrungsCd_Type">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AListenAttributType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AListenAttributType.java
deleted file mode 100644
index bc2da687..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AListenAttributType.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakte Ebene fuer Listen mit einem oder mehreren wählbaren Werten
- * 
- * 
Java-Klasse für AListenAttribut_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AListenAttribut_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Attribut_Type">
- *       <sequence>
- *         <element name="Values" type="{urn:omds3CommonServiceTypes-1-1-0}EintragSchluesselliste_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="MinAnz" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AListenAttribut_Type", propOrder = {
-    "values",
-    "minAnz"
-})
-@XmlSeeAlso({
-    AttributEnumType.class,
-    AttributMultiEnumType.class
-})
-public abstract class AListenAttributType
-    extends AttributType
-{
-
-    @XmlElement(name = "Values")
-    protected List values;
-    @XmlElement(name = "MinAnz")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer minAnz;
-
-    /**
-     * Gets the value of the values property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the values property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getValues().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link EintragSchluessellisteType }
-     * 
-     * 
-     */
-    public List getValues() {
-        if (values == null) {
-            values = new ArrayList();
-        }
-        return this.values;
-    }
-
-    /**
-     * Ruft den Wert der minAnz-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getMinAnz() {
-        return minAnz;
-    }
-
-    /**
-     * Legt den Wert der minAnz-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setMinAnz(Integer value) {
-        this.minAnz = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ASingleAttributType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ASingleAttributType.java
deleted file mode 100644
index 22908792..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ASingleAttributType.java
+++ /dev/null
@@ -1,74 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Basistyp für Attribute mit einem Wert
- * 
- * 
Java-Klasse für ASingleAttribut_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ASingleAttribut_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Attribut_Type">
- *       <sequence>
- *         <element name="Pflichtfeld" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ASingleAttribut_Type", propOrder = {
-    "pflichtfeld"
-})
-@XmlSeeAlso({
-    AttributStringType.class,
-    AttributIntType.class,
-    AttributDezimalType.class,
-    AttributDoubleType.class,
-    AttributDatumType.class
-})
-public abstract class ASingleAttributType
-    extends AttributType
-{
-
-    @XmlElement(name = "Pflichtfeld")
-    protected Boolean pflichtfeld;
-
-    /**
-     * Ruft den Wert der pflichtfeld-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isPflichtfeld() {
-        return pflichtfeld;
-    }
-
-    /**
-     * Legt den Wert der pflichtfeld-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setPflichtfeld(Boolean value) {
-        this.pflichtfeld = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AbgelehnteRisikenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AbgelehnteRisikenType.java
deleted file mode 100644
index 8d3a79cb..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AbgelehnteRisikenType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Typ zur Beschreibung abgelehnter Risiken
- * 
- * 
Java-Klasse für AbgelehnteRisiken_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AbgelehnteRisiken_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AbgelehnteRisiken_Type")
-public abstract class AbgelehnteRisikenType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AbstraktesEreignisStatusAenderungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AbstraktesEreignisStatusAenderungType.java
deleted file mode 100644
index 87af3362..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AbstraktesEreignisStatusAenderungType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstraktes Ereignis einer Statusänderung 
- * 
- * 
Java-Klasse für AbstraktesEreignisStatusAenderung_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AbstraktesEreignisStatusAenderung_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AbstraktesEreignisStatusAenderung_Type")
-public abstract class AbstraktesEreignisStatusAenderungType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AbtretungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AbtretungType.java
deleted file mode 100644
index a247f7fd..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AbtretungType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Sicherstellung vom Typ Abtretung / Zession
- * 
- * 
Java-Klasse für Abtretung_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Abtretung_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Sicherstellung_Type">
- *       <sequence>
- *         <element name="Zessionar" type="{urn:omds3CommonServiceTypes-1-1-0}GlaeubigerSicherstellung_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Abtretung_Type", propOrder = {
-    "zessionar"
-})
-public class AbtretungType
-    extends SicherstellungType
-{
-
-    @XmlElement(name = "Zessionar", required = true)
-    protected GlaeubigerSicherstellungType zessionar;
-
-    /**
-     * Ruft den Wert der zessionar-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GlaeubigerSicherstellungType }
-     *     
-     */
-    public GlaeubigerSicherstellungType getZessionar() {
-        return zessionar;
-    }
-
-    /**
-     * Legt den Wert der zessionar-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GlaeubigerSicherstellungType }
-     *     
-     */
-    public void setZessionar(GlaeubigerSicherstellungType value) {
-        this.zessionar = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AdresseArtCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AdresseArtCdType.java
deleted file mode 100644
index 1a82b532..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AdresseArtCdType.java
+++ /dev/null
@@ -1,41 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
Java-Klasse für AdresseArtCd_Type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

- * 
- * <simpleType name="AdresseArtCd_Type">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="HA"/>
- *   </restriction>
- * </simpleType>
- * 

- * 
- */
-@XmlType(name = "AdresseArtCd_Type")
-@XmlEnum
-public enum AdresseArtCdType {
-
-
-    /**
-     * Hauptadresse
-     * 
-     */
-    HA;
-
-    public String value() {
-        return name();
-    }
-
-    public static AdresseArtCdType fromValue(String v) {
-        return valueOf(v);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AdresseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AdresseType.java
deleted file mode 100644
index bd6ca22e..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AdresseType.java
+++ /dev/null
@@ -1,302 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Typ für eine Adresse mit ObjektId
- * 
- * 
Java-Klasse für Adresse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Adresse_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}ObjektId"/>
- *       </sequence>
- *       <attGroup ref="{urn:omds20}Adresse_Attribute"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Adresse_Type", propOrder = {
-    "objektId"
-})
-public class AdresseType {
-
-    @XmlElement(name = "ObjektId", required = true)
-    protected ObjektIdType objektId;
-    @XmlAttribute(name = "Pac")
-    @XmlSchemaType(name = "unsignedInt")
-    protected Long pac;
-    @XmlAttribute(name = "LandesCd")
-    protected String landesCd;
-    @XmlAttribute(name = "PLZ")
-    protected String plz;
-    @XmlAttribute(name = "Ort")
-    protected String ort;
-    @XmlAttribute(name = "Strasse")
-    protected String strasse;
-    @XmlAttribute(name = "Hausnr")
-    protected String hausnr;
-    @XmlAttribute(name = "Zusatz")
-    protected String zusatz;
-    @XmlAttribute(name = "AdressID_VU")
-    protected String adressIDVU;
-    @XmlAttribute(name = "AdressID_Makler")
-    protected String adressIDMakler;
-
-    /**
-     * Ruft den Wert der objektId-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getObjektId() {
-        return objektId;
-    }
-
-    /**
-     * Legt den Wert der objektId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setObjektId(ObjektIdType value) {
-        this.objektId = value;
-    }
-
-    /**
-     * Ruft den Wert der pac-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Long }
-     *     
-     */
-    public Long getPac() {
-        return pac;
-    }
-
-    /**
-     * Legt den Wert der pac-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Long }
-     *     
-     */
-    public void setPac(Long value) {
-        this.pac = value;
-    }
-
-    /**
-     * Ruft den Wert der landesCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getLandesCd() {
-        return landesCd;
-    }
-
-    /**
-     * Legt den Wert der landesCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setLandesCd(String value) {
-        this.landesCd = value;
-    }
-
-    /**
-     * Ruft den Wert der plz-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPLZ() {
-        return plz;
-    }
-
-    /**
-     * Legt den Wert der plz-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPLZ(String value) {
-        this.plz = value;
-    }
-
-    /**
-     * Ruft den Wert der ort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrt() {
-        return ort;
-    }
-
-    /**
-     * Legt den Wert der ort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrt(String value) {
-        this.ort = value;
-    }
-
-    /**
-     * Ruft den Wert der strasse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStrasse() {
-        return strasse;
-    }
-
-    /**
-     * Legt den Wert der strasse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStrasse(String value) {
-        this.strasse = value;
-    }
-
-    /**
-     * Ruft den Wert der hausnr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getHausnr() {
-        return hausnr;
-    }
-
-    /**
-     * Legt den Wert der hausnr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setHausnr(String value) {
-        this.hausnr = value;
-    }
-
-    /**
-     * Ruft den Wert der zusatz-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getZusatz() {
-        return zusatz;
-    }
-
-    /**
-     * Legt den Wert der zusatz-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setZusatz(String value) {
-        this.zusatz = value;
-    }
-
-    /**
-     * Ruft den Wert der adressIDVU-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAdressIDVU() {
-        return adressIDVU;
-    }
-
-    /**
-     * Legt den Wert der adressIDVU-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAdressIDVU(String value) {
-        this.adressIDVU = value;
-    }
-
-    /**
-     * Ruft den Wert der adressIDMakler-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAdressIDMakler() {
-        return adressIDMakler;
-    }
-
-    /**
-     * Legt den Wert der adressIDMakler-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAdressIDMakler(String value) {
-        this.adressIDMakler = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AgentFilterType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AgentFilterType.java
deleted file mode 100644
index 33665e04..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AgentFilterType.java
+++ /dev/null
@@ -1,101 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Ein spezieller AuthorizationFilterType, der eine Anfrage dahingehend einschränkt, dass nur Ergebnisse für eine bestimmte MaklerID oder Vermnr (Vermittlernummer) zurück gegeben werden
- * 
- * 
Java-Klasse für AgentFilter_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AgentFilter_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}AuthorizationFilter">
- *       <choice>
- *         <element name="MaklerID" type="{urn:omds3CommonServiceTypes-1-1-0}MaklerID_Type"/>
- *         <element name="Vermnr" type="{urn:omds20}Vermnr" maxOccurs="unbounded"/>
- *       </choice>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AgentFilter_Type", propOrder = {
-    "maklerID",
-    "vermnr"
-})
-public class AgentFilterType
-    extends AuthorizationFilter
-{
-
-    @XmlElement(name = "MaklerID")
-    protected String maklerID;
-    @XmlElement(name = "Vermnr")
-    protected List vermnr;
-
-    /**
-     * Ruft den Wert der maklerID-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMaklerID() {
-        return maklerID;
-    }
-
-    /**
-     * Legt den Wert der maklerID-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMaklerID(String value) {
-        this.maklerID = value;
-    }
-
-    /**
-     * Gets the value of the vermnr property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the vermnr property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVermnr().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List getVermnr() {
-        if (vermnr == null) {
-            vermnr = new ArrayList();
-        }
-        return this.vermnr;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AntragsartType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AntragsartType.java
deleted file mode 100644
index 48b3975f..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AntragsartType.java
+++ /dev/null
@@ -1,69 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
Java-Klasse für Antragsart_Type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

- * 
- * <simpleType name="Antragsart_Type">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="NA"/>
- *     <enumeration value="FW"/>
- *     <enumeration value="VW"/>
- *     <enumeration value="WK"/>
- *     <enumeration value="TU"/>
- *   </restriction>
- * </simpleType>
- * 

- * 
- */
-@XmlType(name = "Antragsart_Type")
-@XmlEnum
-public enum AntragsartType {
-
-
-    /**
-     * Neuantrag
-     * 
-     */
-    NA,
-
-    /**
-     * Fahrzeugwechsel
-     * 
-     */
-    FW,
-
-    /**
-     * Versicherungswechsel
-     * 
-     */
-    VW,
-
-    /**
-     * Wechselkennzeichen
-     * 
-     */
-    WK,
-
-    /**
-     * Tarifumstellung
-     * 
-     */
-    TU;
-
-    public String value() {
-        return name();
-    }
-
-    public static AntragsartType fromValue(String v) {
-        return valueOf(v);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributDatumType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributDatumType.java
deleted file mode 100644
index e1265b9e..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributDatumType.java
+++ /dev/null
@@ -1,192 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Auf xsd:date basierendes Attribut mit Metadaten
- * 
- * 
Java-Klasse für AttributDatum_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AttributDatum_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ASingleAttribut_Type">
- *       <sequence>
- *         <element name="Value" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
- *         <element name="Default" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
- *         <element name="Values" type="{http://www.w3.org/2001/XMLSchema}date" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Min" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
- *         <element name="Max" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttributDatum_Type", propOrder = {
-    "value",
-    "_default",
-    "values",
-    "min",
-    "max"
-})
-public class AttributDatumType
-    extends ASingleAttributType
-{
-
-    @XmlElement(name = "Value")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar value;
-    @XmlElement(name = "Default")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar _default;
-    @XmlElement(name = "Values")
-    @XmlSchemaType(name = "date")
-    protected List values;
-    @XmlElement(name = "Min")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar min;
-    @XmlElement(name = "Max")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar max;
-
-    /**
-     * Ruft den Wert der value-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getValue() {
-        return value;
-    }
-
-    /**
-     * Legt den Wert der value-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setValue(XMLGregorianCalendar value) {
-        this.value = value;
-    }
-
-    /**
-     * Ruft den Wert der default-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDefault() {
-        return _default;
-    }
-
-    /**
-     * Legt den Wert der default-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDefault(XMLGregorianCalendar value) {
-        this._default = value;
-    }
-
-    /**
-     * Gets the value of the values property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the values property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getValues().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link XMLGregorianCalendar }
-     * 
-     * 
-     */
-    public List getValues() {
-        if (values == null) {
-            values = new ArrayList();
-        }
-        return this.values;
-    }
-
-    /**
-     * Ruft den Wert der min-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getMin() {
-        return min;
-    }
-
-    /**
-     * Legt den Wert der min-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setMin(XMLGregorianCalendar value) {
-        this.min = value;
-    }
-
-    /**
-     * Ruft den Wert der max-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getMax() {
-        return max;
-    }
-
-    /**
-     * Legt den Wert der max-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setMax(XMLGregorianCalendar value) {
-        this.max = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributDezimalType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributDezimalType.java
deleted file mode 100644
index 308183bb..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributDezimalType.java
+++ /dev/null
@@ -1,186 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Auf omds:decimal basierendes Attribut mit Metadaten
- * 
- * 
Java-Klasse für AttributDezimal_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AttributDezimal_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ASingleAttribut_Type">
- *       <sequence>
- *         <element name="Value" type="{urn:omds20}decimal" minOccurs="0"/>
- *         <element name="Default" type="{urn:omds20}decimal" minOccurs="0"/>
- *         <element name="Values" type="{urn:omds20}decimal" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Min" type="{urn:omds20}decimal" minOccurs="0"/>
- *         <element name="Max" type="{urn:omds20}decimal" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttributDezimal_Type", propOrder = {
-    "value",
-    "_default",
-    "values",
-    "min",
-    "max"
-})
-public class AttributDezimalType
-    extends ASingleAttributType
-{
-
-    @XmlElement(name = "Value")
-    protected BigDecimal value;
-    @XmlElement(name = "Default")
-    protected BigDecimal _default;
-    @XmlElement(name = "Values")
-    protected List values;
-    @XmlElement(name = "Min")
-    protected BigDecimal min;
-    @XmlElement(name = "Max")
-    protected BigDecimal max;
-
-    /**
-     * Ruft den Wert der value-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getValue() {
-        return value;
-    }
-
-    /**
-     * Legt den Wert der value-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setValue(BigDecimal value) {
-        this.value = value;
-    }
-
-    /**
-     * Ruft den Wert der default-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getDefault() {
-        return _default;
-    }
-
-    /**
-     * Legt den Wert der default-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setDefault(BigDecimal value) {
-        this._default = value;
-    }
-
-    /**
-     * Gets the value of the values property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the values property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getValues().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link BigDecimal }
-     * 
-     * 
-     */
-    public List getValues() {
-        if (values == null) {
-            values = new ArrayList();
-        }
-        return this.values;
-    }
-
-    /**
-     * Ruft den Wert der min-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getMin() {
-        return min;
-    }
-
-    /**
-     * Legt den Wert der min-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setMin(BigDecimal value) {
-        this.min = value;
-    }
-
-    /**
-     * Ruft den Wert der max-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getMax() {
-        return max;
-    }
-
-    /**
-     * Legt den Wert der max-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setMax(BigDecimal value) {
-        this.max = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributDoubleType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributDoubleType.java
deleted file mode 100644
index d3d3b4c7..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributDoubleType.java
+++ /dev/null
@@ -1,185 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Auf xsd:double basierendes Attribut mit Metadaten
- * 
- * 
Java-Klasse für AttributDouble_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AttributDouble_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ASingleAttribut_Type">
- *       <sequence>
- *         <element name="Value" type="{http://www.w3.org/2001/XMLSchema}double" minOccurs="0"/>
- *         <element name="Default" type="{http://www.w3.org/2001/XMLSchema}double" minOccurs="0"/>
- *         <element name="Values" type="{http://www.w3.org/2001/XMLSchema}double" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Min" type="{http://www.w3.org/2001/XMLSchema}double" minOccurs="0"/>
- *         <element name="Max" type="{http://www.w3.org/2001/XMLSchema}double" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttributDouble_Type", propOrder = {
-    "value",
-    "_default",
-    "values",
-    "min",
-    "max"
-})
-public class AttributDoubleType
-    extends ASingleAttributType
-{
-
-    @XmlElement(name = "Value")
-    protected Double value;
-    @XmlElement(name = "Default")
-    protected Double _default;
-    @XmlElement(name = "Values", type = Double.class)
-    protected List values;
-    @XmlElement(name = "Min")
-    protected Double min;
-    @XmlElement(name = "Max")
-    protected Double max;
-
-    /**
-     * Ruft den Wert der value-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Double }
-     *     
-     */
-    public Double getValue() {
-        return value;
-    }
-
-    /**
-     * Legt den Wert der value-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Double }
-     *     
-     */
-    public void setValue(Double value) {
-        this.value = value;
-    }
-
-    /**
-     * Ruft den Wert der default-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Double }
-     *     
-     */
-    public Double getDefault() {
-        return _default;
-    }
-
-    /**
-     * Legt den Wert der default-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Double }
-     *     
-     */
-    public void setDefault(Double value) {
-        this._default = value;
-    }
-
-    /**
-     * Gets the value of the values property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the values property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getValues().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link Double }
-     * 
-     * 
-     */
-    public List getValues() {
-        if (values == null) {
-            values = new ArrayList();
-        }
-        return this.values;
-    }
-
-    /**
-     * Ruft den Wert der min-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Double }
-     *     
-     */
-    public Double getMin() {
-        return min;
-    }
-
-    /**
-     * Legt den Wert der min-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Double }
-     *     
-     */
-    public void setMin(Double value) {
-        this.min = value;
-    }
-
-    /**
-     * Ruft den Wert der max-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Double }
-     *     
-     */
-    public Double getMax() {
-        return max;
-    }
-
-    /**
-     * Legt den Wert der max-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Double }
-     *     
-     */
-    public void setMax(Double value) {
-        this.max = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributEnumType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributEnumType.java
deleted file mode 100644
index 08c2af00..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributEnumType.java
+++ /dev/null
@@ -1,94 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Attribut mit Metadaten für Schlüssellisten
- * 
- * 
Java-Klasse für AttributEnum_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AttributEnum_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}AListenAttribut_Type">
- *       <sequence>
- *         <element name="Value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Default" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttributEnum_Type", propOrder = {
-    "value",
-    "_default"
-})
-public class AttributEnumType
-    extends AListenAttributType
-{
-
-    @XmlElement(name = "Value")
-    protected String value;
-    @XmlElement(name = "Default")
-    protected String _default;
-
-    /**
-     * Ruft den Wert der value-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Legt den Wert der value-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    /**
-     * Ruft den Wert der default-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDefault() {
-        return _default;
-    }
-
-    /**
-     * Legt den Wert der default-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDefault(String value) {
-        this._default = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributIntType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributIntType.java
deleted file mode 100644
index c4b14530..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributIntType.java
+++ /dev/null
@@ -1,185 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Auf xsd:int basierendes Attribut mit Metadaten
- * 
- * 
Java-Klasse für AttributInt_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AttributInt_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ASingleAttribut_Type">
- *       <sequence>
- *         <element name="Value" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *         <element name="Default" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *         <element name="Values" type="{http://www.w3.org/2001/XMLSchema}int" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Min" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *         <element name="Max" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttributInt_Type", propOrder = {
-    "value",
-    "_default",
-    "values",
-    "min",
-    "max"
-})
-public class AttributIntType
-    extends ASingleAttributType
-{
-
-    @XmlElement(name = "Value")
-    protected Integer value;
-    @XmlElement(name = "Default")
-    protected Integer _default;
-    @XmlElement(name = "Values", type = Integer.class)
-    protected List values;
-    @XmlElement(name = "Min")
-    protected Integer min;
-    @XmlElement(name = "Max")
-    protected Integer max;
-
-    /**
-     * Ruft den Wert der value-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getValue() {
-        return value;
-    }
-
-    /**
-     * Legt den Wert der value-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setValue(Integer value) {
-        this.value = value;
-    }
-
-    /**
-     * Ruft den Wert der default-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getDefault() {
-        return _default;
-    }
-
-    /**
-     * Legt den Wert der default-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setDefault(Integer value) {
-        this._default = value;
-    }
-
-    /**
-     * Gets the value of the values property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the values property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getValues().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link Integer }
-     * 
-     * 
-     */
-    public List getValues() {
-        if (values == null) {
-            values = new ArrayList();
-        }
-        return this.values;
-    }
-
-    /**
-     * Ruft den Wert der min-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getMin() {
-        return min;
-    }
-
-    /**
-     * Legt den Wert der min-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setMin(Integer value) {
-        this.min = value;
-    }
-
-    /**
-     * Ruft den Wert der max-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getMax() {
-        return max;
-    }
-
-    /**
-     * Legt den Wert der max-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setMax(Integer value) {
-        this.max = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenDatumType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenDatumType.java
deleted file mode 100644
index 42967823..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenDatumType.java
+++ /dev/null
@@ -1,163 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Typ mit Metadaten für xsd:date-Attribute
- * 
- * 
Java-Klasse für AttributMetadatenDatum_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AttributMetadatenDatum_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}AttributMetadaten_Type">
- *       <sequence>
- *         <element name="Default" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
- *         <element name="Values" type="{http://www.w3.org/2001/XMLSchema}date" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Min" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
- *         <element name="Max" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttributMetadatenDatum_Type", propOrder = {
-    "_default",
-    "values",
-    "min",
-    "max"
-})
-public class AttributMetadatenDatumType
-    extends AttributMetadatenType
-{
-
-    @XmlElement(name = "Default")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar _default;
-    @XmlElement(name = "Values")
-    @XmlSchemaType(name = "date")
-    protected List values;
-    @XmlElement(name = "Min")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar min;
-    @XmlElement(name = "Max")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar max;
-
-    /**
-     * Ruft den Wert der default-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDefault() {
-        return _default;
-    }
-
-    /**
-     * Legt den Wert der default-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDefault(XMLGregorianCalendar value) {
-        this._default = value;
-    }
-
-    /**
-     * Gets the value of the values property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the values property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getValues().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link XMLGregorianCalendar }
-     * 
-     * 
-     */
-    public List getValues() {
-        if (values == null) {
-            values = new ArrayList();
-        }
-        return this.values;
-    }
-
-    /**
-     * Ruft den Wert der min-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getMin() {
-        return min;
-    }
-
-    /**
-     * Legt den Wert der min-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setMin(XMLGregorianCalendar value) {
-        this.min = value;
-    }
-
-    /**
-     * Ruft den Wert der max-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getMax() {
-        return max;
-    }
-
-    /**
-     * Legt den Wert der max-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setMax(XMLGregorianCalendar value) {
-        this.max = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenDezimalType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenDezimalType.java
deleted file mode 100644
index d7713da5..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenDezimalType.java
+++ /dev/null
@@ -1,158 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Typ mit Metadaten für omds:decimal-Attribute
- * 
- * 
Java-Klasse für AttributMetadatenDezimal_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AttributMetadatenDezimal_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}AttributMetadaten_Type">
- *       <sequence>
- *         <element name="Default" type="{urn:omds20}decimal" minOccurs="0"/>
- *         <element name="Values" type="{urn:omds20}decimal" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Min" type="{urn:omds20}decimal" minOccurs="0"/>
- *         <element name="Max" type="{urn:omds20}decimal" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttributMetadatenDezimal_Type", propOrder = {
-    "_default",
-    "values",
-    "min",
-    "max"
-})
-public class AttributMetadatenDezimalType
-    extends AttributMetadatenType
-{
-
-    @XmlElement(name = "Default")
-    protected BigDecimal _default;
-    @XmlElement(name = "Values")
-    protected List values;
-    @XmlElement(name = "Min")
-    protected BigDecimal min;
-    @XmlElement(name = "Max")
-    protected BigDecimal max;
-
-    /**
-     * Ruft den Wert der default-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getDefault() {
-        return _default;
-    }
-
-    /**
-     * Legt den Wert der default-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setDefault(BigDecimal value) {
-        this._default = value;
-    }
-
-    /**
-     * Gets the value of the values property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the values property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getValues().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link BigDecimal }
-     * 
-     * 
-     */
-    public List getValues() {
-        if (values == null) {
-            values = new ArrayList();
-        }
-        return this.values;
-    }
-
-    /**
-     * Ruft den Wert der min-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getMin() {
-        return min;
-    }
-
-    /**
-     * Legt den Wert der min-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setMin(BigDecimal value) {
-        this.min = value;
-    }
-
-    /**
-     * Ruft den Wert der max-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getMax() {
-        return max;
-    }
-
-    /**
-     * Legt den Wert der max-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setMax(BigDecimal value) {
-        this.max = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenEnumType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenEnumType.java
deleted file mode 100644
index c216ce86..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenEnumType.java
+++ /dev/null
@@ -1,101 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Typ mit Metadaten für Schlüssellisten
- * 
- * 
Java-Klasse für AttributMetadatenEnum_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AttributMetadatenEnum_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}AttributMetadaten_Type">
- *       <sequence>
- *         <element name="Default" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Values" type="{urn:omds3CommonServiceTypes-1-1-0}EintragSchluesselliste_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttributMetadatenEnum_Type", propOrder = {
-    "_default",
-    "values"
-})
-public class AttributMetadatenEnumType
-    extends AttributMetadatenType
-{
-
-    @XmlElement(name = "Default")
-    protected String _default;
-    @XmlElement(name = "Values")
-    protected List values;
-
-    /**
-     * Ruft den Wert der default-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDefault() {
-        return _default;
-    }
-
-    /**
-     * Legt den Wert der default-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDefault(String value) {
-        this._default = value;
-    }
-
-    /**
-     * Gets the value of the values property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the values property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getValues().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link EintragSchluessellisteType }
-     * 
-     * 
-     */
-    public List getValues() {
-        if (values == null) {
-            values = new ArrayList();
-        }
-        return this.values;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenIntType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenIntType.java
deleted file mode 100644
index 9000950f..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenIntType.java
+++ /dev/null
@@ -1,157 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Typ mit Metadaten für xsd:int-Attribute
- * 
- * 
Java-Klasse für AttributMetadatenInt_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AttributMetadatenInt_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}AttributMetadaten_Type">
- *       <sequence>
- *         <element name="Default" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *         <element name="Values" type="{http://www.w3.org/2001/XMLSchema}int" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Min" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *         <element name="Max" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttributMetadatenInt_Type", propOrder = {
-    "_default",
-    "values",
-    "min",
-    "max"
-})
-public class AttributMetadatenIntType
-    extends AttributMetadatenType
-{
-
-    @XmlElement(name = "Default")
-    protected Integer _default;
-    @XmlElement(name = "Values", type = Integer.class)
-    protected List values;
-    @XmlElement(name = "Min")
-    protected Integer min;
-    @XmlElement(name = "Max")
-    protected Integer max;
-
-    /**
-     * Ruft den Wert der default-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getDefault() {
-        return _default;
-    }
-
-    /**
-     * Legt den Wert der default-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setDefault(Integer value) {
-        this._default = value;
-    }
-
-    /**
-     * Gets the value of the values property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the values property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getValues().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link Integer }
-     * 
-     * 
-     */
-    public List getValues() {
-        if (values == null) {
-            values = new ArrayList();
-        }
-        return this.values;
-    }
-
-    /**
-     * Ruft den Wert der min-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getMin() {
-        return min;
-    }
-
-    /**
-     * Legt den Wert der min-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setMin(Integer value) {
-        this.min = value;
-    }
-
-    /**
-     * Ruft den Wert der max-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getMax() {
-        return max;
-    }
-
-    /**
-     * Legt den Wert der max-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setMax(Integer value) {
-        this.max = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenStringType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenStringType.java
deleted file mode 100644
index 9eec20c3..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenStringType.java
+++ /dev/null
@@ -1,188 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Typ mit Metadaten für xsd:string-Attribute
- * 
- * 
Java-Klasse für AttributMetadatenString_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AttributMetadatenString_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}AttributMetadaten_Type">
- *       <sequence>
- *         <element name="Default" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Values" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="MinLaenge" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/>
- *         <element name="MaxLaenge" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/>
- *         <element name="Regex" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttributMetadatenString_Type", propOrder = {
-    "_default",
-    "values",
-    "minLaenge",
-    "maxLaenge",
-    "regex"
-})
-public class AttributMetadatenStringType
-    extends AttributMetadatenType
-{
-
-    @XmlElement(name = "Default")
-    protected String _default;
-    @XmlElement(name = "Values")
-    protected List values;
-    @XmlElement(name = "MinLaenge")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer minLaenge;
-    @XmlElement(name = "MaxLaenge")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer maxLaenge;
-    @XmlElement(name = "Regex")
-    protected String regex;
-
-    /**
-     * Ruft den Wert der default-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDefault() {
-        return _default;
-    }
-
-    /**
-     * Legt den Wert der default-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDefault(String value) {
-        this._default = value;
-    }
-
-    /**
-     * Gets the value of the values property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the values property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getValues().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List getValues() {
-        if (values == null) {
-            values = new ArrayList();
-        }
-        return this.values;
-    }
-
-    /**
-     * Ruft den Wert der minLaenge-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getMinLaenge() {
-        return minLaenge;
-    }
-
-    /**
-     * Legt den Wert der minLaenge-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setMinLaenge(Integer value) {
-        this.minLaenge = value;
-    }
-
-    /**
-     * Ruft den Wert der maxLaenge-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getMaxLaenge() {
-        return maxLaenge;
-    }
-
-    /**
-     * Legt den Wert der maxLaenge-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setMaxLaenge(Integer value) {
-        this.maxLaenge = value;
-    }
-
-    /**
-     * Ruft den Wert der regex-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRegex() {
-        return regex;
-    }
-
-    /**
-     * Legt den Wert der regex-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRegex(String value) {
-        this.regex = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenType.java
deleted file mode 100644
index dedb9756..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMetadatenType.java
+++ /dev/null
@@ -1,148 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Basistyp für Metadaten von Attributen
- * 
- * 
Java-Klasse für AttributMetadaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AttributMetadaten_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Attribut" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
- *         <element name="Aenderbar" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="Bezeichnung" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="BeschreibungTxt" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttributMetadaten_Type", propOrder = {
-    "attribut",
-    "aenderbar",
-    "bezeichnung",
-    "beschreibungTxt"
-})
-@XmlSeeAlso({
-    AttributMetadatenStringType.class,
-    AttributMetadatenIntType.class,
-    AttributMetadatenDezimalType.class,
-    AttributMetadatenDatumType.class,
-    AttributMetadatenEnumType.class
-})
-public abstract class AttributMetadatenType {
-
-    @XmlElement(name = "Attribut", required = true)
-    protected Object attribut;
-    @XmlElement(name = "Aenderbar")
-    protected boolean aenderbar;
-    @XmlElement(name = "Bezeichnung")
-    protected String bezeichnung;
-    @XmlElement(name = "BeschreibungTxt")
-    protected String beschreibungTxt;
-
-    /**
-     * Ruft den Wert der attribut-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Object }
-     *     
-     */
-    public Object getAttribut() {
-        return attribut;
-    }
-
-    /**
-     * Legt den Wert der attribut-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     
-     */
-    public void setAttribut(Object value) {
-        this.attribut = value;
-    }
-
-    /**
-     * Ruft den Wert der aenderbar-Eigenschaft ab.
-     * 
-     */
-    public boolean isAenderbar() {
-        return aenderbar;
-    }
-
-    /**
-     * Legt den Wert der aenderbar-Eigenschaft fest.
-     * 
-     */
-    public void setAenderbar(boolean value) {
-        this.aenderbar = value;
-    }
-
-    /**
-     * Ruft den Wert der bezeichnung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBezeichnung() {
-        return bezeichnung;
-    }
-
-    /**
-     * Legt den Wert der bezeichnung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBezeichnung(String value) {
-        this.bezeichnung = value;
-    }
-
-    /**
-     * Ruft den Wert der beschreibungTxt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBeschreibungTxt() {
-        return beschreibungTxt;
-    }
-
-    /**
-     * Legt den Wert der beschreibungTxt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBeschreibungTxt(String value) {
-        this.beschreibungTxt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMsgType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMsgType.java
deleted file mode 100644
index 2201148a..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMsgType.java
+++ /dev/null
@@ -1,129 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Message an einem Attribut
- * 
- * 
Java-Klasse für AttributMsg_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AttributMsg_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ErrorType">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}integer">
- *               <pattern value="1"/>
- *               <pattern value="2"/>
- *               <pattern value="3"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="ErrorCode" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
- *         <element name="ErrorMsg" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttributMsg_Type", propOrder = {
-    "errorType",
-    "errorCode",
-    "errorMsg"
-})
-public class AttributMsgType {
-
-    @XmlElement(name = "ErrorType", required = true)
-    protected BigInteger errorType;
-    @XmlElement(name = "ErrorCode")
-    protected BigInteger errorCode;
-    @XmlElement(name = "ErrorMsg", required = true)
-    protected String errorMsg;
-
-    /**
-     * Ruft den Wert der errorType-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getErrorType() {
-        return errorType;
-    }
-
-    /**
-     * Legt den Wert der errorType-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setErrorType(BigInteger value) {
-        this.errorType = value;
-    }
-
-    /**
-     * Ruft den Wert der errorCode-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getErrorCode() {
-        return errorCode;
-    }
-
-    /**
-     * Legt den Wert der errorCode-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setErrorCode(BigInteger value) {
-        this.errorCode = value;
-    }
-
-    /**
-     * Ruft den Wert der errorMsg-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getErrorMsg() {
-        return errorMsg;
-    }
-
-    /**
-     * Legt den Wert der errorMsg-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setErrorMsg(String value) {
-        this.errorMsg = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMultiEnumType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMultiEnumType.java
deleted file mode 100644
index 3c96bd53..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributMultiEnumType.java
+++ /dev/null
@@ -1,134 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Attribut mit Metadaten für Schlüssellisten, bei dem mehrere Einträge auswählbar sind.
- * 
- * 
Java-Klasse für AttributMultiEnum_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AttributMultiEnum_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}AListenAttribut_Type">
- *       <sequence>
- *         <element name="Value" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Default" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="MaxAnz" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttributMultiEnum_Type", propOrder = {
-    "value",
-    "_default",
-    "maxAnz"
-})
-public class AttributMultiEnumType
-    extends AListenAttributType
-{
-
-    @XmlElement(name = "Value")
-    protected List value;
-    @XmlElement(name = "Default")
-    protected List _default;
-    @XmlElement(name = "MaxAnz")
-    protected Object maxAnz;
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the value property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getValue().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List getValue() {
-        if (value == null) {
-            value = new ArrayList();
-        }
-        return this.value;
-    }
-
-    /**
-     * Gets the value of the default property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the default property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDefault().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List getDefault() {
-        if (_default == null) {
-            _default = new ArrayList();
-        }
-        return this._default;
-    }
-
-    /**
-     * Ruft den Wert der maxAnz-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Object }
-     *     
-     */
-    public Object getMaxAnz() {
-        return maxAnz;
-    }
-
-    /**
-     * Legt den Wert der maxAnz-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     
-     */
-    public void setMaxAnz(Object value) {
-        this.maxAnz = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributStringType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributStringType.java
deleted file mode 100644
index ddba7e6a..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributStringType.java
+++ /dev/null
@@ -1,216 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Auf xsd:string basierendes Attribut mit Metadaten
- * 
- * 
Java-Klasse für AttributString_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AttributString_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ASingleAttribut_Type">
- *       <sequence>
- *         <element name="Value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Default" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Regex" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="MaxLaenge" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/>
- *         <element name="MinLaenge" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/>
- *         <element name="Values" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttributString_Type", propOrder = {
-    "value",
-    "_default",
-    "regex",
-    "maxLaenge",
-    "minLaenge",
-    "values"
-})
-public class AttributStringType
-    extends ASingleAttributType
-{
-
-    @XmlElement(name = "Value")
-    protected String value;
-    @XmlElement(name = "Default")
-    protected String _default;
-    @XmlElement(name = "Regex")
-    protected String regex;
-    @XmlElement(name = "MaxLaenge")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer maxLaenge;
-    @XmlElement(name = "MinLaenge")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer minLaenge;
-    @XmlElement(name = "Values")
-    protected List values;
-
-    /**
-     * Ruft den Wert der value-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Legt den Wert der value-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    /**
-     * Ruft den Wert der default-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDefault() {
-        return _default;
-    }
-
-    /**
-     * Legt den Wert der default-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDefault(String value) {
-        this._default = value;
-    }
-
-    /**
-     * Ruft den Wert der regex-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRegex() {
-        return regex;
-    }
-
-    /**
-     * Legt den Wert der regex-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRegex(String value) {
-        this.regex = value;
-    }
-
-    /**
-     * Ruft den Wert der maxLaenge-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getMaxLaenge() {
-        return maxLaenge;
-    }
-
-    /**
-     * Legt den Wert der maxLaenge-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setMaxLaenge(Integer value) {
-        this.maxLaenge = value;
-    }
-
-    /**
-     * Ruft den Wert der minLaenge-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getMinLaenge() {
-        return minLaenge;
-    }
-
-    /**
-     * Legt den Wert der minLaenge-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setMinLaenge(Integer value) {
-        this.minLaenge = value;
-    }
-
-    /**
-     * Gets the value of the values property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the values property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getValues().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List getValues() {
-        if (values == null) {
-            values = new ArrayList();
-        }
-        return this.values;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributType.java
deleted file mode 100644
index 1994d4a5..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AttributType.java
+++ /dev/null
@@ -1,154 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Basistyp für Attribute die Metadaten enthalten können (feiner Unterschied zu AttributMetadaten_Type)
- * 
- * 
Java-Klasse für Attribut_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Attribut_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Aenderbar" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="Bezeichnung" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="BeschreibungTxt" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Msg" type="{urn:omds3CommonServiceTypes-1-1-0}AttributMsg_Type" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Attribut_Type", propOrder = {
-    "aenderbar",
-    "bezeichnung",
-    "beschreibungTxt",
-    "msg"
-})
-@XmlSeeAlso({
-    ASingleAttributType.class,
-    AListenAttributType.class,
-    RaucherType.class
-})
-public abstract class AttributType {
-
-    @XmlElement(name = "Aenderbar")
-    protected Boolean aenderbar;
-    @XmlElement(name = "Bezeichnung")
-    protected String bezeichnung;
-    @XmlElement(name = "BeschreibungTxt")
-    protected String beschreibungTxt;
-    @XmlElement(name = "Msg")
-    protected AttributMsgType msg;
-
-    /**
-     * Ruft den Wert der aenderbar-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isAenderbar() {
-        return aenderbar;
-    }
-
-    /**
-     * Legt den Wert der aenderbar-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setAenderbar(Boolean value) {
-        this.aenderbar = value;
-    }
-
-    /**
-     * Ruft den Wert der bezeichnung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBezeichnung() {
-        return bezeichnung;
-    }
-
-    /**
-     * Legt den Wert der bezeichnung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBezeichnung(String value) {
-        this.bezeichnung = value;
-    }
-
-    /**
-     * Ruft den Wert der beschreibungTxt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBeschreibungTxt() {
-        return beschreibungTxt;
-    }
-
-    /**
-     * Legt den Wert der beschreibungTxt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBeschreibungTxt(String value) {
-        this.beschreibungTxt = value;
-    }
-
-    /**
-     * Ruft den Wert der msg-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributMsgType }
-     *     
-     */
-    public AttributMsgType getMsg() {
-        return msg;
-    }
-
-    /**
-     * Legt den Wert der msg-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributMsgType }
-     *     
-     */
-    public void setMsg(AttributMsgType value) {
-        this.msg = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AuthorizationFilter.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AuthorizationFilter.java
deleted file mode 100644
index 944ae9b6..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AuthorizationFilter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Definiert einen abstrakten Filter um bestimmte spezifische Elemente herauszufiltern
- * 
- * 
Java-Klasse für AuthorizationFilter complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AuthorizationFilter">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AuthorizationFilter")
-@XmlSeeAlso({
-    AgentFilterType.class
-})
-public abstract class AuthorizationFilter {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungAsyncType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungAsyncType.java
deleted file mode 100644
index 0d476ffd..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungAsyncType.java
+++ /dev/null
@@ -1,73 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * Metadaten einer Autorisierung, die asynchron geleistet wird.
- * 
- * 
Java-Klasse für AutorisierungAsync_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AutorisierungAsync_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Autorisierung_Type">
- *       <sequence>
- *         <element name="Geleistet" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AutorisierungAsync_Type", propOrder = {
-    "geleistet"
-})
-@XmlSeeAlso({
-    at.vvo.omds.types.omds3Types.r1_7_0.on1basis.ProzessDokumentStatusType.Autorisierungen.class
-})
-public class AutorisierungAsyncType
-    extends AutorisierungType
-{
-
-    @XmlElement(name = "Geleistet")
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar geleistet;
-
-    /**
-     * Ruft den Wert der geleistet-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getGeleistet() {
-        return geleistet;
-    }
-
-    /**
-     * Legt den Wert der geleistet-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setGeleistet(XMLGregorianCalendar value) {
-        this.geleistet = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungType.java
deleted file mode 100644
index 529cc755..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungType.java
+++ /dev/null
@@ -1,153 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Typ zur Übermittlung von Metadaten einer Autorisierung (z.B. einer elektronischen Unterschrift)
- * 
- * 
Java-Klasse für Autorisierung_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Autorisierung_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="AutorisierungsId" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}Person"/>
- *         <element name="Rolle" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Autorisierungsart" type="{urn:omds3CommonServiceTypes-1-1-0}Autorisierungsart_Type"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Autorisierung_Type", propOrder = {
-    "autorisierungsId",
-    "person",
-    "rolle",
-    "autorisierungsart"
-})
-@XmlSeeAlso({
-    at.vvo.omds.types.omds3Types.r1_7_0.common.ProzessDokumentType.Autorisierungen.class,
-    AutorisierungAsyncType.class
-})
-public class AutorisierungType {
-
-    @XmlElement(name = "AutorisierungsId")
-    protected Object autorisierungsId;
-    @XmlElement(name = "Person", required = true)
-    protected PersonType person;
-    @XmlElement(name = "Rolle", required = true)
-    protected String rolle;
-    @XmlElement(name = "Autorisierungsart", required = true)
-    protected AutorisierungsartType autorisierungsart;
-
-    /**
-     * Ruft den Wert der autorisierungsId-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Object }
-     *     
-     */
-    public Object getAutorisierungsId() {
-        return autorisierungsId;
-    }
-
-    /**
-     * Legt den Wert der autorisierungsId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     
-     */
-    public void setAutorisierungsId(Object value) {
-        this.autorisierungsId = value;
-    }
-
-    /**
-     * Ruft den Wert der person-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PersonType }
-     *     
-     */
-    public PersonType getPerson() {
-        return person;
-    }
-
-    /**
-     * Legt den Wert der person-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PersonType }
-     *     
-     */
-    public void setPerson(PersonType value) {
-        this.person = value;
-    }
-
-    /**
-     * Ruft den Wert der rolle-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRolle() {
-        return rolle;
-    }
-
-    /**
-     * Legt den Wert der rolle-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRolle(String value) {
-        this.rolle = value;
-    }
-
-    /**
-     * Ruft den Wert der autorisierungsart-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AutorisierungsartType }
-     *     
-     */
-    public AutorisierungsartType getAutorisierungsart() {
-        return autorisierungsart;
-    }
-
-    /**
-     * Legt den Wert der autorisierungsart-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AutorisierungsartType }
-     *     
-     */
-    public void setAutorisierungsart(AutorisierungsartType value) {
-        this.autorisierungsart = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsAnforderungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsAnforderungType.java
deleted file mode 100644
index 40a67dfb..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsAnforderungType.java
+++ /dev/null
@@ -1,155 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Typ zur Übermittlung von Anforderungen an eine Autorisierung (z.B. einer elektronischen Unterschrift)
- * 
- * 
Java-Klasse für AutorisierungsAnforderung_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AutorisierungsAnforderung_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="AutorisierungsId" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}Person"/>
- *         <element name="Rolle" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Autorisierungsart" type="{urn:omds3CommonServiceTypes-1-1-0}Autorisierungsart_Type" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AutorisierungsAnforderung_Type", propOrder = {
-    "autorisierungsId",
-    "person",
-    "rolle",
-    "autorisierungsart"
-})
-public class AutorisierungsAnforderungType {
-
-    @XmlElement(name = "AutorisierungsId")
-    protected Object autorisierungsId;
-    @XmlElement(name = "Person", required = true)
-    protected PersonType person;
-    @XmlElement(name = "Rolle", required = true)
-    protected String rolle;
-    @XmlElement(name = "Autorisierungsart", required = true)
-    protected List autorisierungsart;
-
-    /**
-     * Ruft den Wert der autorisierungsId-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Object }
-     *     
-     */
-    public Object getAutorisierungsId() {
-        return autorisierungsId;
-    }
-
-    /**
-     * Legt den Wert der autorisierungsId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     
-     */
-    public void setAutorisierungsId(Object value) {
-        this.autorisierungsId = value;
-    }
-
-    /**
-     * Ruft den Wert der person-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PersonType }
-     *     
-     */
-    public PersonType getPerson() {
-        return person;
-    }
-
-    /**
-     * Legt den Wert der person-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PersonType }
-     *     
-     */
-    public void setPerson(PersonType value) {
-        this.person = value;
-    }
-
-    /**
-     * Ruft den Wert der rolle-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRolle() {
-        return rolle;
-    }
-
-    /**
-     * Legt den Wert der rolle-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRolle(String value) {
-        this.rolle = value;
-    }
-
-    /**
-     * Gets the value of the autorisierungsart property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the autorisierungsart property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getAutorisierungsart().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link AutorisierungsartType }
-     * 
-     * 
-     */
-    public List getAutorisierungsart() {
-        if (autorisierungsart == null) {
-            autorisierungsart = new ArrayList();
-        }
-        return this.autorisierungsart;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartClientsidePhysischeUnterschrift.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartClientsidePhysischeUnterschrift.java
deleted file mode 100644
index 8b2fb948..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartClientsidePhysischeUnterschrift.java
+++ /dev/null
@@ -1,34 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Diese Autorisierungsart repräsentiert eine traditionelle physische Unterschrift auf Papier
- * 
- * 
Java-Klasse für AutorisierungsartClientsidePhysischeUnterschrift complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AutorisierungsartClientsidePhysischeUnterschrift">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}AutorisierungsartClientside_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AutorisierungsartClientsidePhysischeUnterschrift")
-public class AutorisierungsartClientsidePhysischeUnterschrift
-    extends AutorisierungsartClientsideType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartClientsideType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartClientsideType.java
deleted file mode 100644
index ce35a16f..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartClientsideType.java
+++ /dev/null
@@ -1,38 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Ein abstrakter Typ für Client-seitige Autorisierungsarten
- * 
- * 
Java-Klasse für AutorisierungsartClientside_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AutorisierungsartClientside_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Autorisierungsart_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AutorisierungsartClientside_Type")
-@XmlSeeAlso({
-    AutorisierungsartClientsidePhysischeUnterschrift.class
-})
-public abstract class AutorisierungsartClientsideType
-    extends AutorisierungsartType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartPhysischeUnterschrift.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartPhysischeUnterschrift.java
deleted file mode 100644
index e2488398..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartPhysischeUnterschrift.java
+++ /dev/null
@@ -1,34 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Diese Autorisierungsart repräsentiert eine traditionelle physische Unterschrift auf Papier
- * 
- * 
Java-Klasse für AutorisierungsartPhysischeUnterschrift complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AutorisierungsartPhysischeUnterschrift">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Autorisierungsart_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AutorisierungsartPhysischeUnterschrift")
-public class AutorisierungsartPhysischeUnterschrift
-    extends AutorisierungsartType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartServersideType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartServersideType.java
deleted file mode 100644
index d77ba591..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartServersideType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Ein abstrakter Typ für Server-seitige Autorisierungsarten
- * 
- * 
Java-Klasse für AutorisierungsartServerside_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AutorisierungsartServerside_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Autorisierungsart_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AutorisierungsartServerside_Type")
-public abstract class AutorisierungsartServersideType
-    extends AutorisierungsartType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartType.java
deleted file mode 100644
index c6b75a98..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Ein abstrakter Obertyp fuer alle Autorisierungsarten
- * 
- * 
Java-Klasse für Autorisierungsart_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Autorisierungsart_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Autorisierungsart_Type")
-@XmlSeeAlso({
-    AutorisierungsartPhysischeUnterschrift.class
-})
-public abstract class AutorisierungsartType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BankverbindungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BankverbindungType.java
deleted file mode 100644
index 5a279b74..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BankverbindungType.java
+++ /dev/null
@@ -1,152 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * beschreibt eine Bankverbindug
- * 
- * 
Java-Klasse für Bankverbindung_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Bankverbindung_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Kontoinhaber" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Bank" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="BIC" type="{urn:omds3CommonServiceTypes-1-1-0}BIC_Type" minOccurs="0"/>
- *         <element name="IBAN" type="{urn:omds3CommonServiceTypes-1-1-0}IBAN_Type"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Bankverbindung_Type", propOrder = {
-    "kontoinhaber",
-    "bank",
-    "bic",
-    "iban"
-})
-@XmlSeeAlso({
-    PersBankverbindungType.class
-})
-public class BankverbindungType {
-
-    @XmlElement(name = "Kontoinhaber", required = true)
-    protected String kontoinhaber;
-    @XmlElement(name = "Bank")
-    protected String bank;
-    @XmlElement(name = "BIC")
-    protected String bic;
-    @XmlElement(name = "IBAN", required = true)
-    protected String iban;
-
-    /**
-     * Ruft den Wert der kontoinhaber-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getKontoinhaber() {
-        return kontoinhaber;
-    }
-
-    /**
-     * Legt den Wert der kontoinhaber-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setKontoinhaber(String value) {
-        this.kontoinhaber = value;
-    }
-
-    /**
-     * Ruft den Wert der bank-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBank() {
-        return bank;
-    }
-
-    /**
-     * Legt den Wert der bank-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBank(String value) {
-        this.bank = value;
-    }
-
-    /**
-     * Ruft den Wert der bic-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBIC() {
-        return bic;
-    }
-
-    /**
-     * Legt den Wert der bic-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBIC(String value) {
-        this.bic = value;
-    }
-
-    /**
-     * Ruft den Wert der iban-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getIBAN() {
-        return iban;
-    }
-
-    /**
-     * Legt den Wert der iban-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setIBAN(String value) {
-        this.iban = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BasisProduktbausteinType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BasisProduktbausteinType.java
deleted file mode 100644
index c1f98b63..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BasisProduktbausteinType.java
+++ /dev/null
@@ -1,164 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Typ für alle Gemeinsamkeiten von Produktbausteinen
- * 
- * 
Java-Klasse für BasisProduktbaustein_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="BasisProduktbaustein_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Bezeichnung" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Bedingungen" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Meldungen" type="{urn:omds3CommonServiceTypes-1-1-0}ServiceFault" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BasisProduktbaustein_Type", propOrder = {
-    "id",
-    "bezeichnung",
-    "bedingungen",
-    "meldungen"
-})
-@XmlSeeAlso({
-    ProduktbausteinType.class
-})
-public abstract class BasisProduktbausteinType {
-
-    @XmlElement(name = "Id")
-    protected String id;
-    @XmlElement(name = "Bezeichnung")
-    protected String bezeichnung;
-    @XmlElement(name = "Bedingungen")
-    protected List bedingungen;
-    @XmlElement(name = "Meldungen")
-    protected List meldungen;
-
-    /**
-     * Ruft den Wert der id-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Legt den Wert der id-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    /**
-     * Ruft den Wert der bezeichnung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBezeichnung() {
-        return bezeichnung;
-    }
-
-    /**
-     * Legt den Wert der bezeichnung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBezeichnung(String value) {
-        this.bezeichnung = value;
-    }
-
-    /**
-     * Gets the value of the bedingungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the bedingungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getBedingungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List getBedingungen() {
-        if (bedingungen == null) {
-            bedingungen = new ArrayList();
-        }
-        return this.bedingungen;
-    }
-
-    /**
-     * Gets the value of the meldungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the meldungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getMeldungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ServiceFault }
-     * 
-     * 
-     */
-    public List getMeldungen() {
-        if (meldungen == null) {
-            meldungen = new ArrayList();
-        }
-        return this.meldungen;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BerechnungsvarianteType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BerechnungsvarianteType.java
deleted file mode 100644
index 435b4711..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BerechnungsvarianteType.java
+++ /dev/null
@@ -1,54 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
Java-Klasse für Berechnungsvariante_Type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

- * 
- * <simpleType name="Berechnungsvariante_Type">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="basic"/>
- *     <enumeration value="medium"/>
- *     <enumeration value="top"/>
- *   </restriction>
- * </simpleType>
- * 

- * 
- */
-@XmlType(name = "Berechnungsvariante_Type")
-@XmlEnum
-public enum BerechnungsvarianteType {
-
-    @XmlEnumValue("basic")
-    BASIC("basic"),
-    @XmlEnumValue("medium")
-    MEDIUM("medium"),
-    @XmlEnumValue("top")
-    TOP("top");
-    private final String value;
-
-    BerechnungsvarianteType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static BerechnungsvarianteType fromValue(String v) {
-        for (BerechnungsvarianteType c: BerechnungsvarianteType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BeteiligtePersonVertragType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BeteiligtePersonVertragType.java
deleted file mode 100644
index 058ff095..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BeteiligtePersonVertragType.java
+++ /dev/null
@@ -1,86 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Typ für die Meldung von Personen, die an einem Vertrag beteiligt sind
- * 
- * 
Java-Klasse für BeteiligtePersonVertrag_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="BeteiligtePersonVertrag_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Lfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort"/>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}Person"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BeteiligtePersonVertrag_Type", propOrder = {
-    "lfnr",
-    "person"
-})
-public class BeteiligtePersonVertragType {
-
-    @XmlElement(name = "Lfnr")
-    @XmlSchemaType(name = "unsignedShort")
-    protected int lfnr;
-    @XmlElement(name = "Person", required = true)
-    protected PersonType person;
-
-    /**
-     * Ruft den Wert der lfnr-Eigenschaft ab.
-     * 
-     */
-    public int getLfnr() {
-        return lfnr;
-    }
-
-    /**
-     * Legt den Wert der lfnr-Eigenschaft fest.
-     * 
-     */
-    public void setLfnr(int value) {
-        this.lfnr = value;
-    }
-
-    /**
-     * Objekt zur Übermittlung von Personendaten ähnlich zu omds:PERSON, aber Personennr ist nicht Pflichtfeld. Kann Adressdaten enthalten.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PersonType }
-     *     
-     */
-    public PersonType getPerson() {
-        return person;
-    }
-
-    /**
-     * Legt den Wert der person-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PersonType }
-     *     
-     */
-    public void setPerson(PersonType value) {
-        this.person = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungGesetzlicheErbenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungGesetzlicheErbenType.java
deleted file mode 100644
index 3993d86f..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungGesetzlicheErbenType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Bezugsberechtigung gesetzliche Erben
- * 
- * 
Java-Klasse für BezugsberechtigungGesetzlicheErben_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="BezugsberechtigungGesetzlicheErben_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Bezugsberechtigung_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BezugsberechtigungGesetzlicheErben_Type")
-public class BezugsberechtigungGesetzlicheErbenType
-    extends BezugsberechtigungType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungIndividuell.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungIndividuell.java
deleted file mode 100644
index 5dbcd068..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungIndividuell.java
+++ /dev/null
@@ -1,66 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Bezugsberechtigung Individuell
- * 
- * 
Java-Klasse für BezugsberechtigungIndividuell complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="BezugsberechtigungIndividuell">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Bezugsberechtigung_Type">
- *       <sequence>
- *         <element name="Beschreibung" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BezugsberechtigungIndividuell", propOrder = {
-    "beschreibung"
-})
-public class BezugsberechtigungIndividuell
-    extends BezugsberechtigungType
-{
-
-    @XmlElement(name = "Beschreibung", required = true)
-    protected String beschreibung;
-
-    /**
-     * Ruft den Wert der beschreibung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBeschreibung() {
-        return beschreibung;
-    }
-
-    /**
-     * Legt den Wert der beschreibung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBeschreibung(String value) {
-        this.beschreibung = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungNamentlich.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungNamentlich.java
deleted file mode 100644
index d4cbf9ae..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungNamentlich.java
+++ /dev/null
@@ -1,93 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Bezugsberechtigung namentlich
- * 
- * 
Java-Klasse für BezugsberechtigungNamentlich complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="BezugsberechtigungNamentlich">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Bezugsberechtigung_Type">
- *       <sequence>
- *         <element name="Unwiderruflich" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="Personen" type="{urn:omds3CommonServiceTypes-1-1-0}PersonNamentlichesBezugsrecht_Type" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BezugsberechtigungNamentlich", propOrder = {
-    "unwiderruflich",
-    "personen"
-})
-public class BezugsberechtigungNamentlich
-    extends BezugsberechtigungType
-{
-
-    @XmlElement(name = "Unwiderruflich")
-    protected boolean unwiderruflich;
-    @XmlElement(name = "Personen", required = true)
-    protected List personen;
-
-    /**
-     * Ruft den Wert der unwiderruflich-Eigenschaft ab.
-     * 
-     */
-    public boolean isUnwiderruflich() {
-        return unwiderruflich;
-    }
-
-    /**
-     * Legt den Wert der unwiderruflich-Eigenschaft fest.
-     * 
-     */
-    public void setUnwiderruflich(boolean value) {
-        this.unwiderruflich = value;
-    }
-
-    /**
-     * Gets the value of the personen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the personen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getPersonen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link PersonNamentlichesBezugsrechtType }
-     * 
-     * 
-     */
-    public List getPersonen() {
-        if (personen == null) {
-            personen = new ArrayList();
-        }
-        return this.personen;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungTestamentarischeErbenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungTestamentarischeErbenType.java
deleted file mode 100644
index 251668cc..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungTestamentarischeErbenType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Bezugsberechtigung testamentarische Erben
- * 
- * 
Java-Klasse für BezugsberechtigungTestamentarischeErben_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="BezugsberechtigungTestamentarischeErben_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Bezugsberechtigung_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BezugsberechtigungTestamentarischeErben_Type")
-public class BezugsberechtigungTestamentarischeErbenType
-    extends BezugsberechtigungType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungType.java
deleted file mode 100644
index a5f4c46a..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungType.java
+++ /dev/null
@@ -1,73 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Type Bezugsrecht, von diesem erben die unterschiedlichen Typen: Gesetzliche Erben, Überbringer, Namentlich, Individuell
- * 
- * 
Java-Klasse für Bezugsberechtigung_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Bezugsberechtigung_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Art">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}unsignedByte">
- *               <enumeration value="0"/>
- *               <enumeration value="1"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Bezugsberechtigung_Type", propOrder = {
-    "art"
-})
-@XmlSeeAlso({
-    BezugsberechtigungGesetzlicheErbenType.class,
-    BezugsberechtigungTestamentarischeErbenType.class,
-    BezugsberechtigungUeberbringerType.class,
-    BezugsberechtigungNamentlich.class,
-    BezugsberechtigungVersicherungsnehmerType.class,
-    BezugsberechtigungVersichertePersonType.class,
-    BezugsberechtigungIndividuell.class
-})
-public abstract class BezugsberechtigungType {
-
-    @XmlElement(name = "Art")
-    protected short art;
-
-    /**
-     * Ruft den Wert der art-Eigenschaft ab.
-     * 
-     */
-    public short getArt() {
-        return art;
-    }
-
-    /**
-     * Legt den Wert der art-Eigenschaft fest.
-     * 
-     */
-    public void setArt(short value) {
-        this.art = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungUeberbringerType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungUeberbringerType.java
deleted file mode 100644
index b91f4f03..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungUeberbringerType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Bezugsberechtigung Überbringer
- * 
- * 
Java-Klasse für BezugsberechtigungUeberbringer_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="BezugsberechtigungUeberbringer_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Bezugsberechtigung_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BezugsberechtigungUeberbringer_Type")
-public class BezugsberechtigungUeberbringerType
-    extends BezugsberechtigungType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungVersichertePersonType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungVersichertePersonType.java
deleted file mode 100644
index f9ec4914..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungVersichertePersonType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Bezugsberechtigung VersichertePerson
- * 
- * 
Java-Klasse für BezugsberechtigungVersichertePerson_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="BezugsberechtigungVersichertePerson_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Bezugsberechtigung_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BezugsberechtigungVersichertePerson_Type")
-public class BezugsberechtigungVersichertePersonType
-    extends BezugsberechtigungType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungVersicherungsnehmerType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungVersicherungsnehmerType.java
deleted file mode 100644
index 8d7bbc58..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsberechtigungVersicherungsnehmerType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Bezugsberechtigung Versicherungsnehmer
- * 
- * 
Java-Klasse für BezugsberechtigungVersicherungsnehmer_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="BezugsberechtigungVersicherungsnehmer_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Bezugsberechtigung_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BezugsberechtigungVersicherungsnehmer_Type")
-public class BezugsberechtigungVersicherungsnehmerType
-    extends BezugsberechtigungType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsrechtType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsrechtType.java
deleted file mode 100644
index 71b296d3..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BezugsrechtType.java
+++ /dev/null
@@ -1,65 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds2Types.v2_14.PERSONType;
-
-
-/**
- * Type Bezugsrecht fuer Kfz
- * 
- * 
Java-Klasse für Bezugsrecht_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Bezugsrecht_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:omds20}PERSON"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Bezugsrecht_Type", propOrder = {
-    "person"
-})
-public class BezugsrechtType {
-
-    @XmlElement(name = "PERSON", namespace = "urn:omds20", required = true)
-    protected PERSONType person;
-
-    /**
-     * Ruft den Wert der person-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PERSONType }
-     *     
-     */
-    public PERSONType getPERSON() {
-        return person;
-    }
-
-    /**
-     * Legt den Wert der person-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PERSONType }
-     *     
-     */
-    public void setPERSON(PERSONType value) {
-        this.person = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BonusMalusSystemType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BonusMalusSystemType.java
deleted file mode 100644
index f2b41c17..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BonusMalusSystemType.java
+++ /dev/null
@@ -1,157 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Type Bonus Malus System
- * 
- * 
Java-Klasse für BonusMalusSystem_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="BonusMalusSystem_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="BonusMalusVorversicherung" type="{urn:omds3CommonServiceTypes-1-1-0}BonusMalusVorversicherung_Type"/>
- *         <element name="Versicherungsgesellschaft" type="{urn:omds3CommonServiceTypes-1-1-0}Versicherungsgesellschaft_Type" minOccurs="0"/>
- *         <element name="Polizzennummer" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <minLength value="1"/>
- *               <maxLength value="15"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="OffeneSchaeden" type="{urn:omds3CommonServiceTypes-1-1-0}OffeneSchaeden_Type" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BonusMalusSystem_Type", propOrder = {
-    "bonusMalusVorversicherung",
-    "versicherungsgesellschaft",
-    "polizzennummer",
-    "offeneSchaeden"
-})
-public class BonusMalusSystemType {
-
-    @XmlElement(name = "BonusMalusVorversicherung", required = true)
-    @XmlSchemaType(name = "string")
-    protected BonusMalusVorversicherungType bonusMalusVorversicherung;
-    @XmlElement(name = "Versicherungsgesellschaft")
-    protected String versicherungsgesellschaft;
-    @XmlElement(name = "Polizzennummer")
-    protected String polizzennummer;
-    @XmlElement(name = "OffeneSchaeden")
-    protected OffeneSchaedenType offeneSchaeden;
-
-    /**
-     * Ruft den Wert der bonusMalusVorversicherung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BonusMalusVorversicherungType }
-     *     
-     */
-    public BonusMalusVorversicherungType getBonusMalusVorversicherung() {
-        return bonusMalusVorversicherung;
-    }
-
-    /**
-     * Legt den Wert der bonusMalusVorversicherung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BonusMalusVorversicherungType }
-     *     
-     */
-    public void setBonusMalusVorversicherung(BonusMalusVorversicherungType value) {
-        this.bonusMalusVorversicherung = value;
-    }
-
-    /**
-     * Ruft den Wert der versicherungsgesellschaft-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVersicherungsgesellschaft() {
-        return versicherungsgesellschaft;
-    }
-
-    /**
-     * Legt den Wert der versicherungsgesellschaft-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVersicherungsgesellschaft(String value) {
-        this.versicherungsgesellschaft = value;
-    }
-
-    /**
-     * Ruft den Wert der polizzennummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolizzennummer() {
-        return polizzennummer;
-    }
-
-    /**
-     * Legt den Wert der polizzennummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolizzennummer(String value) {
-        this.polizzennummer = value;
-    }
-
-    /**
-     * Ruft den Wert der offeneSchaeden-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link OffeneSchaedenType }
-     *     
-     */
-    public OffeneSchaedenType getOffeneSchaeden() {
-        return offeneSchaeden;
-    }
-
-    /**
-     * Legt den Wert der offeneSchaeden-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link OffeneSchaedenType }
-     *     
-     */
-    public void setOffeneSchaeden(OffeneSchaedenType value) {
-        this.offeneSchaeden = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BonusMalusVorversicherungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BonusMalusVorversicherungType.java
deleted file mode 100644
index 4e32550c..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/BonusMalusVorversicherungType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
Java-Klasse für BonusMalusVorversicherung_Type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

- * 
- * <simpleType name="BonusMalusVorversicherung_Type">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="Ohne Vorversicherung"/>
- *     <enumeration value="Mit Vorversicherung"/>
- *     <enumeration value="BM-Übernahme von Angehörigen"/>
- *     <enumeration value="BM-Übernahme vom Dienstgeber"/>
- *   </restriction>
- * </simpleType>
- * 

- * 
- */
-@XmlType(name = "BonusMalusVorversicherung_Type")
-@XmlEnum
-public enum BonusMalusVorversicherungType {
-
-    @XmlEnumValue("Ohne Vorversicherung")
-    OHNE_VORVERSICHERUNG("Ohne Vorversicherung"),
-    @XmlEnumValue("Mit Vorversicherung")
-    MIT_VORVERSICHERUNG("Mit Vorversicherung"),
-    @XmlEnumValue("BM-\u00dcbernahme von Angeh\u00f6rigen")
-    BM_ÜBERNAHME_VON_ANGEHÖRIGEN("BM-\u00dcbernahme von Angeh\u00f6rigen"),
-    @XmlEnumValue("BM-\u00dcbernahme vom Dienstgeber")
-    BM_ÜBERNAHME_VOM_DIENSTGEBER("BM-\u00dcbernahme vom Dienstgeber");
-    private final String value;
-
-    BonusMalusVorversicherungType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static BonusMalusVorversicherungType fromValue(String v) {
-        for (BonusMalusVorversicherungType c: BonusMalusVorversicherungType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonProcessRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonProcessRequestType.java
deleted file mode 100644
index daf71995..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonProcessRequestType.java
+++ /dev/null
@@ -1,79 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on1basis.CreateFormRequest;
-import at.vvo.omds.types.omds3Types.r1_7_0.on1basis.SubmitFormRequest;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.BOAProcessRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.FetchPolicyRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.StartPolicyChangeRequest;
-
-
-/**
- * Abstakter Typ fuer Requests, die Teil eines Geschaeftsfalls mit eigener Id sind
- * 
- * 
Java-Klasse für CommonProcessRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CommonProcessRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element name="Geschaeftsfallnummer" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CommonProcessRequest_Type", propOrder = {
-    "geschaeftsfallnummer"
-})
-@XmlSeeAlso({
-    FetchPolicyRequestType.class,
-    SubmitFormRequest.class,
-    CreateFormRequest.class,
-    BOAProcessRequestType.class,
-    StartPolicyChangeRequest.class
-})
-public abstract class CommonProcessRequestType
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "Geschaeftsfallnummer")
-    protected ObjektIdType geschaeftsfallnummer;
-
-    /**
-     * Ruft den Wert der geschaeftsfallnummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getGeschaeftsfallnummer() {
-        return geschaeftsfallnummer;
-    }
-
-    /**
-     * Legt den Wert der geschaeftsfallnummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setGeschaeftsfallnummer(ObjektIdType value) {
-        this.geschaeftsfallnummer = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonProcessResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonProcessResponseType.java
deleted file mode 100644
index 89f180c5..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonProcessResponseType.java
+++ /dev/null
@@ -1,79 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on1basis.CreateFormResponse;
-import at.vvo.omds.types.omds3Types.r1_7_0.on1basis.SubmitFormResponse;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.BOAProcessResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.FetchPolicyResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.StartPolicyChangeResponse;
-
-
-/**
- * Abstrakter Typ für Ergebnisse, die Teil eines Geschaeftsfalls mit eigener Id sind
- * 
- * 
Java-Klasse für CommonProcessResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CommonProcessResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence>
- *         <element name="Geschaeftsfallnummer" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CommonProcessResponse_Type", propOrder = {
-    "geschaeftsfallnummer"
-})
-@XmlSeeAlso({
-    SubmitFormResponse.class,
-    CreateFormResponse.class,
-    FetchPolicyResponseType.class,
-    BOAProcessResponseType.class,
-    StartPolicyChangeResponse.class
-})
-public abstract class CommonProcessResponseType
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "Geschaeftsfallnummer")
-    protected ObjektIdType geschaeftsfallnummer;
-
-    /**
-     * Ruft den Wert der geschaeftsfallnummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getGeschaeftsfallnummer() {
-        return geschaeftsfallnummer;
-    }
-
-    /**
-     * Legt den Wert der geschaeftsfallnummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setGeschaeftsfallnummer(ObjektIdType value) {
-        this.geschaeftsfallnummer = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonRequestType.java
deleted file mode 100644
index ee7da45f..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonRequestType.java
+++ /dev/null
@@ -1,237 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetElementListRequest;
-import at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetStateSignaturesRequest;
-import at.vvo.omds.types.omds3Types.r1_7_0.on1basis.UnderwriteDocumentRequest;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.GetApplicationDocumentRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.CheckClaimRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.CheckCoverageRequest;
-import at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.GetClaimRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SubmitClaimRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SubmitReceiptRequest;
-import on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.CollectionChangeRequest;
-import on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.CollectionRhythmChangeRequest;
-import on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.CollectionRhythmInfoRequest;
-import on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.GetPoliciesOfPartnerRequestType;
-import on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.SetMailingAddressRequestType;
-import on4partner._0._4.v1.omds3types.types.omds.vvo.at.AddCommunicationObjectRequestType;
-import on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangeCommunicationObjectRequestType;
-import on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangePartnerMainAddressRequestType;
-import on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangePersonDataRequestType;
-import on4partner._0._4.v1.omds3types.types.omds.vvo.at.CheckAddressRequestType;
-import on4partner._0._4.v1.omds3types.types.omds.vvo.at.DeleteCommunicationObjectRequestType;
-import on4partner._0._4.v1.omds3types.types.omds.vvo.at.GetPartnerRequestType;
-import produktfinder.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.FinderRequestType;
-
-
-/**
- * Abstraktes RequestObjekt
- * 
- * 
Java-Klasse für CommonRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CommonRequest_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="VUNr" type="{urn:omds20}VUNr"/>
- *         <element name="ClientId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="TechnischeParameter" type="{urn:omds3CommonServiceTypes-1-1-0}TechnicalKeyValue_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="TechnischeObjekte" type="{urn:omds3CommonServiceTypes-1-1-0}TechnischesObjekt_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="KorrelationsId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CommonRequest_Type", propOrder = {
-    "vuNr",
-    "clientId",
-    "technischeParameter",
-    "technischeObjekte",
-    "korrelationsId"
-})
-@XmlSeeAlso({
-    GetApplicationDocumentRequestType.class,
-    FinderRequestType.class,
-    CheckClaimRequestType.class,
-    SubmitClaimRequestType.class,
-    GetClaimRequestType.class,
-    GetPartnerRequestType.class,
-    CheckAddressRequestType.class,
-    ChangePartnerMainAddressRequestType.class,
-    ChangePersonDataRequestType.class,
-    ChangeCommunicationObjectRequestType.class,
-    AddCommunicationObjectRequestType.class,
-    DeleteCommunicationObjectRequestType.class,
-    GetPoliciesOfPartnerRequestType.class,
-    SetMailingAddressRequestType.class,
-    CommonSearchRequestType.class,
-    UnderwriteDocumentRequest.class,
-    GetElementListRequest.class,
-    GetStateSignaturesRequest.class,
-    CollectionRhythmChangeRequest.class,
-    CollectionRhythmInfoRequest.class,
-    CollectionChangeRequest.class,
-    SubmitReceiptRequest.class,
-    CheckCoverageRequest.class,
-    CommonProcessRequestType.class
-})
-public abstract class CommonRequestType {
-
-    @XmlElement(name = "VUNr", required = true)
-    protected String vuNr;
-    @XmlElement(name = "ClientId")
-    protected String clientId;
-    @XmlElement(name = "TechnischeParameter")
-    protected List technischeParameter;
-    @XmlElement(name = "TechnischeObjekte")
-    protected List technischeObjekte;
-    @XmlElement(name = "KorrelationsId", required = true)
-    protected String korrelationsId;
-
-    /**
-     * Ruft den Wert der vuNr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVUNr() {
-        return vuNr;
-    }
-
-    /**
-     * Legt den Wert der vuNr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVUNr(String value) {
-        this.vuNr = value;
-    }
-
-    /**
-     * Ruft den Wert der clientId-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getClientId() {
-        return clientId;
-    }
-
-    /**
-     * Legt den Wert der clientId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setClientId(String value) {
-        this.clientId = value;
-    }
-
-    /**
-     * Gets the value of the technischeParameter property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the technischeParameter property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getTechnischeParameter().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link TechnicalKeyValueType }
-     * 
-     * 
-     */
-    public List getTechnischeParameter() {
-        if (technischeParameter == null) {
-            technischeParameter = new ArrayList();
-        }
-        return this.technischeParameter;
-    }
-
-    /**
-     * Gets the value of the technischeObjekte property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the technischeObjekte property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getTechnischeObjekte().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link TechnischesObjektType }
-     * 
-     * 
-     */
-    public List getTechnischeObjekte() {
-        if (technischeObjekte == null) {
-            technischeObjekte = new ArrayList();
-        }
-        return this.technischeObjekte;
-    }
-
-    /**
-     * Ruft den Wert der korrelationsId-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getKorrelationsId() {
-        return korrelationsId;
-    }
-
-    /**
-     * Legt den Wert der korrelationsId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setKorrelationsId(String value) {
-        this.korrelationsId = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonResponseType.java
deleted file mode 100644
index 4e7c8bff..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonResponseType.java
+++ /dev/null
@@ -1,208 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-import at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetElementListResponse;
-import at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetStateSignaturesResponse;
-import at.vvo.omds.types.omds3Types.r1_7_0.on1basis.UnderwriteDocumentResponse;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.GetApplicationDocumentResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.CheckClaimResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.CheckCoverageResponse;
-import at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.GetClaimResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SubmitClaimResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SubmitReceiptResponse;
-import on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.CollectionChangeResponse;
-import on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.CollectionRhythmChangeResponse;
-import on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.CollectionRhythmInfoResponse;
-import on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.GetPoliciesOfPartnerResponseType;
-import on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.SetMailingAddressResponseType;
-import on4partner._0._4.v1.omds3types.types.omds.vvo.at.AddCommunicationObjectResponseType;
-import on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangeCommunicationObjectResponseType;
-import on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangePartnerMainAddressResponseType;
-import on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangePersonDataResponseType;
-import on4partner._0._4.v1.omds3types.types.omds.vvo.at.CheckAddressResponseType;
-import on4partner._0._4.v1.omds3types.types.omds.vvo.at.DeleteCommunicationObjectResponseType;
-import on4partner._0._4.v1.omds3types.types.omds.vvo.at.GetPartnerResponseType;
-import produktfinder.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.FinderResponseType;
-
-
-/**
- * Abstraktes ResponseObjekt
- * 
- * 
Java-Klasse für CommonResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CommonResponse_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Status" type="{urn:omds3CommonServiceTypes-1-1-0}ResponseStatus_Type"/>
- *         <element name="TechnischeObjekte" type="{urn:omds3CommonServiceTypes-1-1-0}TechnischesObjekt_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Gestartet" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
- *         <element name="Beendet" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CommonResponse_Type", propOrder = {
-    "status",
-    "technischeObjekte",
-    "gestartet",
-    "beendet"
-})
-@XmlSeeAlso({
-    GetApplicationDocumentResponseType.class,
-    FinderResponseType.class,
-    CheckClaimResponseType.class,
-    SubmitClaimResponseType.class,
-    GetClaimResponseType.class,
-    GetPartnerResponseType.class,
-    CheckAddressResponseType.class,
-    ChangePartnerMainAddressResponseType.class,
-    ChangePersonDataResponseType.class,
-    AddCommunicationObjectResponseType.class,
-    DeleteCommunicationObjectResponseType.class,
-    GetPoliciesOfPartnerResponseType.class,
-    SetMailingAddressResponseType.class,
-    CommonSearchResponseType.class,
-    UnderwriteDocumentResponse.class,
-    GetElementListResponse.class,
-    GetStateSignaturesResponse.class,
-    CollectionRhythmChangeResponse.class,
-    CollectionRhythmInfoResponse.class,
-    CollectionChangeResponse.class,
-    ChangeCommunicationObjectResponseType.class,
-    SubmitReceiptResponse.class,
-    CheckCoverageResponse.class,
-    CommonProcessResponseType.class
-})
-public abstract class CommonResponseType {
-
-    @XmlElement(name = "Status", required = true)
-    protected ResponseStatusType status;
-    @XmlElement(name = "TechnischeObjekte")
-    protected List technischeObjekte;
-    @XmlElement(name = "Gestartet")
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar gestartet;
-    @XmlElement(name = "Beendet")
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar beendet;
-
-    /**
-     * Ruft den Wert der status-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ResponseStatusType }
-     *     
-     */
-    public ResponseStatusType getStatus() {
-        return status;
-    }
-
-    /**
-     * Legt den Wert der status-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ResponseStatusType }
-     *     
-     */
-    public void setStatus(ResponseStatusType value) {
-        this.status = value;
-    }
-
-    /**
-     * Gets the value of the technischeObjekte property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the technischeObjekte property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getTechnischeObjekte().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link TechnischesObjektType }
-     * 
-     * 
-     */
-    public List getTechnischeObjekte() {
-        if (technischeObjekte == null) {
-            technischeObjekte = new ArrayList();
-        }
-        return this.technischeObjekte;
-    }
-
-    /**
-     * Ruft den Wert der gestartet-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getGestartet() {
-        return gestartet;
-    }
-
-    /**
-     * Legt den Wert der gestartet-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setGestartet(XMLGregorianCalendar value) {
-        this.gestartet = value;
-    }
-
-    /**
-     * Ruft den Wert der beendet-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getBeendet() {
-        return beendet;
-    }
-
-    /**
-     * Legt den Wert der beendet-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setBeendet(XMLGregorianCalendar value) {
-        this.beendet = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonSearchRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonSearchRequestType.java
deleted file mode 100644
index 4a8495f3..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonSearchRequestType.java
+++ /dev/null
@@ -1,205 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds2Types.v2_14.ELZeitraumType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetStateChangesRequestType;
-
-
-/**
- * Abstakter Typ fuer Suchanfragen
- * 
- * 
Java-Klasse für CommonSearchRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CommonSearchRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element name="AuthFilter" type="{urn:omds3CommonServiceTypes-1-1-0}AuthorizationFilter" minOccurs="0"/>
- *         <element name="Suchbegriff" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Zeitraum" type="{urn:omds20}EL-Zeitraum_Type" minOccurs="0"/>
- *         <element name="MaxResults" type="{http://www.w3.org/2001/XMLSchema}unsignedInt"/>
- *         <element name="Offset" type="{http://www.w3.org/2001/XMLSchema}unsignedInt"/>
- *         <element name="OrderBy" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <enumeration value="Meldedatum aufsteigend"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CommonSearchRequest_Type", propOrder = {
-    "authFilter",
-    "suchbegriff",
-    "zeitraum",
-    "maxResults",
-    "offset",
-    "orderBy"
-})
-@XmlSeeAlso({
-    GetStateChangesRequestType.class
-})
-public abstract class CommonSearchRequestType
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "AuthFilter")
-    protected AuthorizationFilter authFilter;
-    @XmlElement(name = "Suchbegriff")
-    protected String suchbegriff;
-    @XmlElement(name = "Zeitraum")
-    protected ELZeitraumType zeitraum;
-    @XmlElement(name = "MaxResults")
-    @XmlSchemaType(name = "unsignedInt")
-    protected long maxResults;
-    @XmlElement(name = "Offset")
-    @XmlSchemaType(name = "unsignedInt")
-    protected long offset;
-    @XmlElement(name = "OrderBy")
-    protected String orderBy;
-
-    /**
-     * Ruft den Wert der authFilter-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public AuthorizationFilter getAuthFilter() {
-        return authFilter;
-    }
-
-    /**
-     * Legt den Wert der authFilter-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public void setAuthFilter(AuthorizationFilter value) {
-        this.authFilter = value;
-    }
-
-    /**
-     * Ruft den Wert der suchbegriff-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSuchbegriff() {
-        return suchbegriff;
-    }
-
-    /**
-     * Legt den Wert der suchbegriff-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSuchbegriff(String value) {
-        this.suchbegriff = value;
-    }
-
-    /**
-     * Ruft den Wert der zeitraum-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ELZeitraumType }
-     *     
-     */
-    public ELZeitraumType getZeitraum() {
-        return zeitraum;
-    }
-
-    /**
-     * Legt den Wert der zeitraum-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ELZeitraumType }
-     *     
-     */
-    public void setZeitraum(ELZeitraumType value) {
-        this.zeitraum = value;
-    }
-
-    /**
-     * Ruft den Wert der maxResults-Eigenschaft ab.
-     * 
-     */
-    public long getMaxResults() {
-        return maxResults;
-    }
-
-    /**
-     * Legt den Wert der maxResults-Eigenschaft fest.
-     * 
-     */
-    public void setMaxResults(long value) {
-        this.maxResults = value;
-    }
-
-    /**
-     * Ruft den Wert der offset-Eigenschaft ab.
-     * 
-     */
-    public long getOffset() {
-        return offset;
-    }
-
-    /**
-     * Legt den Wert der offset-Eigenschaft fest.
-     * 
-     */
-    public void setOffset(long value) {
-        this.offset = value;
-    }
-
-    /**
-     * Ruft den Wert der orderBy-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderBy() {
-        return orderBy;
-    }
-
-    /**
-     * Legt den Wert der orderBy-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderBy(String value) {
-        this.orderBy = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonSearchResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonSearchResponseType.java
deleted file mode 100644
index af9e5bcb..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonSearchResponseType.java
+++ /dev/null
@@ -1,107 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetStateChangesResponseType;
-
-
-/**
- * Abstrakter Typ für Ergebnisse von Suchen
- * 
- * 
Java-Klasse für CommonSearchResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CommonSearchResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence>
- *         <element name="ActualOffset" type="{http://www.w3.org/2001/XMLSchema}unsignedInt"/>
- *         <element name="ActualMaxResults" type="{http://www.w3.org/2001/XMLSchema}unsignedInt"/>
- *         <element name="TotalResults" type="{http://www.w3.org/2001/XMLSchema}unsignedInt"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CommonSearchResponse_Type", propOrder = {
-    "actualOffset",
-    "actualMaxResults",
-    "totalResults"
-})
-@XmlSeeAlso({
-    GetStateChangesResponseType.class
-})
-public abstract class CommonSearchResponseType
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "ActualOffset")
-    @XmlSchemaType(name = "unsignedInt")
-    protected long actualOffset;
-    @XmlElement(name = "ActualMaxResults")
-    @XmlSchemaType(name = "unsignedInt")
-    protected long actualMaxResults;
-    @XmlElement(name = "TotalResults")
-    @XmlSchemaType(name = "unsignedInt")
-    protected long totalResults;
-
-    /**
-     * Ruft den Wert der actualOffset-Eigenschaft ab.
-     * 
-     */
-    public long getActualOffset() {
-        return actualOffset;
-    }
-
-    /**
-     * Legt den Wert der actualOffset-Eigenschaft fest.
-     * 
-     */
-    public void setActualOffset(long value) {
-        this.actualOffset = value;
-    }
-
-    /**
-     * Ruft den Wert der actualMaxResults-Eigenschaft ab.
-     * 
-     */
-    public long getActualMaxResults() {
-        return actualMaxResults;
-    }
-
-    /**
-     * Legt den Wert der actualMaxResults-Eigenschaft fest.
-     * 
-     */
-    public void setActualMaxResults(long value) {
-        this.actualMaxResults = value;
-    }
-
-    /**
-     * Ruft den Wert der totalResults-Eigenschaft ab.
-     * 
-     */
-    public long getTotalResults() {
-        return totalResults;
-    }
-
-    /**
-     * Legt den Wert der totalResults-Eigenschaft fest.
-     * 
-     */
-    public void setTotalResults(long value) {
-        this.totalResults = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DateianhangType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DateianhangType.java
deleted file mode 100644
index 5b9fed45..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DateianhangType.java
+++ /dev/null
@@ -1,192 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.activation.DataHandler;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlMimeType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Deprecated, verwende ProzessDokument_Type. Dateianhang welcher an einen Geschäftsfall hinzugefügt werden kann
- *             
- * 
- * 
Java-Klasse für Dateianhang_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Dateianhang_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Mimetype" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="DateiType" type="{urn:omds3CommonServiceTypes-1-1-0}TypeDateianhang_Type" minOccurs="0"/>
- *         <element name="DateiName">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <maxLength value="100"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="DateiData" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         <element name="DateiBeschreibung" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <maxLength value="200"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Dateianhang_Type", propOrder = {
-    "mimetype",
-    "dateiType",
-    "dateiName",
-    "dateiData",
-    "dateiBeschreibung"
-})
-public class DateianhangType {
-
-    @XmlElement(name = "Mimetype", required = true)
-    protected String mimetype;
-    @XmlElement(name = "DateiType")
-    protected Integer dateiType;
-    @XmlElement(name = "DateiName", required = true)
-    protected String dateiName;
-    @XmlElement(name = "DateiData", required = true)
-    @XmlMimeType("application/octet-stream")
-    protected DataHandler dateiData;
-    @XmlElement(name = "DateiBeschreibung")
-    protected String dateiBeschreibung;
-
-    /**
-     * Ruft den Wert der mimetype-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMimetype() {
-        return mimetype;
-    }
-
-    /**
-     * Legt den Wert der mimetype-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMimetype(String value) {
-        this.mimetype = value;
-    }
-
-    /**
-     * Ruft den Wert der dateiType-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getDateiType() {
-        return dateiType;
-    }
-
-    /**
-     * Legt den Wert der dateiType-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setDateiType(Integer value) {
-        this.dateiType = value;
-    }
-
-    /**
-     * Ruft den Wert der dateiName-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDateiName() {
-        return dateiName;
-    }
-
-    /**
-     * Legt den Wert der dateiName-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDateiName(String value) {
-        this.dateiName = value;
-    }
-
-    /**
-     * Ruft den Wert der dateiData-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataHandler }
-     *     
-     */
-    public DataHandler getDateiData() {
-        return dateiData;
-    }
-
-    /**
-     * Legt den Wert der dateiData-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataHandler }
-     *     
-     */
-    public void setDateiData(DataHandler value) {
-        this.dateiData = value;
-    }
-
-    /**
-     * Ruft den Wert der dateiBeschreibung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDateiBeschreibung() {
-        return dateiBeschreibung;
-    }
-
-    /**
-     * Legt den Wert der dateiBeschreibung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDateiBeschreibung(String value) {
-        this.dateiBeschreibung = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DatenverwendungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DatenverwendungType.java
deleted file mode 100644
index 5423026c..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DatenverwendungType.java
+++ /dev/null
@@ -1,112 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Type Datenverwendung
- * 
- * 
Java-Klasse für Datenverwendung_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Datenverwendung_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ZustimmungZurElektrUebermittlungVorvertraglDokumente" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="ElektrUebermittlungVorvertraglDokumenteEmail" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="ZustimmungZurVerwendungDerDatenZuWerbezwecken" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Datenverwendung_Type", propOrder = {
-    "zustimmungZurElektrUebermittlungVorvertraglDokumente",
-    "elektrUebermittlungVorvertraglDokumenteEmail",
-    "zustimmungZurVerwendungDerDatenZuWerbezwecken"
-})
-public class DatenverwendungType {
-
-    @XmlElement(name = "ZustimmungZurElektrUebermittlungVorvertraglDokumente")
-    protected Boolean zustimmungZurElektrUebermittlungVorvertraglDokumente;
-    @XmlElement(name = "ElektrUebermittlungVorvertraglDokumenteEmail")
-    protected String elektrUebermittlungVorvertraglDokumenteEmail;
-    @XmlElement(name = "ZustimmungZurVerwendungDerDatenZuWerbezwecken")
-    protected boolean zustimmungZurVerwendungDerDatenZuWerbezwecken;
-
-    /**
-     * Ruft den Wert der zustimmungZurElektrUebermittlungVorvertraglDokumente-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isZustimmungZurElektrUebermittlungVorvertraglDokumente() {
-        return zustimmungZurElektrUebermittlungVorvertraglDokumente;
-    }
-
-    /**
-     * Legt den Wert der zustimmungZurElektrUebermittlungVorvertraglDokumente-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setZustimmungZurElektrUebermittlungVorvertraglDokumente(Boolean value) {
-        this.zustimmungZurElektrUebermittlungVorvertraglDokumente = value;
-    }
-
-    /**
-     * Ruft den Wert der elektrUebermittlungVorvertraglDokumenteEmail-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getElektrUebermittlungVorvertraglDokumenteEmail() {
-        return elektrUebermittlungVorvertraglDokumenteEmail;
-    }
-
-    /**
-     * Legt den Wert der elektrUebermittlungVorvertraglDokumenteEmail-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setElektrUebermittlungVorvertraglDokumenteEmail(String value) {
-        this.elektrUebermittlungVorvertraglDokumenteEmail = value;
-    }
-
-    /**
-     * Ruft den Wert der zustimmungZurVerwendungDerDatenZuWerbezwecken-Eigenschaft ab.
-     * 
-     */
-    public boolean isZustimmungZurVerwendungDerDatenZuWerbezwecken() {
-        return zustimmungZurVerwendungDerDatenZuWerbezwecken;
-    }
-
-    /**
-     * Legt den Wert der zustimmungZurVerwendungDerDatenZuWerbezwecken-Eigenschaft fest.
-     * 
-     */
-    public void setZustimmungZurVerwendungDerDatenZuWerbezwecken(boolean value) {
-        this.zustimmungZurVerwendungDerDatenZuWerbezwecken = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DirectionCdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DirectionCdType.java
deleted file mode 100644
index 8efea620..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DirectionCdType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
Java-Klasse für DirectionCd_Type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

- * 
- * <simpleType name="DirectionCd_Type">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="IN"/>
- *     <enumeration value="OUT"/>
- *   </restriction>
- * </simpleType>
- * 

- * 
- */
-@XmlType(name = "DirectionCd_Type")
-@XmlEnum
-public enum DirectionCdType {
-
-
-    /**
-     * Input-Wert
-     * 
-     */
-    IN,
-
-    /**
-     * Output-Wert
-     * 
-     */
-    OUT;
-
-    public String value() {
-        return name();
-    }
-
-    public static DirectionCdType fromValue(String v) {
-        return valueOf(v);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentBinaryDataType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentBinaryDataType.java
deleted file mode 100644
index 2e78f4a7..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentBinaryDataType.java
+++ /dev/null
@@ -1,156 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.activation.DataHandler;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlMimeType;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * Typ zur Übermittlung von Dokumenten als Binary plus Metadaten
- * 
- * 
Java-Klasse für DokumentBinaryData_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="DokumentBinaryData_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}DokumentData_Type">
- *       <sequence>
- *         <element name="DateiData" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         <element name="Mimetype" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Groesse" type="{http://www.w3.org/2001/XMLSchema}long" minOccurs="0"/>
- *         <element name="Datum" type="{urn:omds20}Datum-Zeit" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DokumentBinaryData_Type", propOrder = {
-    "dateiData",
-    "mimetype",
-    "groesse",
-    "datum"
-})
-public class DokumentBinaryDataType
-    extends DokumentDataType
-{
-
-    @XmlElement(name = "DateiData", required = true)
-    @XmlMimeType("application/octet-stream")
-    protected DataHandler dateiData;
-    @XmlElement(name = "Mimetype", required = true)
-    protected String mimetype;
-    @XmlElement(name = "Groesse")
-    protected Long groesse;
-    @XmlElement(name = "Datum")
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar datum;
-
-    /**
-     * Ruft den Wert der dateiData-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataHandler }
-     *     
-     */
-    public DataHandler getDateiData() {
-        return dateiData;
-    }
-
-    /**
-     * Legt den Wert der dateiData-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataHandler }
-     *     
-     */
-    public void setDateiData(DataHandler value) {
-        this.dateiData = value;
-    }
-
-    /**
-     * Ruft den Wert der mimetype-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMimetype() {
-        return mimetype;
-    }
-
-    /**
-     * Legt den Wert der mimetype-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMimetype(String value) {
-        this.mimetype = value;
-    }
-
-    /**
-     * Ruft den Wert der groesse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Long }
-     *     
-     */
-    public Long getGroesse() {
-        return groesse;
-    }
-
-    /**
-     * Legt den Wert der groesse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Long }
-     *     
-     */
-    public void setGroesse(Long value) {
-        this.groesse = value;
-    }
-
-    /**
-     * Ruft den Wert der datum-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDatum() {
-        return datum;
-    }
-
-    /**
-     * Legt den Wert der datum-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDatum(XMLGregorianCalendar value) {
-        this.datum = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentDataType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentDataType.java
deleted file mode 100644
index c8c93157..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentDataType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Typ zur Übermittlung von Dokumentendaten
- * 
- * 
Java-Klasse für DokumentData_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="DokumentData_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DokumentData_Type")
-@XmlSeeAlso({
-    DokumentBinaryDataType.class
-})
-public abstract class DokumentDataType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentFormDataType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentFormDataType.java
deleted file mode 100644
index 1ec6f124..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentFormDataType.java
+++ /dev/null
@@ -1,64 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Typ zur Übermittlung von Formulardaten als Dokument
- * 
- * 
Java-Klasse für DokumentFormData_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="DokumentFormData_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}Formular"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DokumentFormData_Type", propOrder = {
-    "formular"
-})
-public class DokumentFormDataType {
-
-    @XmlElement(name = "Formular", required = true)
-    protected Formular formular;
-
-    /**
-     * Ruft den Wert der formular-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Formular }
-     *     
-     */
-    public Formular getFormular() {
-        return formular;
-    }
-
-    /**
-     * Legt den Wert der formular-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Formular }
-     *     
-     */
-    public void setFormular(Formular value) {
-        this.formular = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentInfoType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentInfoType.java
deleted file mode 100644
index b821cd49..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentInfoType.java
+++ /dev/null
@@ -1,309 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.activation.DataHandler;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlMimeType;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * Typ mit Informationen zu einem Dokument (kann auch das Dokument selbst enthalten)
- * 
- * 
Java-Klasse für DokumentInfo_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="DokumentInfo_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
- *         <element name="Name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="DocumentType" type="{urn:omds3CommonServiceTypes-1-1-0}DocumentType"/>
- *         <element name="Mimetype" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Groesse" type="{http://www.w3.org/2001/XMLSchema}long" minOccurs="0"/>
- *         <element name="Datum" type="{urn:omds20}Datum-Zeit" minOccurs="0"/>
- *         <element name="ReferenzWeitereDokumente" type="{urn:omds3CommonServiceTypes-1-1-0}DokumentInfo_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="ArtAusfolgung" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}unsignedByte">
- *               <enumeration value="0"/>
- *               <enumeration value="1"/>
- *               <enumeration value="2"/>
- *               <enumeration value="3"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="Unterschrift" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}unsignedByte">
- *               <enumeration value="0"/>
- *               <enumeration value="1"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DokumentInfo_Type", propOrder = {
-    "content",
-    "name",
-    "documentType",
-    "mimetype",
-    "groesse",
-    "datum",
-    "referenzWeitereDokumente",
-    "artAusfolgung",
-    "unterschrift"
-})
-public class DokumentInfoType {
-
-    @XmlElement(name = "Content")
-    @XmlMimeType("application/octet-stream")
-    protected DataHandler content;
-    @XmlElement(name = "Name")
-    protected String name;
-    @XmlElement(name = "DocumentType")
-    protected int documentType;
-    @XmlElement(name = "Mimetype")
-    protected String mimetype;
-    @XmlElement(name = "Groesse")
-    protected Long groesse;
-    @XmlElement(name = "Datum")
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar datum;
-    @XmlElement(name = "ReferenzWeitereDokumente")
-    protected List referenzWeitereDokumente;
-    @XmlElement(name = "ArtAusfolgung")
-    protected Short artAusfolgung;
-    @XmlElement(name = "Unterschrift")
-    protected Short unterschrift;
-
-    /**
-     * Ruft den Wert der content-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataHandler }
-     *     
-     */
-    public DataHandler getContent() {
-        return content;
-    }
-
-    /**
-     * Legt den Wert der content-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataHandler }
-     *     
-     */
-    public void setContent(DataHandler value) {
-        this.content = value;
-    }
-
-    /**
-     * Ruft den Wert der name-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Legt den Wert der name-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Ruft den Wert der documentType-Eigenschaft ab.
-     * 
-     */
-    public int getDocumentType() {
-        return documentType;
-    }
-
-    /**
-     * Legt den Wert der documentType-Eigenschaft fest.
-     * 
-     */
-    public void setDocumentType(int value) {
-        this.documentType = value;
-    }
-
-    /**
-     * Ruft den Wert der mimetype-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMimetype() {
-        return mimetype;
-    }
-
-    /**
-     * Legt den Wert der mimetype-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMimetype(String value) {
-        this.mimetype = value;
-    }
-
-    /**
-     * Ruft den Wert der groesse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Long }
-     *     
-     */
-    public Long getGroesse() {
-        return groesse;
-    }
-
-    /**
-     * Legt den Wert der groesse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Long }
-     *     
-     */
-    public void setGroesse(Long value) {
-        this.groesse = value;
-    }
-
-    /**
-     * Ruft den Wert der datum-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDatum() {
-        return datum;
-    }
-
-    /**
-     * Legt den Wert der datum-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDatum(XMLGregorianCalendar value) {
-        this.datum = value;
-    }
-
-    /**
-     * Gets the value of the referenzWeitereDokumente property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the referenzWeitereDokumente property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getReferenzWeitereDokumente().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link DokumentInfoType }
-     * 
-     * 
-     */
-    public List getReferenzWeitereDokumente() {
-        if (referenzWeitereDokumente == null) {
-            referenzWeitereDokumente = new ArrayList();
-        }
-        return this.referenzWeitereDokumente;
-    }
-
-    /**
-     * Ruft den Wert der artAusfolgung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Short }
-     *     
-     */
-    public Short getArtAusfolgung() {
-        return artAusfolgung;
-    }
-
-    /**
-     * Legt den Wert der artAusfolgung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Short }
-     *     
-     */
-    public void setArtAusfolgung(Short value) {
-        this.artAusfolgung = value;
-    }
-
-    /**
-     * Ruft den Wert der unterschrift-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Short }
-     *     
-     */
-    public Short getUnterschrift() {
-        return unterschrift;
-    }
-
-    /**
-     * Legt den Wert der unterschrift-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Short }
-     *     
-     */
-    public void setUnterschrift(Short value) {
-        this.unterschrift = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentenReferenzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentenReferenzType.java
deleted file mode 100644
index 8f9aeb24..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentenReferenzType.java
+++ /dev/null
@@ -1,262 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Information zu einem einzelnen Dokument
- * 
- * 
Java-Klasse für DokumentenReferenz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="DokumentenReferenz_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Id" type="{urn:omds3CommonServiceTypes-1-1-0}ElementIdType"/>
- *         <element name="Name" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="DocumentType" type="{urn:omds3CommonServiceTypes-1-1-0}DocumentType"/>
- *         <element name="Mimetype" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Groesse" type="{http://www.w3.org/2001/XMLSchema}long" minOccurs="0"/>
- *         <element name="Datum" type="{urn:omds20}Datum-Zeit"/>
- *         <element name="ObjektSpezifikation" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektSpezifikation_Type" minOccurs="0"/>
- *         <element name="ReferenzWeitereDokumente" type="{urn:omds3CommonServiceTypes-1-1-0}DokumentenReferenz_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DokumentenReferenz_Type", propOrder = {
-    "id",
-    "name",
-    "documentType",
-    "mimetype",
-    "groesse",
-    "datum",
-    "objektSpezifikation",
-    "referenzWeitereDokumente"
-})
-public class DokumentenReferenzType {
-
-    @XmlElement(name = "Id", required = true)
-    protected ElementIdType id;
-    @XmlElement(name = "Name", required = true)
-    protected String name;
-    @XmlElement(name = "DocumentType")
-    protected int documentType;
-    @XmlElement(name = "Mimetype")
-    protected String mimetype;
-    @XmlElement(name = "Groesse")
-    protected Long groesse;
-    @XmlElement(name = "Datum", required = true)
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar datum;
-    @XmlElement(name = "ObjektSpezifikation")
-    protected ObjektSpezifikationType objektSpezifikation;
-    @XmlElement(name = "ReferenzWeitereDokumente")
-    protected List referenzWeitereDokumente;
-
-    /**
-     * Ruft den Wert der id-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ElementIdType }
-     *     
-     */
-    public ElementIdType getId() {
-        return id;
-    }
-
-    /**
-     * Legt den Wert der id-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ElementIdType }
-     *     
-     */
-    public void setId(ElementIdType value) {
-        this.id = value;
-    }
-
-    /**
-     * Ruft den Wert der name-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Legt den Wert der name-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Ruft den Wert der documentType-Eigenschaft ab.
-     * 
-     */
-    public int getDocumentType() {
-        return documentType;
-    }
-
-    /**
-     * Legt den Wert der documentType-Eigenschaft fest.
-     * 
-     */
-    public void setDocumentType(int value) {
-        this.documentType = value;
-    }
-
-    /**
-     * Ruft den Wert der mimetype-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMimetype() {
-        return mimetype;
-    }
-
-    /**
-     * Legt den Wert der mimetype-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMimetype(String value) {
-        this.mimetype = value;
-    }
-
-    /**
-     * Ruft den Wert der groesse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Long }
-     *     
-     */
-    public Long getGroesse() {
-        return groesse;
-    }
-
-    /**
-     * Legt den Wert der groesse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Long }
-     *     
-     */
-    public void setGroesse(Long value) {
-        this.groesse = value;
-    }
-
-    /**
-     * Ruft den Wert der datum-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDatum() {
-        return datum;
-    }
-
-    /**
-     * Legt den Wert der datum-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDatum(XMLGregorianCalendar value) {
-        this.datum = value;
-    }
-
-    /**
-     * Ruft den Wert der objektSpezifikation-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektSpezifikationType }
-     *     
-     */
-    public ObjektSpezifikationType getObjektSpezifikation() {
-        return objektSpezifikation;
-    }
-
-    /**
-     * Legt den Wert der objektSpezifikation-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektSpezifikationType }
-     *     
-     */
-    public void setObjektSpezifikation(ObjektSpezifikationType value) {
-        this.objektSpezifikation = value;
-    }
-
-    /**
-     * Gets the value of the referenzWeitereDokumente property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the referenzWeitereDokumente property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getReferenzWeitereDokumente().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link DokumentenReferenzType }
-     * 
-     * 
-     */
-    public List getReferenzWeitereDokumente() {
-        if (referenzWeitereDokumente == null) {
-            referenzWeitereDokumente = new ArrayList();
-        }
-        return this.referenzWeitereDokumente;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EintragSchluessellisteType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EintragSchluessellisteType.java
deleted file mode 100644
index f766a416..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EintragSchluessellisteType.java
+++ /dev/null
@@ -1,92 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Typ für einen einzelnen Eintrag einer Schlüsselliste
- * 
- * 
Java-Klasse für EintragSchluesselliste_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="EintragSchluesselliste_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Text" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Schluessel" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EintragSchluesselliste_Type", propOrder = {
-    "text",
-    "schluessel"
-})
-public class EintragSchluessellisteType {
-
-    @XmlElement(name = "Text", required = true)
-    protected String text;
-    @XmlElement(name = "Schluessel", required = true)
-    protected String schluessel;
-
-    /**
-     * Ruft den Wert der text-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getText() {
-        return text;
-    }
-
-    /**
-     * Legt den Wert der text-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setText(String value) {
-        this.text = value;
-    }
-
-    /**
-     * Ruft den Wert der schluessel-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSchluessel() {
-        return schluessel;
-    }
-
-    /**
-     * Legt den Wert der schluessel-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSchluessel(String value) {
-        this.schluessel = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EinwGesDatenVNType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EinwGesDatenVNType.java
deleted file mode 100644
index 410e16c4..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EinwGesDatenVNType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Einwilligung Bekanntgabe Gesundheitsdaten an VN
- * 
- * 
Java-Klasse für EinwGesDatenVN_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="EinwGesDatenVN_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}EinwilligungPersDaten_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EinwGesDatenVN_Type")
-public class EinwGesDatenVNType
-    extends EinwilligungPersDatenType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EinwSprachaufzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EinwSprachaufzType.java
deleted file mode 100644
index 8f157190..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EinwSprachaufzType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Einwilligung Sprachaufzeichnung
- * 
- * 
Java-Klasse für EinwSprachaufz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="EinwSprachaufz_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}EinwilligungPersDaten_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EinwSprachaufz_Type")
-public class EinwSprachaufzType
-    extends EinwilligungPersDatenType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EinwVerarbGesDatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EinwVerarbGesDatenType.java
deleted file mode 100644
index 5d749dd8..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EinwVerarbGesDatenType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Einwilligung Verarbeitung Gesundheitsdaten
- * 
- * 
Java-Klasse für EinwVerarbGesDaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="EinwVerarbGesDaten_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}EinwilligungPersDaten_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EinwVerarbGesDaten_Type")
-public class EinwVerarbGesDatenType
-    extends EinwilligungPersDatenType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EinwilligungPersDatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EinwilligungPersDatenType.java
deleted file mode 100644
index 48b95ab5..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EinwilligungPersDatenType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Typ für Einwilligung personenbezogene Daten
- * 
- * 
Java-Klasse für EinwilligungPersDaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="EinwilligungPersDaten_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Einwilligung_Type">
- *       <sequence>
- *         <element name="PersonRefLfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EinwilligungPersDaten_Type", propOrder = {
-    "personRefLfnr"
-})
-@XmlSeeAlso({
-    EinwVerarbGesDatenType.class,
-    EinwGesDatenVNType.class,
-    EinwSprachaufzType.class
-})
-public abstract class EinwilligungPersDatenType
-    extends EinwilligungType
-{
-
-    @XmlElement(name = "PersonRefLfnr")
-    @XmlSchemaType(name = "unsignedShort")
-    protected int personRefLfnr;
-
-    /**
-     * Ruft den Wert der personRefLfnr-Eigenschaft ab.
-     * 
-     */
-    public int getPersonRefLfnr() {
-        return personRefLfnr;
-    }
-
-    /**
-     * Legt den Wert der personRefLfnr-Eigenschaft fest.
-     * 
-     */
-    public void setPersonRefLfnr(int value) {
-        this.personRefLfnr = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EinwilligungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EinwilligungType.java
deleted file mode 100644
index e617cfcd..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/EinwilligungType.java
+++ /dev/null
@@ -1,96 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Typ für Einwilligung
- * 
- * 
Java-Klasse für Einwilligung_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Einwilligung_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Zustimmung" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="Text" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Einwilligung_Type", propOrder = {
-    "zustimmung",
-    "text"
-})
-@XmlSeeAlso({
-    EinwilligungPersDatenType.class
-})
-public abstract class EinwilligungType {
-
-    @XmlElement(name = "Zustimmung")
-    protected Boolean zustimmung;
-    @XmlElement(name = "Text")
-    protected String text;
-
-    /**
-     * Ruft den Wert der zustimmung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isZustimmung() {
-        return zustimmung;
-    }
-
-    /**
-     * Legt den Wert der zustimmung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setZustimmung(Boolean value) {
-        this.zustimmung = value;
-    }
-
-    /**
-     * Ruft den Wert der text-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getText() {
-        return text;
-    }
-
-    /**
-     * Legt den Wert der text-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setText(String value) {
-        this.text = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ElementFondsauswahlType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ElementFondsauswahlType.java
deleted file mode 100644
index 2d1407db..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ElementFondsauswahlType.java
+++ /dev/null
@@ -1,164 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Ein einzelnes Element einer Fondsauswahl
- * 
- * 
Java-Klasse für ElementFondsauswahl_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ElementFondsauswahl_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <choice>
- *           <element name="ISIN" type="{urn:omds3CommonServiceTypes-1-1-0}AttributEnum_Type"/>
- *           <element name="WKN" type="{urn:omds3CommonServiceTypes-1-1-0}AttributEnum_Type"/>
- *         </choice>
- *         <element name="Prozentanteil" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}float">
- *               <minInclusive value="0"/>
- *               <maxInclusive value="100"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="ZusaetzlicheFondsdaten" type="{urn:omds3CommonServiceTypes-1-1-0}ZusaetzlicheFondsdaten_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ElementFondsauswahl_Type", propOrder = {
-    "isin",
-    "wkn",
-    "prozentanteil",
-    "zusaetzlicheFondsdaten"
-})
-public class ElementFondsauswahlType {
-
-    @XmlElement(name = "ISIN")
-    protected AttributEnumType isin;
-    @XmlElement(name = "WKN")
-    protected AttributEnumType wkn;
-    @XmlElement(name = "Prozentanteil")
-    protected Float prozentanteil;
-    @XmlElement(name = "ZusaetzlicheFondsdaten")
-    protected List zusaetzlicheFondsdaten;
-
-    /**
-     * Ruft den Wert der isin-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributEnumType }
-     *     
-     */
-    public AttributEnumType getISIN() {
-        return isin;
-    }
-
-    /**
-     * Legt den Wert der isin-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributEnumType }
-     *     
-     */
-    public void setISIN(AttributEnumType value) {
-        this.isin = value;
-    }
-
-    /**
-     * Ruft den Wert der wkn-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributEnumType }
-     *     
-     */
-    public AttributEnumType getWKN() {
-        return wkn;
-    }
-
-    /**
-     * Legt den Wert der wkn-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributEnumType }
-     *     
-     */
-    public void setWKN(AttributEnumType value) {
-        this.wkn = value;
-    }
-
-    /**
-     * Ruft den Wert der prozentanteil-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Float }
-     *     
-     */
-    public Float getProzentanteil() {
-        return prozentanteil;
-    }
-
-    /**
-     * Legt den Wert der prozentanteil-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Float }
-     *     
-     */
-    public void setProzentanteil(Float value) {
-        this.prozentanteil = value;
-    }
-
-    /**
-     * Gets the value of the zusaetzlicheFondsdaten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zusaetzlicheFondsdaten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZusaetzlicheFondsdaten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ZusaetzlicheFondsdatenType }
-     * 
-     * 
-     */
-    public List getZusaetzlicheFondsdaten() {
-        if (zusaetzlicheFondsdaten == null) {
-            zusaetzlicheFondsdaten = new ArrayList();
-        }
-        return this.zusaetzlicheFondsdaten;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ElementIdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ElementIdType.java
deleted file mode 100644
index 9abc8561..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ElementIdType.java
+++ /dev/null
@@ -1,114 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Ein Typ für eine Objekt-Id in Verbindung mit einem möglichen Ablaufzeitpunkt und dem Hinweis, ob die Id nur einmalig oder auch mehrmalig verwendet werden kann
- * 
- * 
Java-Klasse für ElementIdType complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ElementIdType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="id" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="idValidUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime"/>
- *         <element name="idIsSingleUse" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ElementIdType", propOrder = {
-    "id",
-    "idValidUntil",
-    "idIsSingleUse"
-})
-public class ElementIdType {
-
-    @XmlElement(required = true)
-    protected String id;
-    @XmlElement(required = true, nillable = true)
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar idValidUntil;
-    protected boolean idIsSingleUse;
-
-    /**
-     * Ruft den Wert der id-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Legt den Wert der id-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    /**
-     * Ruft den Wert der idValidUntil-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getIdValidUntil() {
-        return idValidUntil;
-    }
-
-    /**
-     * Legt den Wert der idValidUntil-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setIdValidUntil(XMLGregorianCalendar value) {
-        this.idValidUntil = value;
-    }
-
-    /**
-     * Ruft den Wert der idIsSingleUse-Eigenschaft ab.
-     * 
-     */
-    public boolean isIdIsSingleUse() {
-        return idIsSingleUse;
-    }
-
-    /**
-     * Legt den Wert der idIsSingleUse-Eigenschaft fest.
-     * 
-     */
-    public void setIdIsSingleUse(boolean value) {
-        this.idIsSingleUse = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ElementarproduktGenerischType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ElementarproduktGenerischType.java
deleted file mode 100644
index f506d49c..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ElementarproduktGenerischType.java
+++ /dev/null
@@ -1,191 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.ElementarproduktSachPrivatType;
-import kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.ElementarproduktKrankenType;
-import leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.TarifLebenType;
-import rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.ElementarproduktRechtsschutzType;
-import unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.LeistungsartUnfallType;
-
-
-/**
- * Basistyp für ein Elementarprodukt, 2. Generation
- * 
- * 
Java-Klasse für ElementarproduktGenerisch_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ElementarproduktGenerisch_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Elementarprodukt_Type">
- *       <sequence>
- *         <element name="Eingeschlossen" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="EinschlussAenderbar" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="AttributMetadaten" type="{urn:omds3CommonServiceTypes-1-1-0}AttributMetadaten_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="BeschreibungTxt" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Versicherungssumme" type="{urn:omds20}decimal14_2" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ElementarproduktGenerisch_Type", propOrder = {
-    "eingeschlossen",
-    "einschlussAenderbar",
-    "attributMetadaten",
-    "beschreibungTxt",
-    "versicherungssumme"
-})
-@XmlSeeAlso({
-    ElementarproduktSachPrivatType.class,
-    TarifLebenType.class,
-    ElementarproduktKrankenType.class,
-    LeistungsartUnfallType.class,
-    ElementarproduktRechtsschutzType.class
-})
-public abstract class ElementarproduktGenerischType
-    extends ElementarproduktType
-{
-
-    @XmlElement(name = "Eingeschlossen")
-    protected boolean eingeschlossen;
-    @XmlElement(name = "EinschlussAenderbar")
-    protected Boolean einschlussAenderbar;
-    @XmlElement(name = "AttributMetadaten")
-    protected List attributMetadaten;
-    @XmlElement(name = "BeschreibungTxt")
-    protected String beschreibungTxt;
-    @XmlElement(name = "Versicherungssumme")
-    protected BigDecimal versicherungssumme;
-
-    /**
-     * Ruft den Wert der eingeschlossen-Eigenschaft ab.
-     * 
-     */
-    public boolean isEingeschlossen() {
-        return eingeschlossen;
-    }
-
-    /**
-     * Legt den Wert der eingeschlossen-Eigenschaft fest.
-     * 
-     */
-    public void setEingeschlossen(boolean value) {
-        this.eingeschlossen = value;
-    }
-
-    /**
-     * Ruft den Wert der einschlussAenderbar-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isEinschlussAenderbar() {
-        return einschlussAenderbar;
-    }
-
-    /**
-     * Legt den Wert der einschlussAenderbar-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setEinschlussAenderbar(Boolean value) {
-        this.einschlussAenderbar = value;
-    }
-
-    /**
-     * Gets the value of the attributMetadaten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the attributMetadaten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getAttributMetadaten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link AttributMetadatenType }
-     * 
-     * 
-     */
-    public List getAttributMetadaten() {
-        if (attributMetadaten == null) {
-            attributMetadaten = new ArrayList();
-        }
-        return this.attributMetadaten;
-    }
-
-    /**
-     * Ruft den Wert der beschreibungTxt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBeschreibungTxt() {
-        return beschreibungTxt;
-    }
-
-    /**
-     * Legt den Wert der beschreibungTxt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBeschreibungTxt(String value) {
-        this.beschreibungTxt = value;
-    }
-
-    /**
-     * Ruft den Wert der versicherungssumme-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getVersicherungssumme() {
-        return versicherungssumme;
-    }
-
-    /**
-     * Legt den Wert der versicherungssumme-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setVersicherungssumme(BigDecimal value) {
-        this.versicherungssumme = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ElementarproduktType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ElementarproduktType.java
deleted file mode 100644
index d64cc432..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ElementarproduktType.java
+++ /dev/null
@@ -1,141 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.ElementarproduktKfzType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.VerkehrsrechtsschutzKfzType;
-
-
-/**
- * Basistyp für ein Elementarprodukt
- * 
- * 
Java-Klasse für Elementarprodukt_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Elementarprodukt_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Produktbaustein_Type">
- *       <sequence>
- *         <element name="VtgBeg" type="{urn:omds20}Datum" minOccurs="0"/>
- *         <element name="RefSicherstellungLfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/>
- *         <element name="ZusaetzlicheElementarproduktdaten" type="{urn:omds3CommonServiceTypes-1-1-0}ZusaetzlicheElementarproduktdaten_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Elementarprodukt_Type", propOrder = {
-    "vtgBeg",
-    "refSicherstellungLfnr",
-    "zusaetzlicheElementarproduktdaten"
-})
-@XmlSeeAlso({
-    ElementarproduktKfzType.class,
-    VerkehrsrechtsschutzKfzType.class,
-    ElementarproduktGenerischType.class
-})
-public abstract class ElementarproduktType
-    extends ProduktbausteinType
-{
-
-    @XmlElement(name = "VtgBeg")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar vtgBeg;
-    @XmlElement(name = "RefSicherstellungLfnr")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer refSicherstellungLfnr;
-    @XmlElement(name = "ZusaetzlicheElementarproduktdaten")
-    protected List zusaetzlicheElementarproduktdaten;
-
-    /**
-     * Ruft den Wert der vtgBeg-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getVtgBeg() {
-        return vtgBeg;
-    }
-
-    /**
-     * Legt den Wert der vtgBeg-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setVtgBeg(XMLGregorianCalendar value) {
-        this.vtgBeg = value;
-    }
-
-    /**
-     * Ruft den Wert der refSicherstellungLfnr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getRefSicherstellungLfnr() {
-        return refSicherstellungLfnr;
-    }
-
-    /**
-     * Legt den Wert der refSicherstellungLfnr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setRefSicherstellungLfnr(Integer value) {
-        this.refSicherstellungLfnr = value;
-    }
-
-    /**
-     * Gets the value of the zusaetzlicheElementarproduktdaten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zusaetzlicheElementarproduktdaten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZusaetzlicheElementarproduktdaten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ZusaetzlicheElementarproduktdatenType }
-     * 
-     * 
-     */
-    public List getZusaetzlicheElementarproduktdaten() {
-        if (zusaetzlicheElementarproduktdaten == null) {
-            zusaetzlicheElementarproduktdaten = new ArrayList();
-        }
-        return this.zusaetzlicheElementarproduktdaten;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ErsatzpolizzeMitAendGrundType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ErsatzpolizzeMitAendGrundType.java
deleted file mode 100644
index e850499b..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ErsatzpolizzeMitAendGrundType.java
+++ /dev/null
@@ -1,94 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Einfache Implementierung einer zu ersetzenden Polizze mit Angabe eines Änderungsgrunds
- * 
- * 
Java-Klasse für ErsatzpolizzeMitAendGrund_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ErsatzpolizzeMitAendGrund_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Ersatzpolizze_Type">
- *       <sequence>
- *         <element name="AendGrundCd" type="{urn:omds20}AendGrundCd_Type"/>
- *         <element name="AendGrundbez" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ErsatzpolizzeMitAendGrund_Type", propOrder = {
-    "aendGrundCd",
-    "aendGrundbez"
-})
-public class ErsatzpolizzeMitAendGrundType
-    extends ErsatzpolizzeType
-{
-
-    @XmlElement(name = "AendGrundCd", required = true)
-    protected String aendGrundCd;
-    @XmlElement(name = "AendGrundbez")
-    protected String aendGrundbez;
-
-    /**
-     * Ruft den Wert der aendGrundCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAendGrundCd() {
-        return aendGrundCd;
-    }
-
-    /**
-     * Legt den Wert der aendGrundCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAendGrundCd(String value) {
-        this.aendGrundCd = value;
-    }
-
-    /**
-     * Ruft den Wert der aendGrundbez-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAendGrundbez() {
-        return aendGrundbez;
-    }
-
-    /**
-     * Legt den Wert der aendGrundbez-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAendGrundbez(String value) {
-        this.aendGrundbez = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ErsatzpolizzeType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ErsatzpolizzeType.java
deleted file mode 100644
index 5e1e36b9..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ErsatzpolizzeType.java
+++ /dev/null
@@ -1,96 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Beschreibung einer durch Konvertierung zu ersetzenden Polizze
- * 
- * 
Java-Klasse für Ersatzpolizze_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Ersatzpolizze_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Polizzennr" type="{urn:omds20}Polizzennr"/>
- *         <element name="VertragsID" type="{urn:omds20}VertragsID" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Ersatzpolizze_Type", propOrder = {
-    "polizzennr",
-    "vertragsID"
-})
-@XmlSeeAlso({
-    ErsatzpolizzeMitAendGrundType.class
-})
-public abstract class ErsatzpolizzeType {
-
-    @XmlElement(name = "Polizzennr", required = true)
-    protected String polizzennr;
-    @XmlElement(name = "VertragsID")
-    protected String vertragsID;
-
-    /**
-     * Ruft den Wert der polizzennr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolizzennr() {
-        return polizzennr;
-    }
-
-    /**
-     * Legt den Wert der polizzennr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolizzennr(String value) {
-        this.polizzennr = value;
-    }
-
-    /**
-     * Ruft den Wert der vertragsID-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVertragsID() {
-        return vertragsID;
-    }
-
-    /**
-     * Legt den Wert der vertragsID-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVertragsID(String value) {
-        this.vertragsID = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ErsatzpolizzenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ErsatzpolizzenType.java
deleted file mode 100644
index e2860872..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ErsatzpolizzenType.java
+++ /dev/null
@@ -1,120 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Typ für Ersatzpolizzen
- * 
- * 
Java-Klasse für Ersatzpolizzen_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Ersatzpolizzen_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Ersatzpolizzennummer1" type="{urn:omds20}Polizzennr" minOccurs="0"/>
- *         <element name="Ersatzpolizzennummer2" type="{urn:omds20}Polizzennr" minOccurs="0"/>
- *         <element name="Ersatzpolizzennummer3" type="{urn:omds20}Polizzennr" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Ersatzpolizzen_Type", propOrder = {
-    "ersatzpolizzennummer1",
-    "ersatzpolizzennummer2",
-    "ersatzpolizzennummer3"
-})
-public class ErsatzpolizzenType {
-
-    @XmlElement(name = "Ersatzpolizzennummer1")
-    protected String ersatzpolizzennummer1;
-    @XmlElement(name = "Ersatzpolizzennummer2")
-    protected String ersatzpolizzennummer2;
-    @XmlElement(name = "Ersatzpolizzennummer3")
-    protected String ersatzpolizzennummer3;
-
-    /**
-     * Ruft den Wert der ersatzpolizzennummer1-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getErsatzpolizzennummer1() {
-        return ersatzpolizzennummer1;
-    }
-
-    /**
-     * Legt den Wert der ersatzpolizzennummer1-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setErsatzpolizzennummer1(String value) {
-        this.ersatzpolizzennummer1 = value;
-    }
-
-    /**
-     * Ruft den Wert der ersatzpolizzennummer2-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getErsatzpolizzennummer2() {
-        return ersatzpolizzennummer2;
-    }
-
-    /**
-     * Legt den Wert der ersatzpolizzennummer2-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setErsatzpolizzennummer2(String value) {
-        this.ersatzpolizzennummer2 = value;
-    }
-
-    /**
-     * Ruft den Wert der ersatzpolizzennummer3-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getErsatzpolizzennummer3() {
-        return ersatzpolizzennummer3;
-    }
-
-    /**
-     * Legt den Wert der ersatzpolizzennummer3-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setErsatzpolizzennummer3(String value) {
-        this.ersatzpolizzennummer3 = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/FATCANatPersonType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/FATCANatPersonType.java
deleted file mode 100644
index 39ce21c3..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/FATCANatPersonType.java
+++ /dev/null
@@ -1,76 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Fragen FATCA bei natürlichen Personen
- * 
- * 
Java-Klasse für FATCA_NatPersonType complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="FATCA_NatPersonType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="US_Indizien" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="US_Steuerpflicht" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FATCA_NatPersonType", propOrder = {
-    "usIndizien",
-    "usSteuerpflicht"
-})
-public class FATCANatPersonType {
-
-    @XmlElement(name = "US_Indizien")
-    protected boolean usIndizien;
-    @XmlElement(name = "US_Steuerpflicht")
-    protected boolean usSteuerpflicht;
-
-    /**
-     * Ruft den Wert der usIndizien-Eigenschaft ab.
-     * 
-     */
-    public boolean isUSIndizien() {
-        return usIndizien;
-    }
-
-    /**
-     * Legt den Wert der usIndizien-Eigenschaft fest.
-     * 
-     */
-    public void setUSIndizien(boolean value) {
-        this.usIndizien = value;
-    }
-
-    /**
-     * Ruft den Wert der usSteuerpflicht-Eigenschaft ab.
-     * 
-     */
-    public boolean isUSSteuerpflicht() {
-        return usSteuerpflicht;
-    }
-
-    /**
-     * Legt den Wert der usSteuerpflicht-Eigenschaft fest.
-     * 
-     */
-    public void setUSSteuerpflicht(boolean value) {
-        this.usSteuerpflicht = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/FATCASonstPersonType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/FATCASonstPersonType.java
deleted file mode 100644
index ce3c3a3f..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/FATCASonstPersonType.java
+++ /dev/null
@@ -1,132 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Fragen FATCA bei sonstigen Personen
- * 
- * 
Java-Klasse für FATCA_SonstPersonType complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="FATCA_SonstPersonType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="LandFirmensitz" type="{urn:omds3CommonServiceTypes-1-1-0}AttributEnum_Type"/>
- *         <element name="GIIN" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="KonzessionFinanzen" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="NichtFinanzielleDienstleistungen" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FATCA_SonstPersonType", propOrder = {
-    "landFirmensitz",
-    "giin",
-    "konzessionFinanzen",
-    "nichtFinanzielleDienstleistungen"
-})
-public class FATCASonstPersonType {
-
-    @XmlElement(name = "LandFirmensitz", required = true)
-    protected AttributEnumType landFirmensitz;
-    @XmlElement(name = "GIIN")
-    protected String giin;
-    @XmlElement(name = "KonzessionFinanzen")
-    protected boolean konzessionFinanzen;
-    @XmlElement(name = "NichtFinanzielleDienstleistungen")
-    protected boolean nichtFinanzielleDienstleistungen;
-
-    /**
-     * Ruft den Wert der landFirmensitz-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributEnumType }
-     *     
-     */
-    public AttributEnumType getLandFirmensitz() {
-        return landFirmensitz;
-    }
-
-    /**
-     * Legt den Wert der landFirmensitz-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributEnumType }
-     *     
-     */
-    public void setLandFirmensitz(AttributEnumType value) {
-        this.landFirmensitz = value;
-    }
-
-    /**
-     * Ruft den Wert der giin-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGIIN() {
-        return giin;
-    }
-
-    /**
-     * Legt den Wert der giin-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGIIN(String value) {
-        this.giin = value;
-    }
-
-    /**
-     * Ruft den Wert der konzessionFinanzen-Eigenschaft ab.
-     * 
-     */
-    public boolean isKonzessionFinanzen() {
-        return konzessionFinanzen;
-    }
-
-    /**
-     * Legt den Wert der konzessionFinanzen-Eigenschaft fest.
-     * 
-     */
-    public void setKonzessionFinanzen(boolean value) {
-        this.konzessionFinanzen = value;
-    }
-
-    /**
-     * Ruft den Wert der nichtFinanzielleDienstleistungen-Eigenschaft ab.
-     * 
-     */
-    public boolean isNichtFinanzielleDienstleistungen() {
-        return nichtFinanzielleDienstleistungen;
-    }
-
-    /**
-     * Legt den Wert der nichtFinanzielleDienstleistungen-Eigenschaft fest.
-     * 
-     */
-    public void setNichtFinanzielleDienstleistungen(boolean value) {
-        this.nichtFinanzielleDienstleistungen = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/FATCAType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/FATCAType.java
deleted file mode 100644
index 3e8e0232..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/FATCAType.java
+++ /dev/null
@@ -1,120 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Fragen gemäß FATCA
- * 
- * 
Java-Klasse für FATCA_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="FATCA_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="US_TIN" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="FATCA_NatPerson" type="{urn:omds3CommonServiceTypes-1-1-0}FATCA_NatPersonType"/>
- *         <element name="FATCA_SonstPerson" type="{urn:omds3CommonServiceTypes-1-1-0}FATCA_SonstPersonType"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FATCA_Type", propOrder = {
-    "ustin",
-    "fatcaNatPerson",
-    "fatcaSonstPerson"
-})
-public class FATCAType {
-
-    @XmlElement(name = "US_TIN")
-    protected String ustin;
-    @XmlElement(name = "FATCA_NatPerson")
-    protected FATCANatPersonType fatcaNatPerson;
-    @XmlElement(name = "FATCA_SonstPerson")
-    protected FATCASonstPersonType fatcaSonstPerson;
-
-    /**
-     * Ruft den Wert der ustin-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUSTIN() {
-        return ustin;
-    }
-
-    /**
-     * Legt den Wert der ustin-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUSTIN(String value) {
-        this.ustin = value;
-    }
-
-    /**
-     * Ruft den Wert der fatcaNatPerson-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FATCANatPersonType }
-     *     
-     */
-    public FATCANatPersonType getFATCANatPerson() {
-        return fatcaNatPerson;
-    }
-
-    /**
-     * Legt den Wert der fatcaNatPerson-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FATCANatPersonType }
-     *     
-     */
-    public void setFATCANatPerson(FATCANatPersonType value) {
-        this.fatcaNatPerson = value;
-    }
-
-    /**
-     * Ruft den Wert der fatcaSonstPerson-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FATCASonstPersonType }
-     *     
-     */
-    public FATCASonstPersonType getFATCASonstPerson() {
-        return fatcaSonstPerson;
-    }
-
-    /**
-     * Legt den Wert der fatcaSonstPerson-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FATCASonstPersonType }
-     *     
-     */
-    public void setFATCASonstPerson(FATCASonstPersonType value) {
-        this.fatcaSonstPerson = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/FahrzeugType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/FahrzeugType.java
deleted file mode 100644
index 6ee7644b..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/FahrzeugType.java
+++ /dev/null
@@ -1,863 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-import at.vvo.omds.types.omds2Types.v2_14.Entsch2Type;
-
-
-/**
- * Basisklasse für alle Fahrzeuge in der Kfz-Versicherung
- * 
- * 
Java-Klasse für Fahrzeug_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Fahrzeug_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}VersichertesInteresse_Type">
- *       <sequence>
- *         <element name="Zulassungsdaten" type="{urn:omds3CommonServiceTypes-1-1-0}Zulassungsdaten_Type" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="FzgArtCd" type="{urn:omds20}FzgArtCd_Type" />
- *       <attribute name="Marke">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *             <maxLength value="40"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *       <attribute name="Handelsbez">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *             <maxLength value="30"/>
- *             <minLength value="1"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *       <attribute name="TypVarVer">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *             <maxLength value="20"/>
- *             <minLength value="1"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *       <attribute name="Leasingkz" type="{urn:omds20}Entsch2_Type" />
- *       <attribute name="Modelljahr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *       <attribute name="Leistung" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *       <attribute name="Plaetze" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *       <attribute name="Nutzlast">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}decimal">
- *             <totalDigits value="6"/>
- *             <fractionDigits value="0"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *       <attribute name="Hubraum" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *       <attribute name="AntriebsArtCd" type="{urn:omds20}AntriebsArtCd_Type" />
- *       <attribute name="CO2_Ausstoss" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *       <attribute name="Fahrgestnr">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *             <maxLength value="20"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *       <attribute name="Motornr">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *             <maxLength value="20"/>
- *             <minLength value="1"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *       <attribute name="NatCode">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *             <minLength value="1"/>
- *             <maxLength value="26"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *       <attribute name="VerwendzweckCd" type="{urn:omds20}VerwendzweckCd_Type" />
- *       <attribute name="Erstzulassdat" type="{urn:omds20}Datum" />
- *       <attribute name="LandesCd" type="{urn:omds20}LandesCd_Type" />
- *       <attribute name="Pol_Kennz">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *             <maxLength value="12"/>
- *             <minLength value="1"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *       <attribute name="Tueren" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *       <attribute name="Baujahr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *       <attribute name="Gesamtgewicht" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *       <attribute name="Listenpreis" type="{urn:omds20}decimal" />
- *       <attribute name="Sonderausstattung" type="{urn:omds20}decimal" />
- *       <attribute name="Eigengewicht" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *       <attribute name="ZulassdatHalter" type="{urn:omds20}Datum" />
- *       <attribute name="AufbauNatC" type="{urn:omds3CommonServiceTypes-1-1-0}AufbauNatC_Type" />
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Fahrzeug_Type", propOrder = {
-    "zulassungsdaten"
-})
-public class FahrzeugType
-    extends VersichertesInteresseType
-{
-
-    @XmlElement(name = "Zulassungsdaten")
-    protected ZulassungsdatenType zulassungsdaten;
-    @XmlAttribute(name = "FzgArtCd", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected String fzgArtCd;
-    @XmlAttribute(name = "Marke", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected String marke;
-    @XmlAttribute(name = "Handelsbez", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected String handelsbez;
-    @XmlAttribute(name = "TypVarVer", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected String typVarVer;
-    @XmlAttribute(name = "Leasingkz", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected Entsch2Type leasingkz;
-    @XmlAttribute(name = "Modelljahr", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer modelljahr;
-    @XmlAttribute(name = "Leistung", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer leistung;
-    @XmlAttribute(name = "Plaetze", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer plaetze;
-    @XmlAttribute(name = "Nutzlast", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected BigDecimal nutzlast;
-    @XmlAttribute(name = "Hubraum", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer hubraum;
-    @XmlAttribute(name = "AntriebsArtCd", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected String antriebsArtCd;
-    @XmlAttribute(name = "CO2_Ausstoss", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer co2Ausstoss;
-    @XmlAttribute(name = "Fahrgestnr", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected String fahrgestnr;
-    @XmlAttribute(name = "Motornr", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected String motornr;
-    @XmlAttribute(name = "NatCode", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected String natCode;
-    @XmlAttribute(name = "VerwendzweckCd", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected String verwendzweckCd;
-    @XmlAttribute(name = "Erstzulassdat", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected XMLGregorianCalendar erstzulassdat;
-    @XmlAttribute(name = "LandesCd", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected String landesCd;
-    @XmlAttribute(name = "Pol_Kennz", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected String polKennz;
-    @XmlAttribute(name = "Tueren", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer tueren;
-    @XmlAttribute(name = "Baujahr", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer baujahr;
-    @XmlAttribute(name = "Gesamtgewicht", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer gesamtgewicht;
-    @XmlAttribute(name = "Listenpreis", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected BigDecimal listenpreis;
-    @XmlAttribute(name = "Sonderausstattung", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected BigDecimal sonderausstattung;
-    @XmlAttribute(name = "Eigengewicht", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer eigengewicht;
-    @XmlAttribute(name = "ZulassdatHalter", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected XMLGregorianCalendar zulassdatHalter;
-    @XmlAttribute(name = "AufbauNatC", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected String aufbauNatC;
-
-    /**
-     * Ruft den Wert der zulassungsdaten-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ZulassungsdatenType }
-     *     
-     */
-    public ZulassungsdatenType getZulassungsdaten() {
-        return zulassungsdaten;
-    }
-
-    /**
-     * Legt den Wert der zulassungsdaten-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ZulassungsdatenType }
-     *     
-     */
-    public void setZulassungsdaten(ZulassungsdatenType value) {
-        this.zulassungsdaten = value;
-    }
-
-    /**
-     * Ruft den Wert der fzgArtCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFzgArtCd() {
-        return fzgArtCd;
-    }
-
-    /**
-     * Legt den Wert der fzgArtCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFzgArtCd(String value) {
-        this.fzgArtCd = value;
-    }
-
-    /**
-     * Ruft den Wert der marke-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMarke() {
-        return marke;
-    }
-
-    /**
-     * Legt den Wert der marke-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMarke(String value) {
-        this.marke = value;
-    }
-
-    /**
-     * Ruft den Wert der handelsbez-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getHandelsbez() {
-        return handelsbez;
-    }
-
-    /**
-     * Legt den Wert der handelsbez-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setHandelsbez(String value) {
-        this.handelsbez = value;
-    }
-
-    /**
-     * Ruft den Wert der typVarVer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTypVarVer() {
-        return typVarVer;
-    }
-
-    /**
-     * Legt den Wert der typVarVer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTypVarVer(String value) {
-        this.typVarVer = value;
-    }
-
-    /**
-     * Ruft den Wert der leasingkz-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Entsch2Type }
-     *     
-     */
-    public Entsch2Type getLeasingkz() {
-        return leasingkz;
-    }
-
-    /**
-     * Legt den Wert der leasingkz-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Entsch2Type }
-     *     
-     */
-    public void setLeasingkz(Entsch2Type value) {
-        this.leasingkz = value;
-    }
-
-    /**
-     * Ruft den Wert der modelljahr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getModelljahr() {
-        return modelljahr;
-    }
-
-    /**
-     * Legt den Wert der modelljahr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setModelljahr(Integer value) {
-        this.modelljahr = value;
-    }
-
-    /**
-     * Ruft den Wert der leistung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getLeistung() {
-        return leistung;
-    }
-
-    /**
-     * Legt den Wert der leistung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setLeistung(Integer value) {
-        this.leistung = value;
-    }
-
-    /**
-     * Ruft den Wert der plaetze-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getPlaetze() {
-        return plaetze;
-    }
-
-    /**
-     * Legt den Wert der plaetze-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setPlaetze(Integer value) {
-        this.plaetze = value;
-    }
-
-    /**
-     * Ruft den Wert der nutzlast-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getNutzlast() {
-        return nutzlast;
-    }
-
-    /**
-     * Legt den Wert der nutzlast-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setNutzlast(BigDecimal value) {
-        this.nutzlast = value;
-    }
-
-    /**
-     * Ruft den Wert der hubraum-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getHubraum() {
-        return hubraum;
-    }
-
-    /**
-     * Legt den Wert der hubraum-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setHubraum(Integer value) {
-        this.hubraum = value;
-    }
-
-    /**
-     * Ruft den Wert der antriebsArtCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAntriebsArtCd() {
-        return antriebsArtCd;
-    }
-
-    /**
-     * Legt den Wert der antriebsArtCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAntriebsArtCd(String value) {
-        this.antriebsArtCd = value;
-    }
-
-    /**
-     * Ruft den Wert der co2Ausstoss-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getCO2Ausstoss() {
-        return co2Ausstoss;
-    }
-
-    /**
-     * Legt den Wert der co2Ausstoss-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setCO2Ausstoss(Integer value) {
-        this.co2Ausstoss = value;
-    }
-
-    /**
-     * Ruft den Wert der fahrgestnr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFahrgestnr() {
-        return fahrgestnr;
-    }
-
-    /**
-     * Legt den Wert der fahrgestnr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFahrgestnr(String value) {
-        this.fahrgestnr = value;
-    }
-
-    /**
-     * Ruft den Wert der motornr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMotornr() {
-        return motornr;
-    }
-
-    /**
-     * Legt den Wert der motornr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMotornr(String value) {
-        this.motornr = value;
-    }
-
-    /**
-     * Ruft den Wert der natCode-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNatCode() {
-        return natCode;
-    }
-
-    /**
-     * Legt den Wert der natCode-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNatCode(String value) {
-        this.natCode = value;
-    }
-
-    /**
-     * Ruft den Wert der verwendzweckCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVerwendzweckCd() {
-        return verwendzweckCd;
-    }
-
-    /**
-     * Legt den Wert der verwendzweckCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVerwendzweckCd(String value) {
-        this.verwendzweckCd = value;
-    }
-
-    /**
-     * Ruft den Wert der erstzulassdat-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getErstzulassdat() {
-        return erstzulassdat;
-    }
-
-    /**
-     * Legt den Wert der erstzulassdat-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setErstzulassdat(XMLGregorianCalendar value) {
-        this.erstzulassdat = value;
-    }
-
-    /**
-     * Ruft den Wert der landesCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getLandesCd() {
-        return landesCd;
-    }
-
-    /**
-     * Legt den Wert der landesCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setLandesCd(String value) {
-        this.landesCd = value;
-    }
-
-    /**
-     * Ruft den Wert der polKennz-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolKennz() {
-        return polKennz;
-    }
-
-    /**
-     * Legt den Wert der polKennz-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolKennz(String value) {
-        this.polKennz = value;
-    }
-
-    /**
-     * Ruft den Wert der tueren-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getTueren() {
-        return tueren;
-    }
-
-    /**
-     * Legt den Wert der tueren-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setTueren(Integer value) {
-        this.tueren = value;
-    }
-
-    /**
-     * Ruft den Wert der baujahr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getBaujahr() {
-        return baujahr;
-    }
-
-    /**
-     * Legt den Wert der baujahr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setBaujahr(Integer value) {
-        this.baujahr = value;
-    }
-
-    /**
-     * Ruft den Wert der gesamtgewicht-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getGesamtgewicht() {
-        return gesamtgewicht;
-    }
-
-    /**
-     * Legt den Wert der gesamtgewicht-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setGesamtgewicht(Integer value) {
-        this.gesamtgewicht = value;
-    }
-
-    /**
-     * Ruft den Wert der listenpreis-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getListenpreis() {
-        return listenpreis;
-    }
-
-    /**
-     * Legt den Wert der listenpreis-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setListenpreis(BigDecimal value) {
-        this.listenpreis = value;
-    }
-
-    /**
-     * Ruft den Wert der sonderausstattung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getSonderausstattung() {
-        return sonderausstattung;
-    }
-
-    /**
-     * Legt den Wert der sonderausstattung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setSonderausstattung(BigDecimal value) {
-        this.sonderausstattung = value;
-    }
-
-    /**
-     * Ruft den Wert der eigengewicht-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getEigengewicht() {
-        return eigengewicht;
-    }
-
-    /**
-     * Legt den Wert der eigengewicht-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setEigengewicht(Integer value) {
-        this.eigengewicht = value;
-    }
-
-    /**
-     * Ruft den Wert der zulassdatHalter-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getZulassdatHalter() {
-        return zulassdatHalter;
-    }
-
-    /**
-     * Legt den Wert der zulassdatHalter-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setZulassdatHalter(XMLGregorianCalendar value) {
-        this.zulassdatHalter = value;
-    }
-
-    /**
-     * Ruft den Wert der aufbauNatC-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAufbauNatC() {
-        return aufbauNatC;
-    }
-
-    /**
-     * Legt den Wert der aufbauNatC-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAufbauNatC(String value) {
-        this.aufbauNatC = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/Formular.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/Formular.java
deleted file mode 100644
index 12fcc58e..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/Formular.java
+++ /dev/null
@@ -1,195 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="FormType" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Id" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/>
- *         <element name="Formularstatus">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <enumeration value="inBearbeitung"/>
- *               <enumeration value="abgeschlossen"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="Kontext" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Fragen" type="{urn:omds3CommonServiceTypes-1-1-0}Formularfrage_Type" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "formType",
-    "id",
-    "formularstatus",
-    "kontext",
-    "fragen"
-})
-@XmlRootElement(name = "Formular")
-public class Formular {
-
-    @XmlElement(name = "FormType", required = true)
-    protected String formType;
-    @XmlElement(name = "Id")
-    protected Object id;
-    @XmlElement(name = "Formularstatus", required = true)
-    protected String formularstatus;
-    @XmlElement(name = "Kontext")
-    protected List kontext;
-    @XmlElement(name = "Fragen", required = true)
-    protected List fragen;
-
-    /**
-     * Ruft den Wert der formType-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFormType() {
-        return formType;
-    }
-
-    /**
-     * Legt den Wert der formType-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFormType(String value) {
-        this.formType = value;
-    }
-
-    /**
-     * Ruft den Wert der id-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Object }
-     *     
-     */
-    public Object getId() {
-        return id;
-    }
-
-    /**
-     * Legt den Wert der id-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     
-     */
-    public void setId(Object value) {
-        this.id = value;
-    }
-
-    /**
-     * Ruft den Wert der formularstatus-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFormularstatus() {
-        return formularstatus;
-    }
-
-    /**
-     * Legt den Wert der formularstatus-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFormularstatus(String value) {
-        this.formularstatus = value;
-    }
-
-    /**
-     * Gets the value of the kontext property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the kontext property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getKontext().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List getKontext() {
-        if (kontext == null) {
-            kontext = new ArrayList();
-        }
-        return this.kontext;
-    }
-
-    /**
-     * Gets the value of the fragen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the fragen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getFragen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link FormularfrageType }
-     * 
-     * 
-     */
-    public List getFragen() {
-        if (fragen == null) {
-            fragen = new ArrayList();
-        }
-        return this.fragen;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/FormularfrageType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/FormularfrageType.java
deleted file mode 100644
index 5afd2aaf..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/FormularfrageType.java
+++ /dev/null
@@ -1,86 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Eine Frage in einem Formular
- * 
- * 
Java-Klasse für Formularfrage_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Formularfrage_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Lfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedByte"/>
- *         <element name="Frage" type="{urn:omds3CommonServiceTypes-1-1-0}Attribut_Type"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Formularfrage_Type", propOrder = {
-    "lfnr",
-    "frage"
-})
-public class FormularfrageType {
-
-    @XmlElement(name = "Lfnr")
-    @XmlSchemaType(name = "unsignedByte")
-    protected short lfnr;
-    @XmlElement(name = "Frage", required = true)
-    protected AttributType frage;
-
-    /**
-     * Ruft den Wert der lfnr-Eigenschaft ab.
-     * 
-     */
-    public short getLfnr() {
-        return lfnr;
-    }
-
-    /**
-     * Legt den Wert der lfnr-Eigenschaft fest.
-     * 
-     */
-    public void setLfnr(short value) {
-        this.lfnr = value;
-    }
-
-    /**
-     * Ruft den Wert der frage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributType }
-     *     
-     */
-    public AttributType getFrage() {
-        return frage;
-    }
-
-    /**
-     * Legt den Wert der frage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributType }
-     *     
-     */
-    public void setFrage(AttributType value) {
-        this.frage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/GMSGType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/GMSGType.java
deleted file mode 100644
index 3caaee9c..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/GMSGType.java
+++ /dev/null
@@ -1,165 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Fragen gemäß dem Gemeinsamen Meldestandard-Gesetz
- * 
- * 
Java-Klasse für GMSG_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GMSG_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="SteuerlichAnsaessig" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="Land" type="{urn:omds3CommonServiceTypes-1-1-0}AttributEnum_Type"/>
- *                   <element name="Steuernummer" type="{urn:omds3CommonServiceTypes-1-1-0}AttributString_Type" minOccurs="0"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GMSG_Type", propOrder = {
-    "steuerlichAnsaessig"
-})
-public class GMSGType {
-
-    @XmlElement(name = "SteuerlichAnsaessig", required = true)
-    protected List steuerlichAnsaessig;
-
-    /**
-     * Gets the value of the steuerlichAnsaessig property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the steuerlichAnsaessig property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getSteuerlichAnsaessig().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link GMSGType.SteuerlichAnsaessig }
-     * 
-     * 
-     */
-    public List getSteuerlichAnsaessig() {
-        if (steuerlichAnsaessig == null) {
-            steuerlichAnsaessig = new ArrayList();
-        }
-        return this.steuerlichAnsaessig;
-    }
-
-
-    /**
-     * 
Java-Klasse für anonymous complex type.
-     * 
-     * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="Land" type="{urn:omds3CommonServiceTypes-1-1-0}AttributEnum_Type"/>
-     *         <element name="Steuernummer" type="{urn:omds3CommonServiceTypes-1-1-0}AttributString_Type" minOccurs="0"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "land",
-        "steuernummer"
-    })
-    public static class SteuerlichAnsaessig {
-
-        @XmlElement(name = "Land", required = true)
-        protected AttributEnumType land;
-        @XmlElement(name = "Steuernummer")
-        protected AttributStringType steuernummer;
-
-        /**
-         * Ruft den Wert der land-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link AttributEnumType }
-         *     
-         */
-        public AttributEnumType getLand() {
-            return land;
-        }
-
-        /**
-         * Legt den Wert der land-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link AttributEnumType }
-         *     
-         */
-        public void setLand(AttributEnumType value) {
-            this.land = value;
-        }
-
-        /**
-         * Ruft den Wert der steuernummer-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link AttributStringType }
-         *     
-         */
-        public AttributStringType getSteuernummer() {
-            return steuernummer;
-        }
-
-        /**
-         * Legt den Wert der steuernummer-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link AttributStringType }
-         *     
-         */
-        public void setSteuernummer(AttributStringType value) {
-            this.steuernummer = value;
-        }
-
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/GeschaeftsobjektArtType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/GeschaeftsobjektArtType.java
deleted file mode 100644
index 9274977b..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/GeschaeftsobjektArtType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
Java-Klasse für GeschaeftsobjektArt_Type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

- * 
- * <simpleType name="GeschaeftsobjektArt_Type">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="VTG"/>
- *     <enumeration value="SC"/>
- *     <enumeration value="AN"/>
- *     <enumeration value="IB"/>
- *   </restriction>
- * </simpleType>
- * 

- * 
- */
-@XmlType(name = "GeschaeftsobjektArt_Type")
-@XmlEnum
-public enum GeschaeftsobjektArtType {
-
-
-    /**
-     * Vertrag
-     * 
-     */
-    VTG,
-
-    /**
-     * Schaden
-     * 
-     */
-    SC,
-
-    /**
-     * Antrag
-     * 
-     */
-    AN,
-
-    /**
-     * Interventionsbericht
-     * 
-     */
-    IB;
-
-    public String value() {
-        return name();
-    }
-
-    public static GeschaeftsobjektArtType fromValue(String v) {
-        return valueOf(v);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/GlaeubigerSicherstellungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/GlaeubigerSicherstellungType.java
deleted file mode 100644
index 8ec6b9f3..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/GlaeubigerSicherstellungType.java
+++ /dev/null
@@ -1,148 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Gläubiger einer Sicherstellung
- * 
- * 
Java-Klasse für GlaeubigerSicherstellung_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GlaeubigerSicherstellung_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Institut" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="PLZ" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Strasse" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Vertragsnummer" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GlaeubigerSicherstellung_Type", propOrder = {
-    "institut",
-    "plz",
-    "strasse",
-    "vertragsnummer"
-})
-public class GlaeubigerSicherstellungType {
-
-    @XmlElement(name = "Institut", required = true)
-    protected String institut;
-    @XmlElement(name = "PLZ", required = true)
-    protected String plz;
-    @XmlElement(name = "Strasse", required = true)
-    protected String strasse;
-    @XmlElement(name = "Vertragsnummer", required = true)
-    protected String vertragsnummer;
-
-    /**
-     * Ruft den Wert der institut-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getInstitut() {
-        return institut;
-    }
-
-    /**
-     * Legt den Wert der institut-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setInstitut(String value) {
-        this.institut = value;
-    }
-
-    /**
-     * Ruft den Wert der plz-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPLZ() {
-        return plz;
-    }
-
-    /**
-     * Legt den Wert der plz-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPLZ(String value) {
-        this.plz = value;
-    }
-
-    /**
-     * Ruft den Wert der strasse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStrasse() {
-        return strasse;
-    }
-
-    /**
-     * Legt den Wert der strasse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStrasse(String value) {
-        this.strasse = value;
-    }
-
-    /**
-     * Ruft den Wert der vertragsnummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVertragsnummer() {
-        return vertragsnummer;
-    }
-
-    /**
-     * Legt den Wert der vertragsnummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVertragsnummer(String value) {
-        this.vertragsnummer = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/KontierungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/KontierungType.java
deleted file mode 100644
index d499e7b7..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/KontierungType.java
+++ /dev/null
@@ -1,177 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Sollen nicht automatisch die Kontierungsdaten aus dem hinterlegten Benutzer genommen werden, können hier abweichende Kontierungen angegeben werden.
- * 
- * 
Java-Klasse für Kontierung_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Kontierung_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Vermittlernummer" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Vermittlername" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Abschluss" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *         <element name="Folge" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *         <element name="Betreuung" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Kontierung_Type", propOrder = {
-    "vermittlernummer",
-    "vermittlername",
-    "abschluss",
-    "folge",
-    "betreuung"
-})
-public class KontierungType {
-
-    @XmlElement(name = "Vermittlernummer", required = true)
-    protected String vermittlernummer;
-    @XmlElement(name = "Vermittlername")
-    protected String vermittlername;
-    @XmlElement(name = "Abschluss", required = true)
-    protected BigInteger abschluss;
-    @XmlElement(name = "Folge", required = true)
-    protected BigInteger folge;
-    @XmlElement(name = "Betreuung", required = true)
-    protected BigInteger betreuung;
-
-    /**
-     * Ruft den Wert der vermittlernummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVermittlernummer() {
-        return vermittlernummer;
-    }
-
-    /**
-     * Legt den Wert der vermittlernummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVermittlernummer(String value) {
-        this.vermittlernummer = value;
-    }
-
-    /**
-     * Ruft den Wert der vermittlername-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVermittlername() {
-        return vermittlername;
-    }
-
-    /**
-     * Legt den Wert der vermittlername-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVermittlername(String value) {
-        this.vermittlername = value;
-    }
-
-    /**
-     * Ruft den Wert der abschluss-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getAbschluss() {
-        return abschluss;
-    }
-
-    /**
-     * Legt den Wert der abschluss-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setAbschluss(BigInteger value) {
-        this.abschluss = value;
-    }
-
-    /**
-     * Ruft den Wert der folge-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getFolge() {
-        return folge;
-    }
-
-    /**
-     * Legt den Wert der folge-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setFolge(BigInteger value) {
-        this.folge = value;
-    }
-
-    /**
-     * Ruft den Wert der betreuung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getBetreuung() {
-        return betreuung;
-    }
-
-    /**
-     * Legt den Wert der betreuung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setBetreuung(BigInteger value) {
-        this.betreuung = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/KostenFixOderProzentType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/KostenFixOderProzentType.java
deleted file mode 100644
index 67635373..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/KostenFixOderProzentType.java
+++ /dev/null
@@ -1,97 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import java.math.BigDecimal;
-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;
-
-
-/**
- * Dient zur Abbildung von Kosten als absoluter oder prozentualer Wert
- * 
- * 
Java-Klasse für KostenFixOderProzent_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="KostenFixOderProzent_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <choice>
- *           <element name="AbsoluterBetrag" type="{urn:omds20}decimal"/>
- *           <element name="ProzentVs" type="{http://www.w3.org/2001/XMLSchema}unsignedByte"/>
- *         </choice>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "KostenFixOderProzent_Type", propOrder = {
-    "absoluterBetrag",
-    "prozentVs"
-})
-public class KostenFixOderProzentType {
-
-    @XmlElement(name = "AbsoluterBetrag")
-    protected BigDecimal absoluterBetrag;
-    @XmlElement(name = "ProzentVs")
-    @XmlSchemaType(name = "unsignedByte")
-    protected Short prozentVs;
-
-    /**
-     * Ruft den Wert der absoluterBetrag-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getAbsoluterBetrag() {
-        return absoluterBetrag;
-    }
-
-    /**
-     * Legt den Wert der absoluterBetrag-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setAbsoluterBetrag(BigDecimal value) {
-        this.absoluterBetrag = value;
-    }
-
-    /**
-     * Ruft den Wert der prozentVs-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Short }
-     *     
-     */
-    public Short getProzentVs() {
-        return prozentVs;
-    }
-
-    /**
-     * Legt den Wert der prozentVs-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Short }
-     *     
-     */
-    public void setProzentVs(Short value) {
-        this.prozentVs = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/KreditkarteType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/KreditkarteType.java
deleted file mode 100644
index 88907a28..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/KreditkarteType.java
+++ /dev/null
@@ -1,189 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Typ Kreditkarte
- * 
- * 
Java-Klasse für Kreditkarte_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Kreditkarte_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="Gesellschaft" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="Kartennummer" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="Inhaber" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="Pruefziffer" use="required">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}unsignedInt">
- *             <totalDigits value="3"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *       <attribute name="AblaufMonat" use="required">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}unsignedByte">
- *             <totalDigits value="2"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *       <attribute name="AblaufJahr" use="required">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}unsignedByte">
- *             <totalDigits value="2"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Kreditkarte_Type")
-public class KreditkarteType {
-
-    @XmlAttribute(name = "Gesellschaft", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-    protected String gesellschaft;
-    @XmlAttribute(name = "Kartennummer", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-    protected String kartennummer;
-    @XmlAttribute(name = "Inhaber", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-    protected String inhaber;
-    @XmlAttribute(name = "Pruefziffer", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-    protected long pruefziffer;
-    @XmlAttribute(name = "AblaufMonat", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-    protected short ablaufMonat;
-    @XmlAttribute(name = "AblaufJahr", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-    protected short ablaufJahr;
-
-    /**
-     * Ruft den Wert der gesellschaft-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGesellschaft() {
-        return gesellschaft;
-    }
-
-    /**
-     * Legt den Wert der gesellschaft-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGesellschaft(String value) {
-        this.gesellschaft = value;
-    }
-
-    /**
-     * Ruft den Wert der kartennummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getKartennummer() {
-        return kartennummer;
-    }
-
-    /**
-     * Legt den Wert der kartennummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setKartennummer(String value) {
-        this.kartennummer = value;
-    }
-
-    /**
-     * Ruft den Wert der inhaber-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getInhaber() {
-        return inhaber;
-    }
-
-    /**
-     * Legt den Wert der inhaber-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setInhaber(String value) {
-        this.inhaber = value;
-    }
-
-    /**
-     * Ruft den Wert der pruefziffer-Eigenschaft ab.
-     * 
-     */
-    public long getPruefziffer() {
-        return pruefziffer;
-    }
-
-    /**
-     * Legt den Wert der pruefziffer-Eigenschaft fest.
-     * 
-     */
-    public void setPruefziffer(long value) {
-        this.pruefziffer = value;
-    }
-
-    /**
-     * Ruft den Wert der ablaufMonat-Eigenschaft ab.
-     * 
-     */
-    public short getAblaufMonat() {
-        return ablaufMonat;
-    }
-
-    /**
-     * Legt den Wert der ablaufMonat-Eigenschaft fest.
-     * 
-     */
-    public void setAblaufMonat(short value) {
-        this.ablaufMonat = value;
-    }
-
-    /**
-     * Ruft den Wert der ablaufJahr-Eigenschaft ab.
-     * 
-     */
-    public short getAblaufJahr() {
-        return ablaufJahr;
-    }
-
-    /**
-     * Legt den Wert der ablaufJahr-Eigenschaft fest.
-     * 
-     */
-    public void setAblaufJahr(short value) {
-        this.ablaufJahr = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/LegitimationType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/LegitimationType.java
deleted file mode 100644
index 94f3ee45..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/LegitimationType.java
+++ /dev/null
@@ -1,61 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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 at.vvo.omds.types.omds2Types.v2_14.ELLegitimationType;
-
-
-/**
- * 
Java-Klasse für Legitimation_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Legitimation_Type">
- *   <complexContent>
- *     <extension base="{urn:omds20}EL-Legitimation_Type">
- *       <attribute name="AusstellendesLand" type="{urn:omds20}LandesCd_Type" />
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Legitimation_Type")
-public class LegitimationType
-    extends ELLegitimationType
-{
-
-    @XmlAttribute(name = "AusstellendesLand", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected String ausstellendesLand;
-
-    /**
-     * Ruft den Wert der ausstellendesLand-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAusstellendesLand() {
-        return ausstellendesLand;
-    }
-
-    /**
-     * Legt den Wert der ausstellendesLand-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAusstellendesLand(String value) {
-        this.ausstellendesLand = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ObjectFactory.java
deleted file mode 100644
index 933c6797..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ObjectFactory.java
+++ /dev/null
@@ -1,885 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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 at.vvo.omds.types.omds3Types.r1_7_0.common package. 
- * 
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 _ServiceFault_QNAME = new QName("urn:omds3CommonServiceTypes-1-1-0", "serviceFault");
-    private final static QName _OrdnungsbegriffZuordFremd_QNAME = new QName("urn:omds3CommonServiceTypes-1-1-0", "OrdnungsbegriffZuordFremd");
-    private final static QName _ObjektId_QNAME = new QName("urn:omds3CommonServiceTypes-1-1-0", "ObjektId");
-    private final static QName _Person_QNAME = new QName("urn:omds3CommonServiceTypes-1-1-0", "Person");
-    private final static QName _Adresse_QNAME = new QName("urn:omds3CommonServiceTypes-1-1-0", "Adresse");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.vvo.omds.types.omds3Types.r1_7_0.common
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link GMSGType }
-     * 
-     */
-    public GMSGType createGMSGType() {
-        return new GMSGType();
-    }
-
-    /**
-     * Create an instance of {@link ZahlwegImplType }
-     * 
-     */
-    public ZahlwegImplType createZahlwegImplType() {
-        return new ZahlwegImplType();
-    }
-
-    /**
-     * Create an instance of {@link ProzessDokumentType }
-     * 
-     */
-    public ProzessDokumentType createProzessDokumentType() {
-        return new ProzessDokumentType();
-    }
-
-    /**
-     * Create an instance of {@link TechnicalKeyValueType }
-     * 
-     */
-    public TechnicalKeyValueType createTechnicalKeyValueType() {
-        return new TechnicalKeyValueType();
-    }
-
-    /**
-     * Create an instance of {@link ObjektIdType }
-     * 
-     */
-    public ObjektIdType createObjektIdType() {
-        return new ObjektIdType();
-    }
-
-    /**
-     * Create an instance of {@link ResponseStatusType }
-     * 
-     */
-    public ResponseStatusType createResponseStatusType() {
-        return new ResponseStatusType();
-    }
-
-    /**
-     * Create an instance of {@link ServiceFault }
-     * 
-     */
-    public ServiceFault createServiceFault() {
-        return new ServiceFault();
-    }
-
-    /**
-     * Create an instance of {@link PersonType }
-     * 
-     */
-    public PersonType createPersonType() {
-        return new PersonType();
-    }
-
-    /**
-     * Create an instance of {@link AdresseType }
-     * 
-     */
-    public AdresseType createAdresseType() {
-        return new AdresseType();
-    }
-
-    /**
-     * Create an instance of {@link Formular }
-     * 
-     */
-    public Formular createFormular() {
-        return new Formular();
-    }
-
-    /**
-     * Create an instance of {@link FormularfrageType }
-     * 
-     */
-    public FormularfrageType createFormularfrageType() {
-        return new FormularfrageType();
-    }
-
-    /**
-     * Create an instance of {@link AgentFilterType }
-     * 
-     */
-    public AgentFilterType createAgentFilterType() {
-        return new AgentFilterType();
-    }
-
-    /**
-     * Create an instance of {@link ElementIdType }
-     * 
-     */
-    public ElementIdType createElementIdType() {
-        return new ElementIdType();
-    }
-
-    /**
-     * Create an instance of {@link Referenz }
-     * 
-     */
-    public Referenz createReferenz() {
-        return new Referenz();
-    }
-
-    /**
-     * Create an instance of {@link LegitimationType }
-     * 
-     */
-    public LegitimationType createLegitimationType() {
-        return new LegitimationType();
-    }
-
-    /**
-     * Create an instance of {@link DateianhangType }
-     * 
-     */
-    public DateianhangType createDateianhangType() {
-        return new DateianhangType();
-    }
-
-    /**
-     * Create an instance of {@link DokumentFormDataType }
-     * 
-     */
-    public DokumentFormDataType createDokumentFormDataType() {
-        return new DokumentFormDataType();
-    }
-
-    /**
-     * Create an instance of {@link DokumentBinaryDataType }
-     * 
-     */
-    public DokumentBinaryDataType createDokumentBinaryDataType() {
-        return new DokumentBinaryDataType();
-    }
-
-    /**
-     * Create an instance of {@link AutorisierungType }
-     * 
-     */
-    public AutorisierungType createAutorisierungType() {
-        return new AutorisierungType();
-    }
-
-    /**
-     * Create an instance of {@link AutorisierungsAnforderungType }
-     * 
-     */
-    public AutorisierungsAnforderungType createAutorisierungsAnforderungType() {
-        return new AutorisierungsAnforderungType();
-    }
-
-    /**
-     * Create an instance of {@link AutorisierungAsyncType }
-     * 
-     */
-    public AutorisierungAsyncType createAutorisierungAsyncType() {
-        return new AutorisierungAsyncType();
-    }
-
-    /**
-     * Create an instance of {@link AutorisierungsartPhysischeUnterschrift }
-     * 
-     */
-    public AutorisierungsartPhysischeUnterschrift createAutorisierungsartPhysischeUnterschrift() {
-        return new AutorisierungsartPhysischeUnterschrift();
-    }
-
-    /**
-     * Create an instance of {@link ProzessDokRequirementType }
-     * 
-     */
-    public ProzessDokRequirementType createProzessDokRequirementType() {
-        return new ProzessDokRequirementType();
-    }
-
-    /**
-     * Create an instance of {@link ProzessDokToSignType }
-     * 
-     */
-    public ProzessDokToSignType createProzessDokToSignType() {
-        return new ProzessDokToSignType();
-    }
-
-    /**
-     * Create an instance of {@link ProzessDokHandoutType }
-     * 
-     */
-    public ProzessDokHandoutType createProzessDokHandoutType() {
-        return new ProzessDokHandoutType();
-    }
-
-    /**
-     * Create an instance of {@link KontierungType }
-     * 
-     */
-    public KontierungType createKontierungType() {
-        return new KontierungType();
-    }
-
-    /**
-     * Create an instance of {@link ZusatzproduktGenerischType }
-     * 
-     */
-    public ZusatzproduktGenerischType createZusatzproduktGenerischType() {
-        return new ZusatzproduktGenerischType();
-    }
-
-    /**
-     * Create an instance of {@link BeteiligtePersonVertragType }
-     * 
-     */
-    public BeteiligtePersonVertragType createBeteiligtePersonVertragType() {
-        return new BeteiligtePersonVertragType();
-    }
-
-    /**
-     * Create an instance of {@link PraemieType }
-     * 
-     */
-    public PraemieType createPraemieType() {
-        return new PraemieType();
-    }
-
-    /**
-     * Create an instance of {@link VersicherungssteuerType }
-     * 
-     */
-    public VersicherungssteuerType createVersicherungssteuerType() {
-        return new VersicherungssteuerType();
-    }
-
-    /**
-     * Create an instance of {@link VertragspersonType }
-     * 
-     */
-    public VertragspersonType createVertragspersonType() {
-        return new VertragspersonType();
-    }
-
-    /**
-     * Create an instance of {@link VinkulierungType }
-     * 
-     */
-    public VinkulierungType createVinkulierungType() {
-        return new VinkulierungType();
-    }
-
-    /**
-     * Create an instance of {@link VinkularglaeubigerType }
-     * 
-     */
-    public VinkularglaeubigerType createVinkularglaeubigerType() {
-        return new VinkularglaeubigerType();
-    }
-
-    /**
-     * Create an instance of {@link BezugsrechtType }
-     * 
-     */
-    public BezugsrechtType createBezugsrechtType() {
-        return new BezugsrechtType();
-    }
-
-    /**
-     * Create an instance of {@link BezugsberechtigungGesetzlicheErbenType }
-     * 
-     */
-    public BezugsberechtigungGesetzlicheErbenType createBezugsberechtigungGesetzlicheErbenType() {
-        return new BezugsberechtigungGesetzlicheErbenType();
-    }
-
-    /**
-     * Create an instance of {@link BezugsberechtigungTestamentarischeErbenType }
-     * 
-     */
-    public BezugsberechtigungTestamentarischeErbenType createBezugsberechtigungTestamentarischeErbenType() {
-        return new BezugsberechtigungTestamentarischeErbenType();
-    }
-
-    /**
-     * Create an instance of {@link BezugsberechtigungUeberbringerType }
-     * 
-     */
-    public BezugsberechtigungUeberbringerType createBezugsberechtigungUeberbringerType() {
-        return new BezugsberechtigungUeberbringerType();
-    }
-
-    /**
-     * Create an instance of {@link BezugsberechtigungNamentlich }
-     * 
-     */
-    public BezugsberechtigungNamentlich createBezugsberechtigungNamentlich() {
-        return new BezugsberechtigungNamentlich();
-    }
-
-    /**
-     * Create an instance of {@link PersonNamentlichesBezugsrechtType }
-     * 
-     */
-    public PersonNamentlichesBezugsrechtType createPersonNamentlichesBezugsrechtType() {
-        return new PersonNamentlichesBezugsrechtType();
-    }
-
-    /**
-     * Create an instance of {@link BezugsberechtigungVersicherungsnehmerType }
-     * 
-     */
-    public BezugsberechtigungVersicherungsnehmerType createBezugsberechtigungVersicherungsnehmerType() {
-        return new BezugsberechtigungVersicherungsnehmerType();
-    }
-
-    /**
-     * Create an instance of {@link BezugsberechtigungVersichertePersonType }
-     * 
-     */
-    public BezugsberechtigungVersichertePersonType createBezugsberechtigungVersichertePersonType() {
-        return new BezugsberechtigungVersichertePersonType();
-    }
-
-    /**
-     * Create an instance of {@link BezugsberechtigungIndividuell }
-     * 
-     */
-    public BezugsberechtigungIndividuell createBezugsberechtigungIndividuell() {
-        return new BezugsberechtigungIndividuell();
-    }
-
-    /**
-     * Create an instance of {@link BonusMalusSystemType }
-     * 
-     */
-    public BonusMalusSystemType createBonusMalusSystemType() {
-        return new BonusMalusSystemType();
-    }
-
-    /**
-     * Create an instance of {@link OffeneSchaedenType }
-     * 
-     */
-    public OffeneSchaedenType createOffeneSchaedenType() {
-        return new OffeneSchaedenType();
-    }
-
-    /**
-     * Create an instance of {@link OffenerSchadenType }
-     * 
-     */
-    public OffenerSchadenType createOffenerSchadenType() {
-        return new OffenerSchadenType();
-    }
-
-    /**
-     * Create an instance of {@link VorversicherungenImplType }
-     * 
-     */
-    public VorversicherungenImplType createVorversicherungenImplType() {
-        return new VorversicherungenImplType();
-    }
-
-    /**
-     * Create an instance of {@link VorversicherungType }
-     * 
-     */
-    public VorversicherungType createVorversicherungType() {
-        return new VorversicherungType();
-    }
-
-    /**
-     * Create an instance of {@link VorversicherungenDetailType }
-     * 
-     */
-    public VorversicherungenDetailType createVorversicherungenDetailType() {
-        return new VorversicherungenDetailType();
-    }
-
-    /**
-     * Create an instance of {@link DatenverwendungType }
-     * 
-     */
-    public DatenverwendungType createDatenverwendungType() {
-        return new DatenverwendungType();
-    }
-
-    /**
-     * Create an instance of {@link ErsatzpolizzenType }
-     * 
-     */
-    public ErsatzpolizzenType createErsatzpolizzenType() {
-        return new ErsatzpolizzenType();
-    }
-
-    /**
-     * Create an instance of {@link ErsatzpolizzeMitAendGrundType }
-     * 
-     */
-    public ErsatzpolizzeMitAendGrundType createErsatzpolizzeMitAendGrundType() {
-        return new ErsatzpolizzeMitAendGrundType();
-    }
-
-    /**
-     * Create an instance of {@link DokumentInfoType }
-     * 
-     */
-    public DokumentInfoType createDokumentInfoType() {
-        return new DokumentInfoType();
-    }
-
-    /**
-     * Create an instance of {@link ZahlungsdatenType }
-     * 
-     */
-    public ZahlungsdatenType createZahlungsdatenType() {
-        return new ZahlungsdatenType();
-    }
-
-    /**
-     * Create an instance of {@link KreditkarteType }
-     * 
-     */
-    public KreditkarteType createKreditkarteType() {
-        return new KreditkarteType();
-    }
-
-    /**
-     * Create an instance of {@link BankverbindungType }
-     * 
-     */
-    public BankverbindungType createBankverbindungType() {
-        return new BankverbindungType();
-    }
-
-    /**
-     * Create an instance of {@link PersBankverbindungType }
-     * 
-     */
-    public PersBankverbindungType createPersBankverbindungType() {
-        return new PersBankverbindungType();
-    }
-
-    /**
-     * Create an instance of {@link VersichertePersonType }
-     * 
-     */
-    public VersichertePersonType createVersichertePersonType() {
-        return new VersichertePersonType();
-    }
-
-    /**
-     * Create an instance of {@link RisikoNatPersonType }
-     * 
-     */
-    public RisikoNatPersonType createRisikoNatPersonType() {
-        return new RisikoNatPersonType();
-    }
-
-    /**
-     * Create an instance of {@link VersicherteVeranstaltungType }
-     * 
-     */
-    public VersicherteVeranstaltungType createVersicherteVeranstaltungType() {
-        return new VersicherteVeranstaltungType();
-    }
-
-    /**
-     * Create an instance of {@link FahrzeugType }
-     * 
-     */
-    public FahrzeugType createFahrzeugType() {
-        return new FahrzeugType();
-    }
-
-    /**
-     * Create an instance of {@link ZulassungsdatenType }
-     * 
-     */
-    public ZulassungsdatenType createZulassungsdatenType() {
-        return new ZulassungsdatenType();
-    }
-
-    /**
-     * Create an instance of {@link VersicherteLiegenschaftType }
-     * 
-     */
-    public VersicherteLiegenschaftType createVersicherteLiegenschaftType() {
-        return new VersicherteLiegenschaftType();
-    }
-
-    /**
-     * Create an instance of {@link KostenFixOderProzentType }
-     * 
-     */
-    public KostenFixOderProzentType createKostenFixOderProzentType() {
-        return new KostenFixOderProzentType();
-    }
-
-    /**
-     * Create an instance of {@link SelbstbehaltType }
-     * 
-     */
-    public SelbstbehaltType createSelbstbehaltType() {
-        return new SelbstbehaltType();
-    }
-
-    /**
-     * Create an instance of {@link UploadDokumentType }
-     * 
-     */
-    public UploadDokumentType createUploadDokumentType() {
-        return new UploadDokumentType();
-    }
-
-    /**
-     * Create an instance of {@link DokumentenReferenzType }
-     * 
-     */
-    public DokumentenReferenzType createDokumentenReferenzType() {
-        return new DokumentenReferenzType();
-    }
-
-    /**
-     * Create an instance of {@link ZeitraumType }
-     * 
-     */
-    public ZeitraumType createZeitraumType() {
-        return new ZeitraumType();
-    }
-
-    /**
-     * Create an instance of {@link PolizzenObjektSpezifikationType }
-     * 
-     */
-    public PolizzenObjektSpezifikationType createPolizzenObjektSpezifikationType() {
-        return new PolizzenObjektSpezifikationType();
-    }
-
-    /**
-     * Create an instance of {@link SchadenObjektSpezifikationType }
-     * 
-     */
-    public SchadenObjektSpezifikationType createSchadenObjektSpezifikationType() {
-        return new SchadenObjektSpezifikationType();
-    }
-
-    /**
-     * Create an instance of {@link AttributMsgType }
-     * 
-     */
-    public AttributMsgType createAttributMsgType() {
-        return new AttributMsgType();
-    }
-
-    /**
-     * Create an instance of {@link AttributMetadatenStringType }
-     * 
-     */
-    public AttributMetadatenStringType createAttributMetadatenStringType() {
-        return new AttributMetadatenStringType();
-    }
-
-    /**
-     * Create an instance of {@link AttributMetadatenIntType }
-     * 
-     */
-    public AttributMetadatenIntType createAttributMetadatenIntType() {
-        return new AttributMetadatenIntType();
-    }
-
-    /**
-     * Create an instance of {@link AttributMetadatenDezimalType }
-     * 
-     */
-    public AttributMetadatenDezimalType createAttributMetadatenDezimalType() {
-        return new AttributMetadatenDezimalType();
-    }
-
-    /**
-     * Create an instance of {@link AttributMetadatenDatumType }
-     * 
-     */
-    public AttributMetadatenDatumType createAttributMetadatenDatumType() {
-        return new AttributMetadatenDatumType();
-    }
-
-    /**
-     * Create an instance of {@link AttributMetadatenEnumType }
-     * 
-     */
-    public AttributMetadatenEnumType createAttributMetadatenEnumType() {
-        return new AttributMetadatenEnumType();
-    }
-
-    /**
-     * Create an instance of {@link EintragSchluessellisteType }
-     * 
-     */
-    public EintragSchluessellisteType createEintragSchluessellisteType() {
-        return new EintragSchluessellisteType();
-    }
-
-    /**
-     * Create an instance of {@link AttributStringType }
-     * 
-     */
-    public AttributStringType createAttributStringType() {
-        return new AttributStringType();
-    }
-
-    /**
-     * Create an instance of {@link AttributIntType }
-     * 
-     */
-    public AttributIntType createAttributIntType() {
-        return new AttributIntType();
-    }
-
-    /**
-     * Create an instance of {@link AttributDezimalType }
-     * 
-     */
-    public AttributDezimalType createAttributDezimalType() {
-        return new AttributDezimalType();
-    }
-
-    /**
-     * Create an instance of {@link AttributDoubleType }
-     * 
-     */
-    public AttributDoubleType createAttributDoubleType() {
-        return new AttributDoubleType();
-    }
-
-    /**
-     * Create an instance of {@link AttributDatumType }
-     * 
-     */
-    public AttributDatumType createAttributDatumType() {
-        return new AttributDatumType();
-    }
-
-    /**
-     * Create an instance of {@link AttributEnumType }
-     * 
-     */
-    public AttributEnumType createAttributEnumType() {
-        return new AttributEnumType();
-    }
-
-    /**
-     * Create an instance of {@link AttributMultiEnumType }
-     * 
-     */
-    public AttributMultiEnumType createAttributMultiEnumType() {
-        return new AttributMultiEnumType();
-    }
-
-    /**
-     * Create an instance of {@link AbtretungType }
-     * 
-     */
-    public AbtretungType createAbtretungType() {
-        return new AbtretungType();
-    }
-
-    /**
-     * Create an instance of {@link VerpfaendungType }
-     * 
-     */
-    public VerpfaendungType createVerpfaendungType() {
-        return new VerpfaendungType();
-    }
-
-    /**
-     * Create an instance of {@link PfandglaeubigerType }
-     * 
-     */
-    public PfandglaeubigerType createPfandglaeubigerType() {
-        return new PfandglaeubigerType();
-    }
-
-    /**
-     * Create an instance of {@link VinkulierungPersonenType }
-     * 
-     */
-    public VinkulierungPersonenType createVinkulierungPersonenType() {
-        return new VinkulierungPersonenType();
-    }
-
-    /**
-     * Create an instance of {@link GlaeubigerSicherstellungType }
-     * 
-     */
-    public GlaeubigerSicherstellungType createGlaeubigerSicherstellungType() {
-        return new GlaeubigerSicherstellungType();
-    }
-
-    /**
-     * Create an instance of {@link EinwVerarbGesDatenType }
-     * 
-     */
-    public EinwVerarbGesDatenType createEinwVerarbGesDatenType() {
-        return new EinwVerarbGesDatenType();
-    }
-
-    /**
-     * Create an instance of {@link EinwGesDatenVNType }
-     * 
-     */
-    public EinwGesDatenVNType createEinwGesDatenVNType() {
-        return new EinwGesDatenVNType();
-    }
-
-    /**
-     * Create an instance of {@link EinwSprachaufzType }
-     * 
-     */
-    public EinwSprachaufzType createEinwSprachaufzType() {
-        return new EinwSprachaufzType();
-    }
-
-    /**
-     * Create an instance of {@link FATCAType }
-     * 
-     */
-    public FATCAType createFATCAType() {
-        return new FATCAType();
-    }
-
-    /**
-     * Create an instance of {@link FATCANatPersonType }
-     * 
-     */
-    public FATCANatPersonType createFATCANatPersonType() {
-        return new FATCANatPersonType();
-    }
-
-    /**
-     * Create an instance of {@link FATCASonstPersonType }
-     * 
-     */
-    public FATCASonstPersonType createFATCASonstPersonType() {
-        return new FATCASonstPersonType();
-    }
-
-    /**
-     * Create an instance of {@link PEPType }
-     * 
-     */
-    public PEPType createPEPType() {
-        return new PEPType();
-    }
-
-    /**
-     * Create an instance of {@link TreuhaenderfrageType }
-     * 
-     */
-    public TreuhaenderfrageType createTreuhaenderfrageType() {
-        return new TreuhaenderfrageType();
-    }
-
-    /**
-     * Create an instance of {@link ElementFondsauswahlType }
-     * 
-     */
-    public ElementFondsauswahlType createElementFondsauswahlType() {
-        return new ElementFondsauswahlType();
-    }
-
-    /**
-     * Create an instance of {@link GMSGType.SteuerlichAnsaessig }
-     * 
-     */
-    public GMSGType.SteuerlichAnsaessig createGMSGTypeSteuerlichAnsaessig() {
-        return new GMSGType.SteuerlichAnsaessig();
-    }
-
-    /**
-     * Create an instance of {@link ZahlwegImplType.Kundenkonto }
-     * 
-     */
-    public ZahlwegImplType.Kundenkonto createZahlwegImplTypeKundenkonto() {
-        return new ZahlwegImplType.Kundenkonto();
-    }
-
-    /**
-     * Create an instance of {@link ProzessDokumentType.Autorisierungen }
-     * 
-     */
-    public ProzessDokumentType.Autorisierungen createProzessDokumentTypeAutorisierungen() {
-        return new ProzessDokumentType.Autorisierungen();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ServiceFault }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3CommonServiceTypes-1-1-0", name = "serviceFault")
-    public JAXBElement createServiceFault(ServiceFault value) {
-        return new JAXBElement(_ServiceFault_QNAME, ServiceFault.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3CommonServiceTypes-1-1-0", name = "OrdnungsbegriffZuordFremd")
-    public JAXBElement createOrdnungsbegriffZuordFremd(String value) {
-        return new JAXBElement(_OrdnungsbegriffZuordFremd_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ObjektIdType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3CommonServiceTypes-1-1-0", name = "ObjektId")
-    public JAXBElement createObjektId(ObjektIdType value) {
-        return new JAXBElement(_ObjektId_QNAME, ObjektIdType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PersonType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3CommonServiceTypes-1-1-0", name = "Person")
-    public JAXBElement createPerson(PersonType value) {
-        return new JAXBElement(_Person_QNAME, PersonType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AdresseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3CommonServiceTypes-1-1-0", name = "Adresse")
-    public JAXBElement createAdresse(AdresseType value) {
-        return new JAXBElement(_Adresse_QNAME, AdresseType.class, null, value);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ObjektIdType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ObjektIdType.java
deleted file mode 100644
index e8955f00..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ObjektIdType.java
+++ /dev/null
@@ -1,129 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Type für Objektreferenzen
- * 
- * 
Java-Klasse für ObjektId_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ObjektId_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Id" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <maxLength value="255"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="GueltigAb" type="{urn:omds20}Datum-Zeit" minOccurs="0"/>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}OrdnungsbegriffZuordFremd" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ObjektId_Type", propOrder = {
-    "id",
-    "gueltigAb",
-    "ordnungsbegriffZuordFremd"
-})
-public class ObjektIdType {
-
-    @XmlElement(name = "Id")
-    protected String id;
-    @XmlElement(name = "GueltigAb")
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar gueltigAb;
-    @XmlElement(name = "OrdnungsbegriffZuordFremd")
-    protected String ordnungsbegriffZuordFremd;
-
-    /**
-     * Ruft den Wert der id-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Legt den Wert der id-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    /**
-     * Ruft den Wert der gueltigAb-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getGueltigAb() {
-        return gueltigAb;
-    }
-
-    /**
-     * Legt den Wert der gueltigAb-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setGueltigAb(XMLGregorianCalendar value) {
-        this.gueltigAb = value;
-    }
-
-    /**
-     * Ein Ordnungsbegriff aus dem System des Aufrufers, also z.B. aus dem Maklerverwaltungsprogramm
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrdnungsbegriffZuordFremd() {
-        return ordnungsbegriffZuordFremd;
-    }
-
-    /**
-     * Legt den Wert der ordnungsbegriffZuordFremd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrdnungsbegriffZuordFremd(String value) {
-        this.ordnungsbegriffZuordFremd = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ObjektSpezifikationType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ObjektSpezifikationType.java
deleted file mode 100644
index 21abc6e4..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ObjektSpezifikationType.java
+++ /dev/null
@@ -1,39 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SchadenmelderVermittlerType;
-
-
-/**
- * Eine abstrakte Spezifikation eines Objekts
- * 
- * 
Java-Klasse für ObjektSpezifikation_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ObjektSpezifikation_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ObjektSpezifikation_Type")
-@XmlSeeAlso({
-    PolizzenObjektSpezifikationType.class,
-    SchadenObjektSpezifikationType.class,
-    SchadenmelderVermittlerType.class
-})
-public abstract class ObjektSpezifikationType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/OffeneSchaedenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/OffeneSchaedenType.java
deleted file mode 100644
index 23c42120..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/OffeneSchaedenType.java
+++ /dev/null
@@ -1,120 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Type Offene Schäden
- * 
- * 
Java-Klasse für OffeneSchaeden_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="OffeneSchaeden_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="OffenerSchaden1" type="{urn:omds3CommonServiceTypes-1-1-0}OffenerSchaden_Type"/>
- *         <element name="OffenerSchaden2" type="{urn:omds3CommonServiceTypes-1-1-0}OffenerSchaden_Type" minOccurs="0"/>
- *         <element name="OffenerSchaden3" type="{urn:omds3CommonServiceTypes-1-1-0}OffenerSchaden_Type" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OffeneSchaeden_Type", propOrder = {
-    "offenerSchaden1",
-    "offenerSchaden2",
-    "offenerSchaden3"
-})
-public class OffeneSchaedenType {
-
-    @XmlElement(name = "OffenerSchaden1", required = true)
-    protected OffenerSchadenType offenerSchaden1;
-    @XmlElement(name = "OffenerSchaden2")
-    protected OffenerSchadenType offenerSchaden2;
-    @XmlElement(name = "OffenerSchaden3")
-    protected OffenerSchadenType offenerSchaden3;
-
-    /**
-     * Ruft den Wert der offenerSchaden1-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link OffenerSchadenType }
-     *     
-     */
-    public OffenerSchadenType getOffenerSchaden1() {
-        return offenerSchaden1;
-    }
-
-    /**
-     * Legt den Wert der offenerSchaden1-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link OffenerSchadenType }
-     *     
-     */
-    public void setOffenerSchaden1(OffenerSchadenType value) {
-        this.offenerSchaden1 = value;
-    }
-
-    /**
-     * Ruft den Wert der offenerSchaden2-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link OffenerSchadenType }
-     *     
-     */
-    public OffenerSchadenType getOffenerSchaden2() {
-        return offenerSchaden2;
-    }
-
-    /**
-     * Legt den Wert der offenerSchaden2-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link OffenerSchadenType }
-     *     
-     */
-    public void setOffenerSchaden2(OffenerSchadenType value) {
-        this.offenerSchaden2 = value;
-    }
-
-    /**
-     * Ruft den Wert der offenerSchaden3-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link OffenerSchadenType }
-     *     
-     */
-    public OffenerSchadenType getOffenerSchaden3() {
-        return offenerSchaden3;
-    }
-
-    /**
-     * Legt den Wert der offenerSchaden3-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link OffenerSchadenType }
-     *     
-     */
-    public void setOffenerSchaden3(OffenerSchadenType value) {
-        this.offenerSchaden3 = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/OffenerSchadenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/OffenerSchadenType.java
deleted file mode 100644
index c01d7c16..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/OffenerSchadenType.java
+++ /dev/null
@@ -1,93 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Type einzelner offener Schaden
- * 
- * 
Java-Klasse für OffenerSchaden_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="OffenerSchaden_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Monat" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *         <element name="Jahr" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OffenerSchaden_Type", propOrder = {
-    "monat",
-    "jahr"
-})
-public class OffenerSchadenType {
-
-    @XmlElement(name = "Monat", required = true)
-    protected BigInteger monat;
-    @XmlElement(name = "Jahr", required = true)
-    protected BigInteger jahr;
-
-    /**
-     * Ruft den Wert der monat-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getMonat() {
-        return monat;
-    }
-
-    /**
-     * Legt den Wert der monat-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setMonat(BigInteger value) {
-        this.monat = value;
-    }
-
-    /**
-     * Ruft den Wert der jahr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getJahr() {
-        return jahr;
-    }
-
-    /**
-     * Legt den Wert der jahr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setJahr(BigInteger value) {
-        this.jahr = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PEPType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PEPType.java
deleted file mode 100644
index c2eb2cbb..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PEPType.java
+++ /dev/null
@@ -1,84 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Beschreibung einer PEP
- * 
- * 
Java-Klasse für PEP_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="PEP_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="PEP" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="Beschreibung" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PEP_Type", propOrder = {
-    "pep",
-    "beschreibung"
-})
-public class PEPType {
-
-    @XmlElement(name = "PEP")
-    protected boolean pep;
-    @XmlElement(name = "Beschreibung")
-    protected String beschreibung;
-
-    /**
-     * Ruft den Wert der pep-Eigenschaft ab.
-     * 
-     */
-    public boolean isPEP() {
-        return pep;
-    }
-
-    /**
-     * Legt den Wert der pep-Eigenschaft fest.
-     * 
-     */
-    public void setPEP(boolean value) {
-        this.pep = value;
-    }
-
-    /**
-     * Ruft den Wert der beschreibung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBeschreibung() {
-        return beschreibung;
-    }
-
-    /**
-     * Legt den Wert der beschreibung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBeschreibung(String value) {
-        this.beschreibung = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PartnerRoleType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PartnerRoleType.java
deleted file mode 100644
index df37c5eb..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PartnerRoleType.java
+++ /dev/null
@@ -1,49 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
Java-Klasse für PartnerRoleType.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

- * 
- * <simpleType name="PartnerRoleType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <length value="2"/>
- *     <enumeration value="VN"/>
- *     <enumeration value="VP"/>
- *   </restriction>
- * </simpleType>
- * 

- * 
- */
-@XmlType(name = "PartnerRoleType")
-@XmlEnum
-public enum PartnerRoleType {
-
-
-    /**
-     * Versicherungsnehmer
-     * 
-     */
-    VN,
-
-    /**
-     * Versicherte Person
-     * 
-     */
-    VP;
-
-    public String value() {
-        return name();
-    }
-
-    public static PartnerRoleType fromValue(String v) {
-        return valueOf(v);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PersBankverbindungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PersBankverbindungType.java
deleted file mode 100644
index bf4a40ce..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PersBankverbindungType.java
+++ /dev/null
@@ -1,64 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * beschreibt eine Bankverbindug, welche einer Person ueber eine Referenz zugeordnet ist
- * 
- * 
Java-Klasse für PersBankverbindung_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="PersBankverbindung_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Bankverbindung_Type">
- *       <attribute name="PersonRefLfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PersBankverbindung_Type")
-public class PersBankverbindungType
-    extends BankverbindungType
-{
-
-    @XmlAttribute(name = "PersonRefLfnr", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer personRefLfnr;
-
-    /**
-     * Ruft den Wert der personRefLfnr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getPersonRefLfnr() {
-        return personRefLfnr;
-    }
-
-    /**
-     * Legt den Wert der personRefLfnr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setPersonRefLfnr(Integer value) {
-        this.personRefLfnr = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PersonNamentlichesBezugsrechtType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PersonNamentlichesBezugsrechtType.java
deleted file mode 100644
index d9520536..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PersonNamentlichesBezugsrechtType.java
+++ /dev/null
@@ -1,84 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * 
Java-Klasse für PersonNamentlichesBezugsrecht_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="PersonNamentlichesBezugsrecht_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Prozentsatz" type="{http://www.w3.org/2001/XMLSchema}double" minOccurs="0"/>
- *         <element name="Zugunsten" type="{http://www.w3.org/2001/XMLSchema}unsignedShort"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PersonNamentlichesBezugsrecht_Type", propOrder = {
-    "prozentsatz",
-    "zugunsten"
-})
-public class PersonNamentlichesBezugsrechtType {
-
-    @XmlElement(name = "Prozentsatz")
-    protected Double prozentsatz;
-    @XmlElement(name = "Zugunsten")
-    @XmlSchemaType(name = "unsignedShort")
-    protected int zugunsten;
-
-    /**
-     * Ruft den Wert der prozentsatz-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Double }
-     *     
-     */
-    public Double getProzentsatz() {
-        return prozentsatz;
-    }
-
-    /**
-     * Legt den Wert der prozentsatz-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Double }
-     *     
-     */
-    public void setProzentsatz(Double value) {
-        this.prozentsatz = value;
-    }
-
-    /**
-     * Ruft den Wert der zugunsten-Eigenschaft ab.
-     * 
-     */
-    public int getZugunsten() {
-        return zugunsten;
-    }
-
-    /**
-     * Legt den Wert der zugunsten-Eigenschaft fest.
-     * 
-     */
-    public void setZugunsten(int value) {
-        this.zugunsten = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PersonType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PersonType.java
deleted file mode 100644
index 018aada0..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PersonType.java
+++ /dev/null
@@ -1,421 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlType;
-import at.vvo.omds.types.omds2Types.v2_14.ELAnzahlType;
-import at.vvo.omds.types.omds2Types.v2_14.ELEinstufungType;
-import at.vvo.omds.types.omds2Types.v2_14.ELEntscheidungsfrageType;
-import at.vvo.omds.types.omds2Types.v2_14.ELIdentifizierungType;
-import at.vvo.omds.types.omds2Types.v2_14.ELKommunikationType;
-import at.vvo.omds.types.omds2Types.v2_14.ELLegitimationType;
-import at.vvo.omds.types.omds2Types.v2_14.ELTextType;
-import at.vvo.omds.types.omds2Types.v2_14.NATUERLICHEPERSONType;
-import at.vvo.omds.types.omds2Types.v2_14.PersArtCdType;
-import at.vvo.omds.types.omds2Types.v2_14.SONSTIGEPERSONType;
-
-
-/**
- * Der Typ für eine Person mit ObjektId
- * 
- * 
Java-Klasse für Person_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Person_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}ObjektId" minOccurs="0"/>
- *         <choice>
- *           <element ref="{urn:omds20}NATUERLICHE_PERSON"/>
- *           <element ref="{urn:omds20}SONSTIGE_PERSON"/>
- *         </choice>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}Adresse" minOccurs="0"/>
- *         <element ref="{urn:omds20}EL-Kommunikation" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:omds20}EL-Legitimation" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:omds20}EL-Anzahl" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:omds20}EL-Einstufung" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:omds20}EL-Entscheidungsfrage" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:omds20}EL-Identifizierung" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:omds20}EL-Text" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="PersArtCd" use="required" type="{urn:omds20}PersArtCd_Type" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Person_Type", propOrder = {
-    "objektId",
-    "natuerlicheperson",
-    "sonstigeperson",
-    "adresse",
-    "elKommunikation",
-    "elLegitimation",
-    "elAnzahl",
-    "elEinstufung",
-    "elEntscheidungsfrage",
-    "elIdentifizierung",
-    "elText"
-})
-public class PersonType {
-
-    @XmlElement(name = "ObjektId")
-    protected ObjektIdType objektId;
-    @XmlElement(name = "NATUERLICHE_PERSON", namespace = "urn:omds20")
-    protected NATUERLICHEPERSONType natuerlicheperson;
-    @XmlElement(name = "SONSTIGE_PERSON", namespace = "urn:omds20")
-    protected SONSTIGEPERSONType sonstigeperson;
-    @XmlElement(name = "Adresse")
-    protected AdresseType adresse;
-    @XmlElement(name = "EL-Kommunikation", namespace = "urn:omds20")
-    protected List elKommunikation;
-    @XmlElement(name = "EL-Legitimation", namespace = "urn:omds20")
-    protected List elLegitimation;
-    @XmlElement(name = "EL-Anzahl", namespace = "urn:omds20")
-    protected List elAnzahl;
-    @XmlElement(name = "EL-Einstufung", namespace = "urn:omds20")
-    protected List elEinstufung;
-    @XmlElement(name = "EL-Entscheidungsfrage", namespace = "urn:omds20")
-    protected List elEntscheidungsfrage;
-    @XmlElement(name = "EL-Identifizierung", namespace = "urn:omds20")
-    protected List elIdentifizierung;
-    @XmlElement(name = "EL-Text", namespace = "urn:omds20")
-    protected List elText;
-    @XmlAttribute(name = "PersArtCd", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-    protected PersArtCdType persArtCd;
-
-    /**
-     * Die Id der Person (entspricht der Personennr, hat aber auch die Möglichkeit eine ID von Service-Consumer Seite mitzugeben)
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getObjektId() {
-        return objektId;
-    }
-
-    /**
-     * Legt den Wert der objektId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setObjektId(ObjektIdType value) {
-        this.objektId = value;
-    }
-
-    /**
-     * Ruft den Wert der natuerlicheperson-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link NATUERLICHEPERSONType }
-     *     
-     */
-    public NATUERLICHEPERSONType getNATUERLICHEPERSON() {
-        return natuerlicheperson;
-    }
-
-    /**
-     * Legt den Wert der natuerlicheperson-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link NATUERLICHEPERSONType }
-     *     
-     */
-    public void setNATUERLICHEPERSON(NATUERLICHEPERSONType value) {
-        this.natuerlicheperson = value;
-    }
-
-    /**
-     * Ruft den Wert der sonstigeperson-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SONSTIGEPERSONType }
-     *     
-     */
-    public SONSTIGEPERSONType getSONSTIGEPERSON() {
-        return sonstigeperson;
-    }
-
-    /**
-     * Legt den Wert der sonstigeperson-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SONSTIGEPERSONType }
-     *     
-     */
-    public void setSONSTIGEPERSON(SONSTIGEPERSONType value) {
-        this.sonstigeperson = value;
-    }
-
-    /**
-     * Die Hauptadresse des Partners mit ObjektId
-     * 
-     * @return
-     *     possible object is
-     *     {@link AdresseType }
-     *     
-     */
-    public AdresseType getAdresse() {
-        return adresse;
-    }
-
-    /**
-     * Legt den Wert der adresse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AdresseType }
-     *     
-     */
-    public void setAdresse(AdresseType value) {
-        this.adresse = value;
-    }
-
-    /**
-     * Gets the value of the elKommunikation property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the elKommunikation property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getELKommunikation().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ELKommunikationType }
-     * 
-     * 
-     */
-    public List getELKommunikation() {
-        if (elKommunikation == null) {
-            elKommunikation = new ArrayList();
-        }
-        return this.elKommunikation;
-    }
-
-    /**
-     * Gets the value of the elLegitimation property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the elLegitimation property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getELLegitimation().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ELLegitimationType }
-     * 
-     * 
-     */
-    public List getELLegitimation() {
-        if (elLegitimation == null) {
-            elLegitimation = new ArrayList();
-        }
-        return this.elLegitimation;
-    }
-
-    /**
-     * Gets the value of the elAnzahl property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the elAnzahl property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getELAnzahl().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ELAnzahlType }
-     * 
-     * 
-     */
-    public List getELAnzahl() {
-        if (elAnzahl == null) {
-            elAnzahl = new ArrayList();
-        }
-        return this.elAnzahl;
-    }
-
-    /**
-     * Gets the value of the elEinstufung property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the elEinstufung property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getELEinstufung().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ELEinstufungType }
-     * 
-     * 
-     */
-    public List getELEinstufung() {
-        if (elEinstufung == null) {
-            elEinstufung = new ArrayList();
-        }
-        return this.elEinstufung;
-    }
-
-    /**
-     * Gets the value of the elEntscheidungsfrage property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the elEntscheidungsfrage property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getELEntscheidungsfrage().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ELEntscheidungsfrageType }
-     * 
-     * 
-     */
-    public List getELEntscheidungsfrage() {
-        if (elEntscheidungsfrage == null) {
-            elEntscheidungsfrage = new ArrayList();
-        }
-        return this.elEntscheidungsfrage;
-    }
-
-    /**
-     * Gets the value of the elIdentifizierung property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the elIdentifizierung property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getELIdentifizierung().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ELIdentifizierungType }
-     * 
-     * 
-     */
-    public List getELIdentifizierung() {
-        if (elIdentifizierung == null) {
-            elIdentifizierung = new ArrayList();
-        }
-        return this.elIdentifizierung;
-    }
-
-    /**
-     * Gets the value of the elText property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the elText property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getELText().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ELTextType }
-     * 
-     * 
-     */
-    public List getELText() {
-        if (elText == null) {
-            elText = new ArrayList();
-        }
-        return this.elText;
-    }
-
-    /**
-     * Ruft den Wert der persArtCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PersArtCdType }
-     *     
-     */
-    public PersArtCdType getPersArtCd() {
-        return persArtCd;
-    }
-
-    /**
-     * Legt den Wert der persArtCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PersArtCdType }
-     *     
-     */
-    public void setPersArtCd(PersArtCdType value) {
-        this.persArtCd = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PfandglaeubigerType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PfandglaeubigerType.java
deleted file mode 100644
index fe3ce1ab..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PfandglaeubigerType.java
+++ /dev/null
@@ -1,84 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Eigenschaften Pfandgläubiger
- * 
- * 
Java-Klasse für Pfandglaeubiger_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Pfandglaeubiger_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Anteil" type="{http://www.w3.org/2001/XMLSchema}double"/>
- *         <element name="Glaeubiger" type="{urn:omds3CommonServiceTypes-1-1-0}GlaeubigerSicherstellung_Type"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Pfandglaeubiger_Type", propOrder = {
-    "anteil",
-    "glaeubiger"
-})
-public class PfandglaeubigerType {
-
-    @XmlElement(name = "Anteil")
-    protected double anteil;
-    @XmlElement(name = "Glaeubiger", required = true)
-    protected GlaeubigerSicherstellungType glaeubiger;
-
-    /**
-     * Ruft den Wert der anteil-Eigenschaft ab.
-     * 
-     */
-    public double getAnteil() {
-        return anteil;
-    }
-
-    /**
-     * Legt den Wert der anteil-Eigenschaft fest.
-     * 
-     */
-    public void setAnteil(double value) {
-        this.anteil = value;
-    }
-
-    /**
-     * Ruft den Wert der glaeubiger-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GlaeubigerSicherstellungType }
-     *     
-     */
-    public GlaeubigerSicherstellungType getGlaeubiger() {
-        return glaeubiger;
-    }
-
-    /**
-     * Legt den Wert der glaeubiger-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GlaeubigerSicherstellungType }
-     *     
-     */
-    public void setGlaeubiger(GlaeubigerSicherstellungType value) {
-        this.glaeubiger = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PolizzenObjektSpezifikationType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PolizzenObjektSpezifikationType.java
deleted file mode 100644
index 8a60d698..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PolizzenObjektSpezifikationType.java
+++ /dev/null
@@ -1,130 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.PolicyPartnerRole;
-
-
-/**
- * Die Spezifikation eines Polizzenobjektes
- * 
- * 
Java-Klasse für PolizzenObjektSpezifikation_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="PolizzenObjektSpezifikation_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ObjektSpezifikation_Type">
- *       <sequence>
- *         <element name="Polizzennr" type="{urn:omds20}Polizzennr"/>
- *         <element name="VtgProdCd" type="{urn:omds20}VtgProdCd_Type" minOccurs="0"/>
- *         <element name="RollePartner" type="{urn:omds3ServiceTypes-1-1-0}PolicyPartnerRole" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PolizzenObjektSpezifikation_Type", propOrder = {
-    "polizzennr",
-    "vtgProdCd",
-    "rollePartner"
-})
-public class PolizzenObjektSpezifikationType
-    extends ObjektSpezifikationType
-{
-
-    @XmlElement(name = "Polizzennr", required = true)
-    protected String polizzennr;
-    @XmlElement(name = "VtgProdCd")
-    protected String vtgProdCd;
-    @XmlElement(name = "RollePartner")
-    protected List rollePartner;
-
-    /**
-     * Ruft den Wert der polizzennr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolizzennr() {
-        return polizzennr;
-    }
-
-    /**
-     * Legt den Wert der polizzennr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolizzennr(String value) {
-        this.polizzennr = value;
-    }
-
-    /**
-     * Ruft den Wert der vtgProdCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVtgProdCd() {
-        return vtgProdCd;
-    }
-
-    /**
-     * Legt den Wert der vtgProdCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVtgProdCd(String value) {
-        this.vtgProdCd = value;
-    }
-
-    /**
-     * Gets the value of the rollePartner property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the rollePartner property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getRollePartner().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link PolicyPartnerRole }
-     * 
-     * 
-     */
-    public List getRollePartner() {
-        if (rollePartner == null) {
-            rollePartner = new ArrayList();
-        }
-        return this.rollePartner;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PolizzenversandType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PolizzenversandType.java
deleted file mode 100644
index fbe9fc5c..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PolizzenversandType.java
+++ /dev/null
@@ -1,76 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
Java-Klasse für PolizzenversandType.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

- * 
- * <simpleType name="PolizzenversandType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="MAK2"/>
- *     <enumeration value="VN1"/>
- *     <enumeration value="MAKVN"/>
- *     <enumeration value="MAK1"/>
- *   </restriction>
- * </simpleType>
- * 

- * 
- */
-@XmlType(name = "PolizzenversandType")
-@XmlEnum
-public enum PolizzenversandType {
-
-
-    /**
-     *  2fach Makler: Ist nur bei Postversand möglich. Makler erhält Original und Kopie
-     * 
-     */
-    @XmlEnumValue("MAK2")
-    MAK_2("MAK2"),
-
-    /**
-     *  1fach Versicherungsnehmer: Kunde erhält Original
-     * 
-     */
-    @XmlEnumValue("VN1")
-    VN_1("VN1"),
-
-    /**
-     *  1fach Makler und 1fach Versicherungsnehmer: Kunde erhält Original und Makler die Kopie
-     * 
-     */
-    MAKVN("MAKVN"),
-
-    /**
-     *  1fach Makler: Makler erhält Original
-     * 
-     */
-    @XmlEnumValue("MAK1")
-    MAK_1("MAK1");
-    private final String value;
-
-    PolizzenversandType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static PolizzenversandType fromValue(String v) {
-        for (PolizzenversandType c: PolizzenversandType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PraemieType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PraemieType.java
deleted file mode 100644
index a49e7ad7..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/PraemieType.java
+++ /dev/null
@@ -1,271 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds2Types.v2_14.WaehrungsCdType;
-
-
-/**
- * Darstellung einer Praemie
- * 
- * 
Java-Klasse für Praemie_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Praemie_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Zahlrhythmus" type="{urn:omds20}ZahlRhythmCd_Type"/>
- *         <element name="Zahlweg" type="{urn:omds20}ZahlWegCd_Type"/>
- *         <element name="PraemieNto" type="{urn:omds20}decimal"/>
- *         <element name="PraemieBto" type="{urn:omds20}decimal"/>
- *         <element name="Versicherungssteuer" type="{urn:omds3CommonServiceTypes-1-1-0}Versicherungssteuer_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="WaehrungsCd" type="{urn:omds20}WaehrungsCd_Type" minOccurs="0"/>
- *         <element name="Unterjaehrigkeitszuschlag" type="{http://www.w3.org/2001/XMLSchema}double" minOccurs="0"/>
- *         <element name="Abschlag" type="{http://www.w3.org/2001/XMLSchema}double" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Praemie_Type", propOrder = {
-    "zahlrhythmus",
-    "zahlweg",
-    "praemieNto",
-    "praemieBto",
-    "versicherungssteuer",
-    "waehrungsCd",
-    "unterjaehrigkeitszuschlag",
-    "abschlag"
-})
-public class PraemieType {
-
-    @XmlElement(name = "Zahlrhythmus", required = true)
-    protected String zahlrhythmus;
-    @XmlElement(name = "Zahlweg", required = true)
-    protected String zahlweg;
-    @XmlElement(name = "PraemieNto", required = true)
-    protected BigDecimal praemieNto;
-    @XmlElement(name = "PraemieBto", required = true)
-    protected BigDecimal praemieBto;
-    @XmlElement(name = "Versicherungssteuer")
-    protected List versicherungssteuer;
-    @XmlElement(name = "WaehrungsCd")
-    @XmlSchemaType(name = "string")
-    protected WaehrungsCdType waehrungsCd;
-    @XmlElement(name = "Unterjaehrigkeitszuschlag")
-    protected Double unterjaehrigkeitszuschlag;
-    @XmlElement(name = "Abschlag")
-    protected Double abschlag;
-
-    /**
-     * Ruft den Wert der zahlrhythmus-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getZahlrhythmus() {
-        return zahlrhythmus;
-    }
-
-    /**
-     * Legt den Wert der zahlrhythmus-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setZahlrhythmus(String value) {
-        this.zahlrhythmus = value;
-    }
-
-    /**
-     * Ruft den Wert der zahlweg-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getZahlweg() {
-        return zahlweg;
-    }
-
-    /**
-     * Legt den Wert der zahlweg-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setZahlweg(String value) {
-        this.zahlweg = value;
-    }
-
-    /**
-     * Ruft den Wert der praemieNto-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getPraemieNto() {
-        return praemieNto;
-    }
-
-    /**
-     * Legt den Wert der praemieNto-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setPraemieNto(BigDecimal value) {
-        this.praemieNto = value;
-    }
-
-    /**
-     * Ruft den Wert der praemieBto-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getPraemieBto() {
-        return praemieBto;
-    }
-
-    /**
-     * Legt den Wert der praemieBto-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setPraemieBto(BigDecimal value) {
-        this.praemieBto = value;
-    }
-
-    /**
-     * Gets the value of the versicherungssteuer property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the versicherungssteuer property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVersicherungssteuer().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link VersicherungssteuerType }
-     * 
-     * 
-     */
-    public List getVersicherungssteuer() {
-        if (versicherungssteuer == null) {
-            versicherungssteuer = new ArrayList();
-        }
-        return this.versicherungssteuer;
-    }
-
-    /**
-     * Ruft den Wert der waehrungsCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link WaehrungsCdType }
-     *     
-     */
-    public WaehrungsCdType getWaehrungsCd() {
-        return waehrungsCd;
-    }
-
-    /**
-     * Legt den Wert der waehrungsCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link WaehrungsCdType }
-     *     
-     */
-    public void setWaehrungsCd(WaehrungsCdType value) {
-        this.waehrungsCd = value;
-    }
-
-    /**
-     * Ruft den Wert der unterjaehrigkeitszuschlag-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Double }
-     *     
-     */
-    public Double getUnterjaehrigkeitszuschlag() {
-        return unterjaehrigkeitszuschlag;
-    }
-
-    /**
-     * Legt den Wert der unterjaehrigkeitszuschlag-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Double }
-     *     
-     */
-    public void setUnterjaehrigkeitszuschlag(Double value) {
-        this.unterjaehrigkeitszuschlag = value;
-    }
-
-    /**
-     * Ruft den Wert der abschlag-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Double }
-     *     
-     */
-    public Double getAbschlag() {
-        return abschlag;
-    }
-
-    /**
-     * Legt den Wert der abschlag-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Double }
-     *     
-     */
-    public void setAbschlag(Double value) {
-        this.abschlag = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktGenerischType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktGenerischType.java
deleted file mode 100644
index e5123e7c..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktGenerischType.java
+++ /dev/null
@@ -1,157 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.ProduktSachPrivatType;
-import rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.ProduktRechtsschutzType;
-
-
-/**
- * Basistyp für ein Produkt, 2. Generation
- * 
- * 
Java-Klasse für ProduktGenerisch_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProduktGenerisch_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Produkt_Type">
- *       <sequence>
- *         <element name="Eingeschlossen" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="EinschlussAenderbar" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="AttributMetadaten" type="{urn:omds3CommonServiceTypes-1-1-0}AttributMetadaten_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="BeschreibungTxt" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProduktGenerisch_Type", propOrder = {
-    "eingeschlossen",
-    "einschlussAenderbar",
-    "attributMetadaten",
-    "beschreibungTxt"
-})
-@XmlSeeAlso({
-    ProduktSachPrivatType.class,
-    ProduktMitVpType.class,
-    ProduktRechtsschutzType.class
-})
-public abstract class ProduktGenerischType
-    extends ProduktType
-{
-
-    @XmlElement(name = "Eingeschlossen")
-    protected boolean eingeschlossen;
-    @XmlElement(name = "EinschlussAenderbar")
-    protected Boolean einschlussAenderbar;
-    @XmlElement(name = "AttributMetadaten")
-    protected List attributMetadaten;
-    @XmlElement(name = "BeschreibungTxt")
-    protected String beschreibungTxt;
-
-    /**
-     * Ruft den Wert der eingeschlossen-Eigenschaft ab.
-     * 
-     */
-    public boolean isEingeschlossen() {
-        return eingeschlossen;
-    }
-
-    /**
-     * Legt den Wert der eingeschlossen-Eigenschaft fest.
-     * 
-     */
-    public void setEingeschlossen(boolean value) {
-        this.eingeschlossen = value;
-    }
-
-    /**
-     * Ruft den Wert der einschlussAenderbar-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isEinschlussAenderbar() {
-        return einschlussAenderbar;
-    }
-
-    /**
-     * Legt den Wert der einschlussAenderbar-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setEinschlussAenderbar(Boolean value) {
-        this.einschlussAenderbar = value;
-    }
-
-    /**
-     * Gets the value of the attributMetadaten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the attributMetadaten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getAttributMetadaten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link AttributMetadatenType }
-     * 
-     * 
-     */
-    public List getAttributMetadaten() {
-        if (attributMetadaten == null) {
-            attributMetadaten = new ArrayList();
-        }
-        return this.attributMetadaten;
-    }
-
-    /**
-     * Ruft den Wert der beschreibungTxt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBeschreibungTxt() {
-        return beschreibungTxt;
-    }
-
-    /**
-     * Legt den Wert der beschreibungTxt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBeschreibungTxt(String value) {
-        this.beschreibungTxt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktMitVpType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktMitVpType.java
deleted file mode 100644
index a6054894..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktMitVpType.java
+++ /dev/null
@@ -1,104 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.ProduktKrankenType;
-import leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.ProduktLebenType;
-import unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.ProduktUnfallType;
-
-
-/**
- * Basistyp für eine Produktelement vom Typ "Versicherte Person"
- * 
- * 
Java-Klasse für ProduktMitVp_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProduktMitVp_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ProduktGenerisch_Type">
- *       <sequence>
- *         <element name="Bezugsberechtigungen" type="{urn:omds3CommonServiceTypes-1-1-0}Bezugsberechtigung_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="VersPersonenRefLfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProduktMitVp_Type", propOrder = {
-    "bezugsberechtigungen",
-    "versPersonenRefLfnr"
-})
-@XmlSeeAlso({
-    ProduktLebenType.class,
-    ProduktKrankenType.class,
-    ProduktUnfallType.class
-})
-public abstract class ProduktMitVpType
-    extends ProduktGenerischType
-{
-
-    @XmlElement(name = "Bezugsberechtigungen")
-    protected List bezugsberechtigungen;
-    @XmlElement(name = "VersPersonenRefLfnr")
-    @XmlSchemaType(name = "unsignedShort")
-    protected int versPersonenRefLfnr;
-
-    /**
-     * Gets the value of the bezugsberechtigungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the bezugsberechtigungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getBezugsberechtigungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link BezugsberechtigungType }
-     * 
-     * 
-     */
-    public List getBezugsberechtigungen() {
-        if (bezugsberechtigungen == null) {
-            bezugsberechtigungen = new ArrayList();
-        }
-        return this.bezugsberechtigungen;
-    }
-
-    /**
-     * Ruft den Wert der versPersonenRefLfnr-Eigenschaft ab.
-     * 
-     */
-    public int getVersPersonenRefLfnr() {
-        return versPersonenRefLfnr;
-    }
-
-    /**
-     * Legt den Wert der versPersonenRefLfnr-Eigenschaft fest.
-     * 
-     */
-    public void setVersPersonenRefLfnr(int value) {
-        this.versPersonenRefLfnr = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktType.java
deleted file mode 100644
index da221097..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktType.java
+++ /dev/null
@@ -1,254 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.ProduktKfzType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.ZusatzproduktKfzType;
-
-
-/**
- * Basistyp für ein Produkt
- * 
- * 
Java-Klasse für Produkt_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Produkt_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Produktbaustein_Type">
- *       <sequence>
- *         <element name="VtgBeg" type="{urn:omds20}Datum" minOccurs="0"/>
- *         <element name="Produktgeneration" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Zahlweg" type="{urn:omds20}ZahlWegCd_Type" minOccurs="0"/>
- *         <element name="Zahlrhythmus" type="{urn:omds20}ZahlRhythmCd_Type" minOccurs="0"/>
- *         <element name="Hauptfaelligkeit" type="{urn:omds3CommonServiceTypes-1-1-0}Hauptfaelligkeit_Type"/>
- *         <element name="RefSicherstellungLfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/>
- *         <element name="ZusaetzlicheProduktdaten" type="{urn:omds3CommonServiceTypes-1-1-0}ZusaetzlicheProduktdaten_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Produkt_Type", propOrder = {
-    "vtgBeg",
-    "produktgeneration",
-    "zahlweg",
-    "zahlrhythmus",
-    "hauptfaelligkeit",
-    "refSicherstellungLfnr",
-    "zusaetzlicheProduktdaten"
-})
-@XmlSeeAlso({
-    ProduktKfzType.class,
-    ZusatzproduktKfzType.class,
-    ProduktGenerischType.class
-})
-public abstract class ProduktType
-    extends ProduktbausteinType
-{
-
-    @XmlElement(name = "VtgBeg")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar vtgBeg;
-    @XmlElement(name = "Produktgeneration")
-    protected String produktgeneration;
-    @XmlElement(name = "Zahlweg")
-    protected String zahlweg;
-    @XmlElement(name = "Zahlrhythmus")
-    protected String zahlrhythmus;
-    @XmlElement(name = "Hauptfaelligkeit", required = true)
-    @XmlSchemaType(name = "gMonthDay")
-    protected XMLGregorianCalendar hauptfaelligkeit;
-    @XmlElement(name = "RefSicherstellungLfnr")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer refSicherstellungLfnr;
-    @XmlElement(name = "ZusaetzlicheProduktdaten")
-    protected List zusaetzlicheProduktdaten;
-
-    /**
-     * Ruft den Wert der vtgBeg-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getVtgBeg() {
-        return vtgBeg;
-    }
-
-    /**
-     * Legt den Wert der vtgBeg-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setVtgBeg(XMLGregorianCalendar value) {
-        this.vtgBeg = value;
-    }
-
-    /**
-     * Ruft den Wert der produktgeneration-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getProduktgeneration() {
-        return produktgeneration;
-    }
-
-    /**
-     * Legt den Wert der produktgeneration-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setProduktgeneration(String value) {
-        this.produktgeneration = value;
-    }
-
-    /**
-     * Ruft den Wert der zahlweg-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getZahlweg() {
-        return zahlweg;
-    }
-
-    /**
-     * Legt den Wert der zahlweg-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setZahlweg(String value) {
-        this.zahlweg = value;
-    }
-
-    /**
-     * Ruft den Wert der zahlrhythmus-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getZahlrhythmus() {
-        return zahlrhythmus;
-    }
-
-    /**
-     * Legt den Wert der zahlrhythmus-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setZahlrhythmus(String value) {
-        this.zahlrhythmus = value;
-    }
-
-    /**
-     * Ruft den Wert der hauptfaelligkeit-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getHauptfaelligkeit() {
-        return hauptfaelligkeit;
-    }
-
-    /**
-     * Legt den Wert der hauptfaelligkeit-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setHauptfaelligkeit(XMLGregorianCalendar value) {
-        this.hauptfaelligkeit = value;
-    }
-
-    /**
-     * Ruft den Wert der refSicherstellungLfnr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getRefSicherstellungLfnr() {
-        return refSicherstellungLfnr;
-    }
-
-    /**
-     * Legt den Wert der refSicherstellungLfnr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setRefSicherstellungLfnr(Integer value) {
-        this.refSicherstellungLfnr = value;
-    }
-
-    /**
-     * Gets the value of the zusaetzlicheProduktdaten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zusaetzlicheProduktdaten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZusaetzlicheProduktdaten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ZusaetzlicheProduktdatenType }
-     * 
-     * 
-     */
-    public List getZusaetzlicheProduktdaten() {
-        if (zusaetzlicheProduktdaten == null) {
-            zusaetzlicheProduktdaten = new ArrayList();
-        }
-        return this.zusaetzlicheProduktdaten;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktbausteinGenerischType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktbausteinGenerischType.java
deleted file mode 100644
index e545618e..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktbausteinGenerischType.java
+++ /dev/null
@@ -1,149 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Abstrakter Typ für Produktbausteine im Antragsprozess der 2. Generation
- * 
- * 
Java-Klasse für ProduktbausteinGenerisch_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProduktbausteinGenerisch_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Produktbaustein_Type">
- *       <sequence>
- *         <element name="Eingeschlossen" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="EinschlussAenderbar" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="AttributMetadaten" type="{urn:omds3CommonServiceTypes-1-1-0}AttributMetadaten_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="BeschreibungTxt" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProduktbausteinGenerisch_Type", propOrder = {
-    "eingeschlossen",
-    "einschlussAenderbar",
-    "attributMetadaten",
-    "beschreibungTxt"
-})
-public abstract class ProduktbausteinGenerischType
-    extends ProduktbausteinType
-{
-
-    @XmlElement(name = "Eingeschlossen")
-    protected boolean eingeschlossen;
-    @XmlElement(name = "EinschlussAenderbar")
-    protected Boolean einschlussAenderbar;
-    @XmlElement(name = "AttributMetadaten")
-    protected List attributMetadaten;
-    @XmlElement(name = "BeschreibungTxt")
-    protected String beschreibungTxt;
-
-    /**
-     * Ruft den Wert der eingeschlossen-Eigenschaft ab.
-     * 
-     */
-    public boolean isEingeschlossen() {
-        return eingeschlossen;
-    }
-
-    /**
-     * Legt den Wert der eingeschlossen-Eigenschaft fest.
-     * 
-     */
-    public void setEingeschlossen(boolean value) {
-        this.eingeschlossen = value;
-    }
-
-    /**
-     * Ruft den Wert der einschlussAenderbar-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isEinschlussAenderbar() {
-        return einschlussAenderbar;
-    }
-
-    /**
-     * Legt den Wert der einschlussAenderbar-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setEinschlussAenderbar(Boolean value) {
-        this.einschlussAenderbar = value;
-    }
-
-    /**
-     * Gets the value of the attributMetadaten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the attributMetadaten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getAttributMetadaten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link AttributMetadatenType }
-     * 
-     * 
-     */
-    public List getAttributMetadaten() {
-        if (attributMetadaten == null) {
-            attributMetadaten = new ArrayList();
-        }
-        return this.attributMetadaten;
-    }
-
-    /**
-     * Ruft den Wert der beschreibungTxt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBeschreibungTxt() {
-        return beschreibungTxt;
-    }
-
-    /**
-     * Legt den Wert der beschreibungTxt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBeschreibungTxt(String value) {
-        this.beschreibungTxt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktbausteinType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktbausteinType.java
deleted file mode 100644
index e56b7cd1..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProduktbausteinType.java
+++ /dev/null
@@ -1,141 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * Abstrakter Typ für alle Produktbausteine im Antragsprozess
- * 
- * 
Java-Klasse für Produktbaustein_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Produktbaustein_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}BasisProduktbaustein_Type">
- *       <sequence>
- *         <element name="VtgEnde" type="{urn:omds20}Datum" minOccurs="0"/>
- *         <element name="Praemie" type="{urn:omds3CommonServiceTypes-1-1-0}Praemie_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="JahrespraemieNto" type="{urn:omds20}decimal" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Produktbaustein_Type", propOrder = {
-    "vtgEnde",
-    "praemie",
-    "jahrespraemieNto"
-})
-@XmlSeeAlso({
-    ProduktbausteinGenerischType.class,
-    ZusatzproduktType.class,
-    VerkaufsproduktType.class,
-    ProduktType.class,
-    ElementarproduktType.class
-})
-public abstract class ProduktbausteinType
-    extends BasisProduktbausteinType
-{
-
-    @XmlElement(name = "VtgEnde")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar vtgEnde;
-    @XmlElement(name = "Praemie")
-    protected List praemie;
-    @XmlElement(name = "JahrespraemieNto")
-    protected BigDecimal jahrespraemieNto;
-
-    /**
-     * Ruft den Wert der vtgEnde-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getVtgEnde() {
-        return vtgEnde;
-    }
-
-    /**
-     * Legt den Wert der vtgEnde-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setVtgEnde(XMLGregorianCalendar value) {
-        this.vtgEnde = value;
-    }
-
-    /**
-     * Gets the value of the praemie property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the praemie property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getPraemie().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link PraemieType }
-     * 
-     * 
-     */
-    public List getPraemie() {
-        if (praemie == null) {
-            praemie = new ArrayList();
-        }
-        return this.praemie;
-    }
-
-    /**
-     * Ruft den Wert der jahrespraemieNto-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getJahrespraemieNto() {
-        return jahrespraemieNto;
-    }
-
-    /**
-     * Legt den Wert der jahrespraemieNto-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setJahrespraemieNto(BigDecimal value) {
-        this.jahrespraemieNto = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokAnforderung.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokAnforderung.java
deleted file mode 100644
index 670a79ae..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokAnforderung.java
+++ /dev/null
@@ -1,220 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Anforderung eines beizubringenden Dokuments
- * 
- * 
Java-Klasse für ProzessDokAnforderung complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProzessDokAnforderung">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ProzessDokumentBasis_Type">
- *       <sequence>
- *         <element name="DokAnforderungsId" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type"/>
- *         <element name="Autorisierungen" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <extension base="{urn:omds3CommonServiceTypes-1-1-0}Autorisierung_Type">
- *               </extension>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="DocUploadRequired" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="ZulaessigeMimetypes" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Meldungen" type="{urn:omds3CommonServiceTypes-1-1-0}ServiceFault" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProzessDokAnforderung", propOrder = {
-    "dokAnforderungsId",
-    "autorisierungen",
-    "docUploadRequired",
-    "zulaessigeMimetypes",
-    "meldungen"
-})
-public class ProzessDokAnforderung
-    extends ProzessDokumentBasisType
-{
-
-    @XmlElement(name = "DokAnforderungsId", required = true)
-    protected ObjektIdType dokAnforderungsId;
-    @XmlElement(name = "Autorisierungen")
-    protected List autorisierungen;
-    @XmlElement(name = "DocUploadRequired")
-    protected boolean docUploadRequired;
-    @XmlElement(name = "ZulaessigeMimetypes")
-    protected List zulaessigeMimetypes;
-    @XmlElement(name = "Meldungen")
-    protected List meldungen;
-
-    /**
-     * Ruft den Wert der dokAnforderungsId-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getDokAnforderungsId() {
-        return dokAnforderungsId;
-    }
-
-    /**
-     * Legt den Wert der dokAnforderungsId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setDokAnforderungsId(ObjektIdType value) {
-        this.dokAnforderungsId = value;
-    }
-
-    /**
-     * Gets the value of the autorisierungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the autorisierungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getAutorisierungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ProzessDokAnforderung.Autorisierungen }
-     * 
-     * 
-     */
-    public List getAutorisierungen() {
-        if (autorisierungen == null) {
-            autorisierungen = new ArrayList();
-        }
-        return this.autorisierungen;
-    }
-
-    /**
-     * Ruft den Wert der docUploadRequired-Eigenschaft ab.
-     * 
-     */
-    public boolean isDocUploadRequired() {
-        return docUploadRequired;
-    }
-
-    /**
-     * Legt den Wert der docUploadRequired-Eigenschaft fest.
-     * 
-     */
-    public void setDocUploadRequired(boolean value) {
-        this.docUploadRequired = value;
-    }
-
-    /**
-     * Gets the value of the zulaessigeMimetypes property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zulaessigeMimetypes property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZulaessigeMimetypes().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List getZulaessigeMimetypes() {
-        if (zulaessigeMimetypes == null) {
-            zulaessigeMimetypes = new ArrayList();
-        }
-        return this.zulaessigeMimetypes;
-    }
-
-    /**
-     * Gets the value of the meldungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the meldungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getMeldungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ServiceFault }
-     * 
-     * 
-     */
-    public List getMeldungen() {
-        if (meldungen == null) {
-            meldungen = new ArrayList();
-        }
-        return this.meldungen;
-    }
-
-
-    /**
-     * 
Java-Klasse für anonymous complex type.
-     * 
-     * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Autorisierung_Type">
-     *     </extension>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Autorisierungen
-        extends AutorisierungType
-    {
-
-
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokFuerKunde.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokFuerKunde.java
deleted file mode 100644
index 4d197fd1..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokFuerKunde.java
+++ /dev/null
@@ -1,93 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Bereitstellung Dokument für Kunde, nicht zu unterschreiben
- * 
- * 
Java-Klasse für ProzessDokFuerKunde complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProzessDokFuerKunde">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ProzessDokumentBasis_Type">
- *       <sequence>
- *         <element name="DokData" type="{urn:omds3CommonServiceTypes-1-1-0}DokumentData_Type"/>
- *         <element name="ArtAusfolgung">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}unsignedByte">
- *               <enumeration value="0"/>
- *               <enumeration value="1"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProzessDokFuerKunde", propOrder = {
-    "dokData",
-    "artAusfolgung"
-})
-public class ProzessDokFuerKunde
-    extends ProzessDokumentBasisType
-{
-
-    @XmlElement(name = "DokData", required = true)
-    protected DokumentDataType dokData;
-    @XmlElement(name = "ArtAusfolgung")
-    protected short artAusfolgung;
-
-    /**
-     * Ruft den Wert der dokData-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DokumentDataType }
-     *     
-     */
-    public DokumentDataType getDokData() {
-        return dokData;
-    }
-
-    /**
-     * Legt den Wert der dokData-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DokumentDataType }
-     *     
-     */
-    public void setDokData(DokumentDataType value) {
-        this.dokData = value;
-    }
-
-    /**
-     * Ruft den Wert der artAusfolgung-Eigenschaft ab.
-     * 
-     */
-    public short getArtAusfolgung() {
-        return artAusfolgung;
-    }
-
-    /**
-     * Legt den Wert der artAusfolgung-Eigenschaft fest.
-     * 
-     */
-    public void setArtAusfolgung(short value) {
-        this.artAusfolgung = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokFuerKundeZumUnterschreiben.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokFuerKundeZumUnterschreiben.java
deleted file mode 100644
index df2146ec..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokFuerKundeZumUnterschreiben.java
+++ /dev/null
@@ -1,182 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Bereitstellung Dokument zum Unterschreiben
- * 
- * 
Java-Klasse für ProzessDokFuerKundeZumUnterschreiben complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProzessDokFuerKundeZumUnterschreiben">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ProzessDokumentBasis_Type">
- *       <sequence>
- *         <element name="DokAnforderungsId" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type"/>
- *         <element name="Autorisierungen" type="{urn:omds3CommonServiceTypes-1-1-0}Autorisierung_Type" maxOccurs="unbounded"/>
- *         <element name="DocUploadRequired" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="ZulaessigeMimetypes" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="DokData" type="{urn:omds3CommonServiceTypes-1-1-0}DokumentData_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProzessDokFuerKundeZumUnterschreiben", propOrder = {
-    "dokAnforderungsId",
-    "autorisierungen",
-    "docUploadRequired",
-    "zulaessigeMimetypes",
-    "dokData"
-})
-public class ProzessDokFuerKundeZumUnterschreiben
-    extends ProzessDokumentBasisType
-{
-
-    @XmlElement(name = "DokAnforderungsId", required = true)
-    protected ObjektIdType dokAnforderungsId;
-    @XmlElement(name = "Autorisierungen", required = true)
-    protected List autorisierungen;
-    @XmlElement(name = "DocUploadRequired")
-    protected boolean docUploadRequired;
-    @XmlElement(name = "ZulaessigeMimetypes")
-    protected List zulaessigeMimetypes;
-    @XmlElement(name = "DokData", required = true)
-    protected DokumentDataType dokData;
-
-    /**
-     * Ruft den Wert der dokAnforderungsId-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getDokAnforderungsId() {
-        return dokAnforderungsId;
-    }
-
-    /**
-     * Legt den Wert der dokAnforderungsId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setDokAnforderungsId(ObjektIdType value) {
-        this.dokAnforderungsId = value;
-    }
-
-    /**
-     * Gets the value of the autorisierungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the autorisierungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getAutorisierungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link AutorisierungType }
-     * 
-     * 
-     */
-    public List getAutorisierungen() {
-        if (autorisierungen == null) {
-            autorisierungen = new ArrayList();
-        }
-        return this.autorisierungen;
-    }
-
-    /**
-     * Ruft den Wert der docUploadRequired-Eigenschaft ab.
-     * 
-     */
-    public boolean isDocUploadRequired() {
-        return docUploadRequired;
-    }
-
-    /**
-     * Legt den Wert der docUploadRequired-Eigenschaft fest.
-     * 
-     */
-    public void setDocUploadRequired(boolean value) {
-        this.docUploadRequired = value;
-    }
-
-    /**
-     * Gets the value of the zulaessigeMimetypes property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zulaessigeMimetypes property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZulaessigeMimetypes().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List getZulaessigeMimetypes() {
-        if (zulaessigeMimetypes == null) {
-            zulaessigeMimetypes = new ArrayList();
-        }
-        return this.zulaessigeMimetypes;
-    }
-
-    /**
-     * Ruft den Wert der dokData-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DokumentDataType }
-     *     
-     */
-    public DokumentDataType getDokData() {
-        return dokData;
-    }
-
-    /**
-     * Legt den Wert der dokData-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DokumentDataType }
-     *     
-     */
-    public void setDokData(DokumentDataType value) {
-        this.dokData = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokHandoutType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokHandoutType.java
deleted file mode 100644
index ac5664d2..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokHandoutType.java
+++ /dev/null
@@ -1,93 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Bereitstellung Dokument für Kunde, nicht zu unterschreiben
- * 
- * 
Java-Klasse für ProzessDokHandout_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProzessDokHandout_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ProzessDokumentBasis_Type">
- *       <sequence>
- *         <element name="DokData" type="{urn:omds3CommonServiceTypes-1-1-0}DokumentData_Type"/>
- *         <element name="ArtAusfolgung">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}unsignedByte">
- *               <enumeration value="0"/>
- *               <enumeration value="1"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProzessDokHandout_Type", propOrder = {
-    "dokData",
-    "artAusfolgung"
-})
-public class ProzessDokHandoutType
-    extends ProzessDokumentBasisType
-{
-
-    @XmlElement(name = "DokData", required = true)
-    protected DokumentDataType dokData;
-    @XmlElement(name = "ArtAusfolgung")
-    protected short artAusfolgung;
-
-    /**
-     * Ruft den Wert der dokData-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DokumentDataType }
-     *     
-     */
-    public DokumentDataType getDokData() {
-        return dokData;
-    }
-
-    /**
-     * Legt den Wert der dokData-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DokumentDataType }
-     *     
-     */
-    public void setDokData(DokumentDataType value) {
-        this.dokData = value;
-    }
-
-    /**
-     * Ruft den Wert der artAusfolgung-Eigenschaft ab.
-     * 
-     */
-    public short getArtAusfolgung() {
-        return artAusfolgung;
-    }
-
-    /**
-     * Legt den Wert der artAusfolgung-Eigenschaft fest.
-     * 
-     */
-    public void setArtAusfolgung(short value) {
-        this.artAusfolgung = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokRequirementType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokRequirementType.java
deleted file mode 100644
index e8da9e8f..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokRequirementType.java
+++ /dev/null
@@ -1,187 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Anforderung eines beizubringenden Dokuments
- * 
- * 
Java-Klasse für ProzessDokRequirement_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProzessDokRequirement_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ProzessDokumentBasis_Type">
- *       <sequence>
- *         <element name="DokAnforderungsId" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type"/>
- *         <element name="Autorisierungen" type="{urn:omds3CommonServiceTypes-1-1-0}AutorisierungsAnforderung_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="DocUploadRequired" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="ZulaessigeMimetypes" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Meldungen" type="{urn:omds3CommonServiceTypes-1-1-0}ServiceFault" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProzessDokRequirement_Type", propOrder = {
-    "dokAnforderungsId",
-    "autorisierungen",
-    "docUploadRequired",
-    "zulaessigeMimetypes",
-    "meldungen"
-})
-public class ProzessDokRequirementType
-    extends ProzessDokumentBasisType
-{
-
-    @XmlElement(name = "DokAnforderungsId", required = true)
-    protected ObjektIdType dokAnforderungsId;
-    @XmlElement(name = "Autorisierungen")
-    protected List autorisierungen;
-    @XmlElement(name = "DocUploadRequired")
-    protected boolean docUploadRequired;
-    @XmlElement(name = "ZulaessigeMimetypes")
-    protected List zulaessigeMimetypes;
-    @XmlElement(name = "Meldungen")
-    protected List meldungen;
-
-    /**
-     * Ruft den Wert der dokAnforderungsId-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getDokAnforderungsId() {
-        return dokAnforderungsId;
-    }
-
-    /**
-     * Legt den Wert der dokAnforderungsId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setDokAnforderungsId(ObjektIdType value) {
-        this.dokAnforderungsId = value;
-    }
-
-    /**
-     * Gets the value of the autorisierungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the autorisierungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getAutorisierungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link AutorisierungsAnforderungType }
-     * 
-     * 
-     */
-    public List getAutorisierungen() {
-        if (autorisierungen == null) {
-            autorisierungen = new ArrayList();
-        }
-        return this.autorisierungen;
-    }
-
-    /**
-     * Ruft den Wert der docUploadRequired-Eigenschaft ab.
-     * 
-     */
-    public boolean isDocUploadRequired() {
-        return docUploadRequired;
-    }
-
-    /**
-     * Legt den Wert der docUploadRequired-Eigenschaft fest.
-     * 
-     */
-    public void setDocUploadRequired(boolean value) {
-        this.docUploadRequired = value;
-    }
-
-    /**
-     * Gets the value of the zulaessigeMimetypes property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zulaessigeMimetypes property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZulaessigeMimetypes().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List getZulaessigeMimetypes() {
-        if (zulaessigeMimetypes == null) {
-            zulaessigeMimetypes = new ArrayList();
-        }
-        return this.zulaessigeMimetypes;
-    }
-
-    /**
-     * Gets the value of the meldungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the meldungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getMeldungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ServiceFault }
-     * 
-     * 
-     */
-    public List getMeldungen() {
-        if (meldungen == null) {
-            meldungen = new ArrayList();
-        }
-        return this.meldungen;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokToSignType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokToSignType.java
deleted file mode 100644
index ea7a736a..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokToSignType.java
+++ /dev/null
@@ -1,182 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Bereitstellung Dokument zum Unterschreiben
- * 
- * 
Java-Klasse für ProzessDokToSign_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProzessDokToSign_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ProzessDokumentBasis_Type">
- *       <sequence>
- *         <element name="DokAnforderungsId" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type"/>
- *         <element name="Autorisierungen" type="{urn:omds3CommonServiceTypes-1-1-0}AutorisierungsAnforderung_Type" maxOccurs="unbounded"/>
- *         <element name="DocUploadRequired" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="ZulaessigeMimetypes" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="DokData" type="{urn:omds3CommonServiceTypes-1-1-0}DokumentData_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProzessDokToSign_Type", propOrder = {
-    "dokAnforderungsId",
-    "autorisierungen",
-    "docUploadRequired",
-    "zulaessigeMimetypes",
-    "dokData"
-})
-public class ProzessDokToSignType
-    extends ProzessDokumentBasisType
-{
-
-    @XmlElement(name = "DokAnforderungsId", required = true)
-    protected ObjektIdType dokAnforderungsId;
-    @XmlElement(name = "Autorisierungen", required = true)
-    protected List autorisierungen;
-    @XmlElement(name = "DocUploadRequired")
-    protected boolean docUploadRequired;
-    @XmlElement(name = "ZulaessigeMimetypes")
-    protected List zulaessigeMimetypes;
-    @XmlElement(name = "DokData", required = true)
-    protected DokumentDataType dokData;
-
-    /**
-     * Ruft den Wert der dokAnforderungsId-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getDokAnforderungsId() {
-        return dokAnforderungsId;
-    }
-
-    /**
-     * Legt den Wert der dokAnforderungsId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setDokAnforderungsId(ObjektIdType value) {
-        this.dokAnforderungsId = value;
-    }
-
-    /**
-     * Gets the value of the autorisierungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the autorisierungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getAutorisierungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link AutorisierungsAnforderungType }
-     * 
-     * 
-     */
-    public List getAutorisierungen() {
-        if (autorisierungen == null) {
-            autorisierungen = new ArrayList();
-        }
-        return this.autorisierungen;
-    }
-
-    /**
-     * Ruft den Wert der docUploadRequired-Eigenschaft ab.
-     * 
-     */
-    public boolean isDocUploadRequired() {
-        return docUploadRequired;
-    }
-
-    /**
-     * Legt den Wert der docUploadRequired-Eigenschaft fest.
-     * 
-     */
-    public void setDocUploadRequired(boolean value) {
-        this.docUploadRequired = value;
-    }
-
-    /**
-     * Gets the value of the zulaessigeMimetypes property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zulaessigeMimetypes property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZulaessigeMimetypes().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List getZulaessigeMimetypes() {
-        if (zulaessigeMimetypes == null) {
-            zulaessigeMimetypes = new ArrayList();
-        }
-        return this.zulaessigeMimetypes;
-    }
-
-    /**
-     * Ruft den Wert der dokData-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DokumentDataType }
-     *     
-     */
-    public DokumentDataType getDokData() {
-        return dokData;
-    }
-
-    /**
-     * Legt den Wert der dokData-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DokumentDataType }
-     *     
-     */
-    public void setDokData(DokumentDataType value) {
-        this.dokData = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokumentBasisType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokumentBasisType.java
deleted file mode 100644
index bda6dfc8..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokumentBasisType.java
+++ /dev/null
@@ -1,104 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Basistyp für Bereitstellung und Anforderung von Dokumenten
- * 
- * 
Java-Klasse für ProzessDokumentBasis_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProzessDokumentBasis_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Dokumenttyp" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Beschreibung">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <maxLength value="200"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProzessDokumentBasis_Type", propOrder = {
-    "dokumenttyp",
-    "beschreibung"
-})
-@XmlSeeAlso({
-    ProzessDokRequirementType.class,
-    ProzessDokToSignType.class,
-    ProzessDokHandoutType.class
-})
-public abstract class ProzessDokumentBasisType {
-
-    @XmlElement(name = "Dokumenttyp", required = true)
-    protected String dokumenttyp;
-    @XmlElement(name = "Beschreibung", required = true)
-    protected String beschreibung;
-
-    /**
-     * Ruft den Wert der dokumenttyp-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDokumenttyp() {
-        return dokumenttyp;
-    }
-
-    /**
-     * Legt den Wert der dokumenttyp-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDokumenttyp(String value) {
-        this.dokumenttyp = value;
-    }
-
-    /**
-     * Ruft den Wert der beschreibung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBeschreibung() {
-        return beschreibung;
-    }
-
-    /**
-     * Legt den Wert der beschreibung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBeschreibung(String value) {
-        this.beschreibung = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokumentType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokumentType.java
deleted file mode 100644
index c7d498b7..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokumentType.java
+++ /dev/null
@@ -1,234 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Typ für den Upload / die Bereitstellung eines Dokuments als Teil eines Geschäftsfalls durch den Serviceaufrufer.
- * 
- * 
Java-Klasse für ProzessDokument_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProzessDokument_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="DokAnforderungsId" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type" minOccurs="0"/>
- *         <element name="Dokumenttyp" type="{urn:omds3CommonServiceTypes-1-1-0}DocumentType"/>
- *         <element name="Beschreibung" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <maxLength value="200"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="Autorisierungen" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <extension base="{urn:omds3CommonServiceTypes-1-1-0}Autorisierung_Type">
- *               </extension>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="DokumentHinterlegt" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="DokData" type="{urn:omds3CommonServiceTypes-1-1-0}DokumentData_Type" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProzessDokument_Type", propOrder = {
-    "dokAnforderungsId",
-    "dokumenttyp",
-    "beschreibung",
-    "autorisierungen",
-    "dokumentHinterlegt",
-    "dokData"
-})
-public class ProzessDokumentType {
-
-    @XmlElement(name = "DokAnforderungsId")
-    protected ObjektIdType dokAnforderungsId;
-    @XmlElement(name = "Dokumenttyp")
-    protected int dokumenttyp;
-    @XmlElement(name = "Beschreibung")
-    protected String beschreibung;
-    @XmlElement(name = "Autorisierungen")
-    protected List autorisierungen;
-    @XmlElement(name = "DokumentHinterlegt")
-    protected boolean dokumentHinterlegt;
-    @XmlElement(name = "DokData")
-    protected DokumentDataType dokData;
-
-    /**
-     * Ruft den Wert der dokAnforderungsId-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getDokAnforderungsId() {
-        return dokAnforderungsId;
-    }
-
-    /**
-     * Legt den Wert der dokAnforderungsId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setDokAnforderungsId(ObjektIdType value) {
-        this.dokAnforderungsId = value;
-    }
-
-    /**
-     * Ruft den Wert der dokumenttyp-Eigenschaft ab.
-     * 
-     */
-    public int getDokumenttyp() {
-        return dokumenttyp;
-    }
-
-    /**
-     * Legt den Wert der dokumenttyp-Eigenschaft fest.
-     * 
-     */
-    public void setDokumenttyp(int value) {
-        this.dokumenttyp = value;
-    }
-
-    /**
-     * Ruft den Wert der beschreibung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBeschreibung() {
-        return beschreibung;
-    }
-
-    /**
-     * Legt den Wert der beschreibung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBeschreibung(String value) {
-        this.beschreibung = value;
-    }
-
-    /**
-     * Gets the value of the autorisierungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the autorisierungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getAutorisierungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ProzessDokumentType.Autorisierungen }
-     * 
-     * 
-     */
-    public List getAutorisierungen() {
-        if (autorisierungen == null) {
-            autorisierungen = new ArrayList();
-        }
-        return this.autorisierungen;
-    }
-
-    /**
-     * Ruft den Wert der dokumentHinterlegt-Eigenschaft ab.
-     * 
-     */
-    public boolean isDokumentHinterlegt() {
-        return dokumentHinterlegt;
-    }
-
-    /**
-     * Legt den Wert der dokumentHinterlegt-Eigenschaft fest.
-     * 
-     */
-    public void setDokumentHinterlegt(boolean value) {
-        this.dokumentHinterlegt = value;
-    }
-
-    /**
-     * Ruft den Wert der dokData-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DokumentDataType }
-     *     
-     */
-    public DokumentDataType getDokData() {
-        return dokData;
-    }
-
-    /**
-     * Legt den Wert der dokData-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DokumentDataType }
-     *     
-     */
-    public void setDokData(DokumentDataType value) {
-        this.dokData = value;
-    }
-
-
-    /**
-     * 
Java-Klasse für anonymous complex type.
-     * 
-     * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Autorisierung_Type">
-     *     </extension>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Autorisierungen
-        extends AutorisierungType
-    {
-
-
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/RaucherType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/RaucherType.java
deleted file mode 100644
index 31e1676b..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/RaucherType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstraktes Element, welches Antworten auf die Frage "Raucher?" enthält, z.B. in Leben
- * 
- * 
Java-Klasse für Raucher_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Raucher_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Attribut_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Raucher_Type")
-public abstract class RaucherType
-    extends AttributType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/Referenz.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/Referenz.java
deleted file mode 100644
index b725f8c4..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/Referenz.java
+++ /dev/null
@@ -1,92 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Ein Link auf ein Element
- * 
- * 
Java-Klasse für Referenz complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Referenz">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Link" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
- *         <element name="Bezeichnung" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Referenz", propOrder = {
-    "link",
-    "bezeichnung"
-})
-public class Referenz {
-
-    @XmlElement(name = "Link", required = true)
-    protected Object link;
-    @XmlElement(name = "Bezeichnung")
-    protected Object bezeichnung;
-
-    /**
-     * Ruft den Wert der link-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Object }
-     *     
-     */
-    public Object getLink() {
-        return link;
-    }
-
-    /**
-     * Legt den Wert der link-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     
-     */
-    public void setLink(Object value) {
-        this.link = value;
-    }
-
-    /**
-     * Ruft den Wert der bezeichnung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Object }
-     *     
-     */
-    public Object getBezeichnung() {
-        return bezeichnung;
-    }
-
-    /**
-     * Legt den Wert der bezeichnung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     
-     */
-    public void setBezeichnung(Object value) {
-        this.bezeichnung = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ResponseStatusType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ResponseStatusType.java
deleted file mode 100644
index c379d275..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ResponseStatusType.java
+++ /dev/null
@@ -1,162 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Statusinformationen im Response eines Serviceaufrufs
- * 
- * 
Java-Klasse für ResponseStatus_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ResponseStatus_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="KorrelationsId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Ergebnis" type="{urn:omds3CommonServiceTypes-1-1-0}Status_Type"/>
- *         <element name="Meldungen" type="{urn:omds3CommonServiceTypes-1-1-0}ServiceFault" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Referenzen" type="{urn:omds3CommonServiceTypes-1-1-0}Referenz" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ResponseStatus_Type", propOrder = {
-    "korrelationsId",
-    "ergebnis",
-    "meldungen",
-    "referenzen"
-})
-public class ResponseStatusType {
-
-    @XmlElement(name = "KorrelationsId", required = true)
-    protected String korrelationsId;
-    @XmlElement(name = "Ergebnis", required = true)
-    @XmlSchemaType(name = "string")
-    protected StatusType ergebnis;
-    @XmlElement(name = "Meldungen")
-    protected List meldungen;
-    @XmlElement(name = "Referenzen")
-    protected List referenzen;
-
-    /**
-     * Ruft den Wert der korrelationsId-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getKorrelationsId() {
-        return korrelationsId;
-    }
-
-    /**
-     * Legt den Wert der korrelationsId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setKorrelationsId(String value) {
-        this.korrelationsId = value;
-    }
-
-    /**
-     * Ruft den Wert der ergebnis-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link StatusType }
-     *     
-     */
-    public StatusType getErgebnis() {
-        return ergebnis;
-    }
-
-    /**
-     * Legt den Wert der ergebnis-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link StatusType }
-     *     
-     */
-    public void setErgebnis(StatusType value) {
-        this.ergebnis = value;
-    }
-
-    /**
-     * Gets the value of the meldungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the meldungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getMeldungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ServiceFault }
-     * 
-     * 
-     */
-    public List getMeldungen() {
-        if (meldungen == null) {
-            meldungen = new ArrayList();
-        }
-        return this.meldungen;
-    }
-
-    /**
-     * Gets the value of the referenzen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the referenzen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getReferenzen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link Referenz }
-     * 
-     * 
-     */
-    public List getReferenzen() {
-        if (referenzen == null) {
-            referenzen = new ArrayList();
-        }
-        return this.referenzen;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/RisikoNatPersonType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/RisikoNatPersonType.java
deleted file mode 100644
index 4f494148..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/RisikoNatPersonType.java
+++ /dev/null
@@ -1,501 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Risikoattribute natürlicher Personen
- * 
- * 
Java-Klasse für RisikoNatPerson_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="RisikoNatPerson_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Gewicht" type="{urn:omds3CommonServiceTypes-1-1-0}AttributInt_Type" minOccurs="0"/>
- *         <element name="Groesse" type="{urn:omds3CommonServiceTypes-1-1-0}AttributInt_Type" minOccurs="0"/>
- *         <element name="Raucher" type="{urn:omds3CommonServiceTypes-1-1-0}Raucher_Type" minOccurs="0"/>
- *         <element name="Sozialversicherungsanstalt" type="{urn:omds3CommonServiceTypes-1-1-0}AttributEnum_Type" minOccurs="0"/>
- *         <element name="Gefahrenklasse" type="{urn:omds3CommonServiceTypes-1-1-0}AttributEnum_Type" minOccurs="0"/>
- *         <element name="Beruf" type="{urn:omds3CommonServiceTypes-1-1-0}AttributString_Type" minOccurs="0"/>
- *         <element name="MedizinischerBeruf" type="{urn:omds3CommonServiceTypes-1-1-0}AttributEnum_Type" minOccurs="0"/>
- *         <element name="FreizeitSportRisiken" type="{urn:omds3CommonServiceTypes-1-1-0}AttributEnum_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Risikozuschlaege" type="{urn:omds3CommonServiceTypes-1-1-0}AttributEnum_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="GesetzlicheUV" type="{urn:omds3CommonServiceTypes-1-1-0}AttributEnum_Type" minOccurs="0"/>
- *         <element name="PersonenartKranken" type="{urn:omds3CommonServiceTypes-1-1-0}AttributEnum_Type" minOccurs="0"/>
- *         <element name="Berufsgruppe" type="{urn:omds3CommonServiceTypes-1-1-0}AttributEnum_Type" minOccurs="0"/>
- *         <element name="ManuelleTaetigkeit" type="{urn:omds3CommonServiceTypes-1-1-0}AttributEnum_Type" minOccurs="0"/>
- *         <element name="BehandelnderArzt" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="KontaktRueckfragen" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="ZusaetzlicheRisikodaten" type="{urn:omds3CommonServiceTypes-1-1-0}ZusaetzlicheRisikodaten_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RisikoNatPerson_Type", propOrder = {
-    "gewicht",
-    "groesse",
-    "raucher",
-    "sozialversicherungsanstalt",
-    "gefahrenklasse",
-    "beruf",
-    "medizinischerBeruf",
-    "freizeitSportRisiken",
-    "risikozuschlaege",
-    "gesetzlicheUV",
-    "personenartKranken",
-    "berufsgruppe",
-    "manuelleTaetigkeit",
-    "behandelnderArzt",
-    "kontaktRueckfragen",
-    "zusaetzlicheRisikodaten"
-})
-public class RisikoNatPersonType {
-
-    @XmlElement(name = "Gewicht")
-    protected AttributIntType gewicht;
-    @XmlElement(name = "Groesse")
-    protected AttributIntType groesse;
-    @XmlElement(name = "Raucher")
-    protected RaucherType raucher;
-    @XmlElement(name = "Sozialversicherungsanstalt")
-    protected AttributEnumType sozialversicherungsanstalt;
-    @XmlElement(name = "Gefahrenklasse")
-    protected AttributEnumType gefahrenklasse;
-    @XmlElement(name = "Beruf")
-    protected AttributStringType beruf;
-    @XmlElement(name = "MedizinischerBeruf")
-    protected AttributEnumType medizinischerBeruf;
-    @XmlElement(name = "FreizeitSportRisiken")
-    protected List freizeitSportRisiken;
-    @XmlElement(name = "Risikozuschlaege")
-    protected List risikozuschlaege;
-    @XmlElement(name = "GesetzlicheUV")
-    protected AttributEnumType gesetzlicheUV;
-    @XmlElement(name = "PersonenartKranken")
-    protected AttributEnumType personenartKranken;
-    @XmlElement(name = "Berufsgruppe")
-    protected AttributEnumType berufsgruppe;
-    @XmlElement(name = "ManuelleTaetigkeit")
-    protected AttributEnumType manuelleTaetigkeit;
-    @XmlElement(name = "BehandelnderArzt")
-    protected String behandelnderArzt;
-    @XmlElement(name = "KontaktRueckfragen")
-    protected String kontaktRueckfragen;
-    @XmlElement(name = "ZusaetzlicheRisikodaten")
-    protected List zusaetzlicheRisikodaten;
-
-    /**
-     * Ruft den Wert der gewicht-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributIntType }
-     *     
-     */
-    public AttributIntType getGewicht() {
-        return gewicht;
-    }
-
-    /**
-     * Legt den Wert der gewicht-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributIntType }
-     *     
-     */
-    public void setGewicht(AttributIntType value) {
-        this.gewicht = value;
-    }
-
-    /**
-     * Ruft den Wert der groesse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributIntType }
-     *     
-     */
-    public AttributIntType getGroesse() {
-        return groesse;
-    }
-
-    /**
-     * Legt den Wert der groesse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributIntType }
-     *     
-     */
-    public void setGroesse(AttributIntType value) {
-        this.groesse = value;
-    }
-
-    /**
-     * Ruft den Wert der raucher-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RaucherType }
-     *     
-     */
-    public RaucherType getRaucher() {
-        return raucher;
-    }
-
-    /**
-     * Legt den Wert der raucher-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RaucherType }
-     *     
-     */
-    public void setRaucher(RaucherType value) {
-        this.raucher = value;
-    }
-
-    /**
-     * Ruft den Wert der sozialversicherungsanstalt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributEnumType }
-     *     
-     */
-    public AttributEnumType getSozialversicherungsanstalt() {
-        return sozialversicherungsanstalt;
-    }
-
-    /**
-     * Legt den Wert der sozialversicherungsanstalt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributEnumType }
-     *     
-     */
-    public void setSozialversicherungsanstalt(AttributEnumType value) {
-        this.sozialversicherungsanstalt = value;
-    }
-
-    /**
-     * Ruft den Wert der gefahrenklasse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributEnumType }
-     *     
-     */
-    public AttributEnumType getGefahrenklasse() {
-        return gefahrenklasse;
-    }
-
-    /**
-     * Legt den Wert der gefahrenklasse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributEnumType }
-     *     
-     */
-    public void setGefahrenklasse(AttributEnumType value) {
-        this.gefahrenklasse = value;
-    }
-
-    /**
-     * Ruft den Wert der beruf-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributStringType }
-     *     
-     */
-    public AttributStringType getBeruf() {
-        return beruf;
-    }
-
-    /**
-     * Legt den Wert der beruf-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributStringType }
-     *     
-     */
-    public void setBeruf(AttributStringType value) {
-        this.beruf = value;
-    }
-
-    /**
-     * Ruft den Wert der medizinischerBeruf-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributEnumType }
-     *     
-     */
-    public AttributEnumType getMedizinischerBeruf() {
-        return medizinischerBeruf;
-    }
-
-    /**
-     * Legt den Wert der medizinischerBeruf-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributEnumType }
-     *     
-     */
-    public void setMedizinischerBeruf(AttributEnumType value) {
-        this.medizinischerBeruf = value;
-    }
-
-    /**
-     * Gets the value of the freizeitSportRisiken property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the freizeitSportRisiken property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getFreizeitSportRisiken().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link AttributEnumType }
-     * 
-     * 
-     */
-    public List getFreizeitSportRisiken() {
-        if (freizeitSportRisiken == null) {
-            freizeitSportRisiken = new ArrayList();
-        }
-        return this.freizeitSportRisiken;
-    }
-
-    /**
-     * Gets the value of the risikozuschlaege property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the risikozuschlaege property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getRisikozuschlaege().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link AttributEnumType }
-     * 
-     * 
-     */
-    public List getRisikozuschlaege() {
-        if (risikozuschlaege == null) {
-            risikozuschlaege = new ArrayList();
-        }
-        return this.risikozuschlaege;
-    }
-
-    /**
-     * Ruft den Wert der gesetzlicheUV-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributEnumType }
-     *     
-     */
-    public AttributEnumType getGesetzlicheUV() {
-        return gesetzlicheUV;
-    }
-
-    /**
-     * Legt den Wert der gesetzlicheUV-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributEnumType }
-     *     
-     */
-    public void setGesetzlicheUV(AttributEnumType value) {
-        this.gesetzlicheUV = value;
-    }
-
-    /**
-     * Ruft den Wert der personenartKranken-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributEnumType }
-     *     
-     */
-    public AttributEnumType getPersonenartKranken() {
-        return personenartKranken;
-    }
-
-    /**
-     * Legt den Wert der personenartKranken-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributEnumType }
-     *     
-     */
-    public void setPersonenartKranken(AttributEnumType value) {
-        this.personenartKranken = value;
-    }
-
-    /**
-     * Ruft den Wert der berufsgruppe-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributEnumType }
-     *     
-     */
-    public AttributEnumType getBerufsgruppe() {
-        return berufsgruppe;
-    }
-
-    /**
-     * Legt den Wert der berufsgruppe-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributEnumType }
-     *     
-     */
-    public void setBerufsgruppe(AttributEnumType value) {
-        this.berufsgruppe = value;
-    }
-
-    /**
-     * Ruft den Wert der manuelleTaetigkeit-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributEnumType }
-     *     
-     */
-    public AttributEnumType getManuelleTaetigkeit() {
-        return manuelleTaetigkeit;
-    }
-
-    /**
-     * Legt den Wert der manuelleTaetigkeit-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributEnumType }
-     *     
-     */
-    public void setManuelleTaetigkeit(AttributEnumType value) {
-        this.manuelleTaetigkeit = value;
-    }
-
-    /**
-     * Ruft den Wert der behandelnderArzt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBehandelnderArzt() {
-        return behandelnderArzt;
-    }
-
-    /**
-     * Legt den Wert der behandelnderArzt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBehandelnderArzt(String value) {
-        this.behandelnderArzt = value;
-    }
-
-    /**
-     * Ruft den Wert der kontaktRueckfragen-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getKontaktRueckfragen() {
-        return kontaktRueckfragen;
-    }
-
-    /**
-     * Legt den Wert der kontaktRueckfragen-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setKontaktRueckfragen(String value) {
-        this.kontaktRueckfragen = value;
-    }
-
-    /**
-     * Gets the value of the zusaetzlicheRisikodaten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zusaetzlicheRisikodaten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZusaetzlicheRisikodaten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ZusaetzlicheRisikodatenType }
-     * 
-     * 
-     */
-    public List getZusaetzlicheRisikodaten() {
-        if (zusaetzlicheRisikodaten == null) {
-            zusaetzlicheRisikodaten = new ArrayList();
-        }
-        return this.zusaetzlicheRisikodaten;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/SchadenObjektSpezifikationType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/SchadenObjektSpezifikationType.java
deleted file mode 100644
index 7f1dfd92..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/SchadenObjektSpezifikationType.java
+++ /dev/null
@@ -1,94 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Die Spezifikation eines Schadenobjektes
- * 
- * 
Java-Klasse für SchadenObjektSpezifikation_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SchadenObjektSpezifikation_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ObjektSpezifikation_Type">
- *       <choice>
- *         <element name="Geschaeftsfallnummer" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type"/>
- *         <element name="Schadennr" type="{urn:omds20}Schadennr"/>
- *       </choice>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SchadenObjektSpezifikation_Type", propOrder = {
-    "geschaeftsfallnummer",
-    "schadennr"
-})
-public class SchadenObjektSpezifikationType
-    extends ObjektSpezifikationType
-{
-
-    @XmlElement(name = "Geschaeftsfallnummer")
-    protected ObjektIdType geschaeftsfallnummer;
-    @XmlElement(name = "Schadennr")
-    protected String schadennr;
-
-    /**
-     * Ruft den Wert der geschaeftsfallnummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getGeschaeftsfallnummer() {
-        return geschaeftsfallnummer;
-    }
-
-    /**
-     * Legt den Wert der geschaeftsfallnummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setGeschaeftsfallnummer(ObjektIdType value) {
-        this.geschaeftsfallnummer = value;
-    }
-
-    /**
-     * Ruft den Wert der schadennr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSchadennr() {
-        return schadennr;
-    }
-
-    /**
-     * Legt den Wert der schadennr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSchadennr(String value) {
-        this.schadennr = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/SelbstbehaltType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/SelbstbehaltType.java
deleted file mode 100644
index 6033fe08..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/SelbstbehaltType.java
+++ /dev/null
@@ -1,151 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import java.math.BigDecimal;
-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;
-
-
-/**
- * Dient zur Abbildung eines Selbstbehalts
- * 
- * 
Java-Klasse für Selbstbehalt_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Selbstbehalt_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Selbstbehalt" type="{urn:omds20}decimal" minOccurs="0"/>
- *         <element name="SelbstbehaltProzentVs" type="{http://www.w3.org/2001/XMLSchema}unsignedByte" minOccurs="0"/>
- *         <element name="SelbstbehaltMinBetrag" type="{urn:omds20}decimal" minOccurs="0"/>
- *         <element name="SelbstbehaltMaxBetrag" type="{urn:omds20}decimal" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Selbstbehalt_Type", propOrder = {
-    "selbstbehalt",
-    "selbstbehaltProzentVs",
-    "selbstbehaltMinBetrag",
-    "selbstbehaltMaxBetrag"
-})
-public class SelbstbehaltType {
-
-    @XmlElement(name = "Selbstbehalt")
-    protected BigDecimal selbstbehalt;
-    @XmlElement(name = "SelbstbehaltProzentVs")
-    @XmlSchemaType(name = "unsignedByte")
-    protected Short selbstbehaltProzentVs;
-    @XmlElement(name = "SelbstbehaltMinBetrag")
-    protected BigDecimal selbstbehaltMinBetrag;
-    @XmlElement(name = "SelbstbehaltMaxBetrag")
-    protected BigDecimal selbstbehaltMaxBetrag;
-
-    /**
-     * Ruft den Wert der selbstbehalt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getSelbstbehalt() {
-        return selbstbehalt;
-    }
-
-    /**
-     * Legt den Wert der selbstbehalt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setSelbstbehalt(BigDecimal value) {
-        this.selbstbehalt = value;
-    }
-
-    /**
-     * Ruft den Wert der selbstbehaltProzentVs-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Short }
-     *     
-     */
-    public Short getSelbstbehaltProzentVs() {
-        return selbstbehaltProzentVs;
-    }
-
-    /**
-     * Legt den Wert der selbstbehaltProzentVs-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Short }
-     *     
-     */
-    public void setSelbstbehaltProzentVs(Short value) {
-        this.selbstbehaltProzentVs = value;
-    }
-
-    /**
-     * Ruft den Wert der selbstbehaltMinBetrag-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getSelbstbehaltMinBetrag() {
-        return selbstbehaltMinBetrag;
-    }
-
-    /**
-     * Legt den Wert der selbstbehaltMinBetrag-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setSelbstbehaltMinBetrag(BigDecimal value) {
-        this.selbstbehaltMinBetrag = value;
-    }
-
-    /**
-     * Ruft den Wert der selbstbehaltMaxBetrag-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getSelbstbehaltMaxBetrag() {
-        return selbstbehaltMaxBetrag;
-    }
-
-    /**
-     * Legt den Wert der selbstbehaltMaxBetrag-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setSelbstbehaltMaxBetrag(BigDecimal value) {
-        this.selbstbehaltMaxBetrag = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ServiceFault.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ServiceFault.java
deleted file mode 100644
index 5ace0f57..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ServiceFault.java
+++ /dev/null
@@ -1,156 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Enthält eventuelle Fehlermeldungen + Fehlercode + Fehlertyp.
- * 
- * 
Java-Klasse für ServiceFault complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ServiceFault">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="errorType">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}integer">
- *               <pattern value="1"/>
- *               <pattern value="2"/>
- *               <pattern value="3"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="errorCode" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *         <element name="errorMsg" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="elementReference" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ServiceFault", propOrder = {
-    "errorType",
-    "errorCode",
-    "errorMsg",
-    "elementReference"
-})
-public class ServiceFault {
-
-    @XmlElement(required = true)
-    protected BigInteger errorType;
-    @XmlElement(required = true)
-    protected BigInteger errorCode;
-    @XmlElement(required = true)
-    protected String errorMsg;
-    protected String elementReference;
-
-    /**
-     * Ruft den Wert der errorType-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getErrorType() {
-        return errorType;
-    }
-
-    /**
-     * Legt den Wert der errorType-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setErrorType(BigInteger value) {
-        this.errorType = value;
-    }
-
-    /**
-     * Ruft den Wert der errorCode-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getErrorCode() {
-        return errorCode;
-    }
-
-    /**
-     * Legt den Wert der errorCode-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setErrorCode(BigInteger value) {
-        this.errorCode = value;
-    }
-
-    /**
-     * Ruft den Wert der errorMsg-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getErrorMsg() {
-        return errorMsg;
-    }
-
-    /**
-     * Legt den Wert der errorMsg-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setErrorMsg(String value) {
-        this.errorMsg = value;
-    }
-
-    /**
-     * Ruft den Wert der elementReference-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getElementReference() {
-        return elementReference;
-    }
-
-    /**
-     * Legt den Wert der elementReference-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setElementReference(String value) {
-        this.elementReference = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/SicherstellungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/SicherstellungType.java
deleted file mode 100644
index 4a12fbca..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/SicherstellungType.java
+++ /dev/null
@@ -1,121 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import java.math.BigDecimal;
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Typ fuer Sicherstellungen
- * 
- * 
Java-Klasse für Sicherstellung_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Sicherstellung_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Lfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort"/>
- *         <element name="Betrag" type="{urn:omds20}decimal" minOccurs="0"/>
- *         <element name="Unanfechtbarkeitssumme" type="{urn:omds20}decimal" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Sicherstellung_Type", propOrder = {
-    "lfnr",
-    "betrag",
-    "unanfechtbarkeitssumme"
-})
-@XmlSeeAlso({
-    AbtretungType.class,
-    VerpfaendungType.class,
-    VinkulierungPersonenType.class
-})
-public abstract class SicherstellungType {
-
-    @XmlElement(name = "Lfnr")
-    @XmlSchemaType(name = "unsignedShort")
-    protected int lfnr;
-    @XmlElement(name = "Betrag")
-    protected BigDecimal betrag;
-    @XmlElement(name = "Unanfechtbarkeitssumme")
-    protected BigDecimal unanfechtbarkeitssumme;
-
-    /**
-     * Ruft den Wert der lfnr-Eigenschaft ab.
-     * 
-     */
-    public int getLfnr() {
-        return lfnr;
-    }
-
-    /**
-     * Legt den Wert der lfnr-Eigenschaft fest.
-     * 
-     */
-    public void setLfnr(int value) {
-        this.lfnr = value;
-    }
-
-    /**
-     * Ruft den Wert der betrag-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getBetrag() {
-        return betrag;
-    }
-
-    /**
-     * Legt den Wert der betrag-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setBetrag(BigDecimal value) {
-        this.betrag = value;
-    }
-
-    /**
-     * Ruft den Wert der unanfechtbarkeitssumme-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getUnanfechtbarkeitssumme() {
-        return unanfechtbarkeitssumme;
-    }
-
-    /**
-     * Legt den Wert der unanfechtbarkeitssumme-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setUnanfechtbarkeitssumme(BigDecimal value) {
-        this.unanfechtbarkeitssumme = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/StatusType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/StatusType.java
deleted file mode 100644
index 0c043c9d..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/StatusType.java
+++ /dev/null
@@ -1,55 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
Java-Klasse für Status_Type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

- * 
- * <simpleType name="Status_Type">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="OK"/>
- *     <enumeration value="OKNA"/>
- *     <enumeration value="NOK"/>
- *   </restriction>
- * </simpleType>
- * 

- * 
- */
-@XmlType(name = "Status_Type")
-@XmlEnum
-public enum StatusType {
-
-
-    /**
-     * Request konnte verarbeitet werden
-     * 
-     */
-    OK,
-
-    /**
-     * Request konnte nicht abschließend verarbeitet werden. Zum Beispiel wurde der Request in einen Workflow eingestellt aber noch nicht auf den Bestand angewendet.
-     * 
-     */
-    OKNA,
-
-    /**
-     * Ein Fehler ist aufgetreten, Request konnte nicht verarbeitet werden
-     * 
-     */
-    NOK;
-
-    public String value() {
-        return name();
-    }
-
-    public static StatusType fromValue(String v) {
-        return valueOf(v);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/TechnicalKeyValueType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/TechnicalKeyValueType.java
deleted file mode 100644
index 3a6e9739..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/TechnicalKeyValueType.java
+++ /dev/null
@@ -1,92 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Typ für nicht weiter spezifizierte technische Parameter
- * 
- * 
Java-Klasse für TechnicalKeyValue_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="TechnicalKeyValue_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Key" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Value" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TechnicalKeyValue_Type", propOrder = {
-    "key",
-    "value"
-})
-public class TechnicalKeyValueType {
-
-    @XmlElement(name = "Key", required = true)
-    protected String key;
-    @XmlElement(name = "Value", required = true)
-    protected String value;
-
-    /**
-     * Ruft den Wert der key-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getKey() {
-        return key;
-    }
-
-    /**
-     * Legt den Wert der key-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setKey(String value) {
-        this.key = value;
-    }
-
-    /**
-     * Ruft den Wert der value-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Legt den Wert der value-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/TechnischesObjektType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/TechnischesObjektType.java
deleted file mode 100644
index 5466766a..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/TechnischesObjektType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * VU-spezifische Erweiterungsmöglichkeit für technische Daten
- * 
- * 
Java-Klasse für TechnischesObjekt_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="TechnischesObjekt_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TechnischesObjekt_Type")
-public abstract class TechnischesObjektType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/TreuhaenderfrageType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/TreuhaenderfrageType.java
deleted file mode 100644
index c88c8bc6..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/TreuhaenderfrageType.java
+++ /dev/null
@@ -1,84 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Details zur Treuhaenderfrage
- * 
- * 
Java-Klasse für Treuhaenderfrage_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Treuhaenderfrage_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Treuhaender" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="Beschreibung" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Treuhaenderfrage_Type", propOrder = {
-    "treuhaender",
-    "beschreibung"
-})
-public class TreuhaenderfrageType {
-
-    @XmlElement(name = "Treuhaender")
-    protected boolean treuhaender;
-    @XmlElement(name = "Beschreibung")
-    protected String beschreibung;
-
-    /**
-     * Ruft den Wert der treuhaender-Eigenschaft ab.
-     * 
-     */
-    public boolean isTreuhaender() {
-        return treuhaender;
-    }
-
-    /**
-     * Legt den Wert der treuhaender-Eigenschaft fest.
-     * 
-     */
-    public void setTreuhaender(boolean value) {
-        this.treuhaender = value;
-    }
-
-    /**
-     * Ruft den Wert der beschreibung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBeschreibung() {
-        return beschreibung;
-    }
-
-    /**
-     * Legt den Wert der beschreibung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBeschreibung(String value) {
-        this.beschreibung = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/UploadDokumentType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/UploadDokumentType.java
deleted file mode 100644
index 92fc2290..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/UploadDokumentType.java
+++ /dev/null
@@ -1,143 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.activation.DataHandler;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlMimeType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Typ fuer den Upload von Dokumenten mit base64 encodiertem Dokument, Mimetype und Filename
- * 
- * 
Java-Klasse für Upload_Dokument_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Upload_Dokument_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Name" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Mimetype" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         <element name="DocumentType" type="{urn:omds3CommonServiceTypes-1-1-0}DocumentType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Upload_Dokument_Type", propOrder = {
-    "name",
-    "mimetype",
-    "content",
-    "documentType"
-})
-public class UploadDokumentType {
-
-    @XmlElement(name = "Name", required = true)
-    protected String name;
-    @XmlElement(name = "Mimetype", required = true)
-    protected String mimetype;
-    @XmlElement(name = "Content", required = true)
-    @XmlMimeType("application/octet-stream")
-    protected DataHandler content;
-    @XmlElement(name = "DocumentType")
-    protected int documentType;
-
-    /**
-     * Ruft den Wert der name-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Legt den Wert der name-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Ruft den Wert der mimetype-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMimetype() {
-        return mimetype;
-    }
-
-    /**
-     * Legt den Wert der mimetype-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMimetype(String value) {
-        this.mimetype = value;
-    }
-
-    /**
-     * Ruft den Wert der content-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataHandler }
-     *     
-     */
-    public DataHandler getContent() {
-        return content;
-    }
-
-    /**
-     * Legt den Wert der content-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataHandler }
-     *     
-     */
-    public void setContent(DataHandler value) {
-        this.content = value;
-    }
-
-    /**
-     * Ruft den Wert der documentType-Eigenschaft ab.
-     * 
-     */
-    public int getDocumentType() {
-        return documentType;
-    }
-
-    /**
-     * Legt den Wert der documentType-Eigenschaft fest.
-     * 
-     */
-    public void setDocumentType(int value) {
-        this.documentType = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VerkaufsproduktGenerischType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VerkaufsproduktGenerischType.java
deleted file mode 100644
index 858aacb5..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VerkaufsproduktGenerischType.java
+++ /dev/null
@@ -1,162 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.VerkaufsproduktSachPrivatType;
-import kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.VerkaufsproduktKrankenType;
-import leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.VerkaufsproduktLebenType;
-import rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.VerkaufsproduktRechtsschutzType;
-import unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.VerkaufsproduktUnfallType;
-
-
-/**
- * Basistyp für ein Produktbündel, 2. Generation
- * 
- * 
Java-Klasse für VerkaufsproduktGenerisch_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VerkaufsproduktGenerisch_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Verkaufsprodukt_Type">
- *       <sequence>
- *         <element name="Eingeschlossen" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="EinschlussAenderbar" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="AttributMetadaten" type="{urn:omds3CommonServiceTypes-1-1-0}AttributMetadaten_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="BeschreibungTxt" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VerkaufsproduktGenerisch_Type", propOrder = {
-    "eingeschlossen",
-    "einschlussAenderbar",
-    "attributMetadaten",
-    "beschreibungTxt"
-})
-@XmlSeeAlso({
-    VerkaufsproduktSachPrivatType.class,
-    VerkaufsproduktLebenType.class,
-    VerkaufsproduktKrankenType.class,
-    VerkaufsproduktUnfallType.class,
-    VerkaufsproduktRechtsschutzType.class
-})
-public abstract class VerkaufsproduktGenerischType
-    extends VerkaufsproduktType
-{
-
-    @XmlElement(name = "Eingeschlossen")
-    protected boolean eingeschlossen;
-    @XmlElement(name = "EinschlussAenderbar")
-    protected Boolean einschlussAenderbar;
-    @XmlElement(name = "AttributMetadaten")
-    protected List attributMetadaten;
-    @XmlElement(name = "BeschreibungTxt")
-    protected String beschreibungTxt;
-
-    /**
-     * Ruft den Wert der eingeschlossen-Eigenschaft ab.
-     * 
-     */
-    public boolean isEingeschlossen() {
-        return eingeschlossen;
-    }
-
-    /**
-     * Legt den Wert der eingeschlossen-Eigenschaft fest.
-     * 
-     */
-    public void setEingeschlossen(boolean value) {
-        this.eingeschlossen = value;
-    }
-
-    /**
-     * Ruft den Wert der einschlussAenderbar-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isEinschlussAenderbar() {
-        return einschlussAenderbar;
-    }
-
-    /**
-     * Legt den Wert der einschlussAenderbar-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setEinschlussAenderbar(Boolean value) {
-        this.einschlussAenderbar = value;
-    }
-
-    /**
-     * Gets the value of the attributMetadaten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the attributMetadaten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getAttributMetadaten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link AttributMetadatenType }
-     * 
-     * 
-     */
-    public List getAttributMetadaten() {
-        if (attributMetadaten == null) {
-            attributMetadaten = new ArrayList();
-        }
-        return this.attributMetadaten;
-    }
-
-    /**
-     * Ruft den Wert der beschreibungTxt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBeschreibungTxt() {
-        return beschreibungTxt;
-    }
-
-    /**
-     * Legt den Wert der beschreibungTxt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBeschreibungTxt(String value) {
-        this.beschreibungTxt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VerkaufsproduktType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VerkaufsproduktType.java
deleted file mode 100644
index 8665d526..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VerkaufsproduktType.java
+++ /dev/null
@@ -1,224 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-import at.vvo.omds.types.omds2Types.v2_14.ELRahmenvereinbarungType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.VerkaufsproduktKfzType;
-
-
-/**
- * Basistyp für ein Produktbündel
- * 
- * 
Java-Klasse für Verkaufsprodukt_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Verkaufsprodukt_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Produktbaustein_Type">
- *       <sequence>
- *         <element name="VtgBeg" type="{urn:omds20}Datum"/>
- *         <element name="Verkaufsproduktgeneration" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Berechnungsvariante" type="{urn:omds3CommonServiceTypes-1-1-0}Berechnungsvariante_Type" minOccurs="0"/>
- *         <element name="Vermittlernr" type="{urn:omds20}Vermnr" minOccurs="0"/>
- *         <element ref="{urn:omds20}EL-Rahmenvereinbarung" minOccurs="0"/>
- *         <element name="ZusaetzlicheVerkaufproduktdaten" type="{urn:omds3CommonServiceTypes-1-1-0}ZusaetzlicheVerkaufproduktdaten_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Verkaufsprodukt_Type", propOrder = {
-    "vtgBeg",
-    "verkaufsproduktgeneration",
-    "berechnungsvariante",
-    "vermittlernr",
-    "elRahmenvereinbarung",
-    "zusaetzlicheVerkaufproduktdaten"
-})
-@XmlSeeAlso({
-    VerkaufsproduktKfzType.class,
-    VerkaufsproduktGenerischType.class
-})
-public abstract class VerkaufsproduktType
-    extends ProduktbausteinType
-{
-
-    @XmlElement(name = "VtgBeg", required = true)
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar vtgBeg;
-    @XmlElement(name = "Verkaufsproduktgeneration")
-    protected String verkaufsproduktgeneration;
-    @XmlElement(name = "Berechnungsvariante")
-    @XmlSchemaType(name = "string")
-    protected BerechnungsvarianteType berechnungsvariante;
-    @XmlElement(name = "Vermittlernr")
-    protected String vermittlernr;
-    @XmlElement(name = "EL-Rahmenvereinbarung", namespace = "urn:omds20")
-    protected ELRahmenvereinbarungType elRahmenvereinbarung;
-    @XmlElement(name = "ZusaetzlicheVerkaufproduktdaten")
-    protected List zusaetzlicheVerkaufproduktdaten;
-
-    /**
-     * Ruft den Wert der vtgBeg-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getVtgBeg() {
-        return vtgBeg;
-    }
-
-    /**
-     * Legt den Wert der vtgBeg-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setVtgBeg(XMLGregorianCalendar value) {
-        this.vtgBeg = value;
-    }
-
-    /**
-     * Ruft den Wert der verkaufsproduktgeneration-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVerkaufsproduktgeneration() {
-        return verkaufsproduktgeneration;
-    }
-
-    /**
-     * Legt den Wert der verkaufsproduktgeneration-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVerkaufsproduktgeneration(String value) {
-        this.verkaufsproduktgeneration = value;
-    }
-
-    /**
-     * Ruft den Wert der berechnungsvariante-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BerechnungsvarianteType }
-     *     
-     */
-    public BerechnungsvarianteType getBerechnungsvariante() {
-        return berechnungsvariante;
-    }
-
-    /**
-     * Legt den Wert der berechnungsvariante-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BerechnungsvarianteType }
-     *     
-     */
-    public void setBerechnungsvariante(BerechnungsvarianteType value) {
-        this.berechnungsvariante = value;
-    }
-
-    /**
-     * Ruft den Wert der vermittlernr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVermittlernr() {
-        return vermittlernr;
-    }
-
-    /**
-     * Legt den Wert der vermittlernr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVermittlernr(String value) {
-        this.vermittlernr = value;
-    }
-
-    /**
-     * Ruft den Wert der elRahmenvereinbarung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ELRahmenvereinbarungType }
-     *     
-     */
-    public ELRahmenvereinbarungType getELRahmenvereinbarung() {
-        return elRahmenvereinbarung;
-    }
-
-    /**
-     * Legt den Wert der elRahmenvereinbarung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ELRahmenvereinbarungType }
-     *     
-     */
-    public void setELRahmenvereinbarung(ELRahmenvereinbarungType value) {
-        this.elRahmenvereinbarung = value;
-    }
-
-    /**
-     * Gets the value of the zusaetzlicheVerkaufproduktdaten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zusaetzlicheVerkaufproduktdaten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZusaetzlicheVerkaufproduktdaten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ZusaetzlicheVerkaufproduktdatenType }
-     * 
-     * 
-     */
-    public List getZusaetzlicheVerkaufproduktdaten() {
-        if (zusaetzlicheVerkaufproduktdaten == null) {
-            zusaetzlicheVerkaufproduktdaten = new ArrayList();
-        }
-        return this.zusaetzlicheVerkaufproduktdaten;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VerpfaendungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VerpfaendungType.java
deleted file mode 100644
index 447f725a..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VerpfaendungType.java
+++ /dev/null
@@ -1,73 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Sicherstellung vom Typ Verpfändung
- * 
- * 
Java-Klasse für Verpfaendung_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Verpfaendung_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Sicherstellung_Type">
- *       <sequence>
- *         <element name="Pfandglaeubiger" type="{urn:omds3CommonServiceTypes-1-1-0}Pfandglaeubiger_Type" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Verpfaendung_Type", propOrder = {
-    "pfandglaeubiger"
-})
-public class VerpfaendungType
-    extends SicherstellungType
-{
-
-    @XmlElement(name = "Pfandglaeubiger", required = true)
-    protected List pfandglaeubiger;
-
-    /**
-     * Gets the value of the pfandglaeubiger property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the pfandglaeubiger property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getPfandglaeubiger().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link PfandglaeubigerType }
-     * 
-     * 
-     */
-    public List getPfandglaeubiger() {
-        if (pfandglaeubiger == null) {
-            pfandglaeubiger = new ArrayList();
-        }
-        return this.pfandglaeubiger;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersicherteLiegenschaftType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersicherteLiegenschaftType.java
deleted file mode 100644
index 72c3b03d..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersicherteLiegenschaftType.java
+++ /dev/null
@@ -1,138 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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 at.vvo.omds.types.omds2Types.v2_14.ADRESSEType;
-
-
-/**
- * Versicherte Liegenschaft
- * 
- * 
Java-Klasse für VersicherteLiegenschaft_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VersicherteLiegenschaft_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}VersichertesInteresseMitAttributMetadaten_Type">
- *       <sequence>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}ObjektId"/>
- *         <element name="Adresse" type="{urn:omds20}ADRESSE_Type"/>
- *         <element name="BebauteFlaecheInQm" type="{http://www.w3.org/2001/XMLSchema}unsignedShort"/>
- *         <element name="UeberdachteFlaecheInQm" type="{http://www.w3.org/2001/XMLSchema}unsignedShort"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VersicherteLiegenschaft_Type", propOrder = {
-    "objektId",
-    "adresse",
-    "bebauteFlaecheInQm",
-    "ueberdachteFlaecheInQm"
-})
-public class VersicherteLiegenschaftType
-    extends VersichertesInteresseMitAttributMetadatenType
-{
-
-    @XmlElement(name = "ObjektId", required = true)
-    protected ObjektIdType objektId;
-    @XmlElement(name = "Adresse", required = true)
-    protected ADRESSEType adresse;
-    @XmlElement(name = "BebauteFlaecheInQm")
-    @XmlSchemaType(name = "unsignedShort")
-    protected int bebauteFlaecheInQm;
-    @XmlElement(name = "UeberdachteFlaecheInQm")
-    @XmlSchemaType(name = "unsignedShort")
-    protected int ueberdachteFlaecheInQm;
-
-    /**
-     * Ruft den Wert der objektId-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getObjektId() {
-        return objektId;
-    }
-
-    /**
-     * Legt den Wert der objektId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setObjektId(ObjektIdType value) {
-        this.objektId = value;
-    }
-
-    /**
-     * Ruft den Wert der adresse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ADRESSEType }
-     *     
-     */
-    public ADRESSEType getAdresse() {
-        return adresse;
-    }
-
-    /**
-     * Legt den Wert der adresse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ADRESSEType }
-     *     
-     */
-    public void setAdresse(ADRESSEType value) {
-        this.adresse = value;
-    }
-
-    /**
-     * Ruft den Wert der bebauteFlaecheInQm-Eigenschaft ab.
-     * 
-     */
-    public int getBebauteFlaecheInQm() {
-        return bebauteFlaecheInQm;
-    }
-
-    /**
-     * Legt den Wert der bebauteFlaecheInQm-Eigenschaft fest.
-     * 
-     */
-    public void setBebauteFlaecheInQm(int value) {
-        this.bebauteFlaecheInQm = value;
-    }
-
-    /**
-     * Ruft den Wert der ueberdachteFlaecheInQm-Eigenschaft ab.
-     * 
-     */
-    public int getUeberdachteFlaecheInQm() {
-        return ueberdachteFlaecheInQm;
-    }
-
-    /**
-     * Legt den Wert der ueberdachteFlaecheInQm-Eigenschaft fest.
-     * 
-     */
-    public void setUeberdachteFlaecheInQm(int value) {
-        this.ueberdachteFlaecheInQm = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersichertePersonType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersichertePersonType.java
deleted file mode 100644
index deab63dc..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersichertePersonType.java
+++ /dev/null
@@ -1,96 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Versicherte Person basierend auf VersichertesInteresse_Type. Lfnr muss mit Lfnr der Person übereinstimmen.
- * 
- * 
Java-Klasse für VersichertePerson_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VersichertePerson_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}VersichertesInteresseMitAttributMetadaten_Type">
- *       <sequence>
- *         <choice minOccurs="0">
- *           <element name="RisikoNatPerson" type="{urn:omds3CommonServiceTypes-1-1-0}RisikoNatPerson_Type"/>
- *           <element name="RisikoSonstPerson" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
- *         </choice>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VersichertePerson_Type", propOrder = {
-    "risikoNatPerson",
-    "risikoSonstPerson"
-})
-public class VersichertePersonType
-    extends VersichertesInteresseMitAttributMetadatenType
-{
-
-    @XmlElement(name = "RisikoNatPerson")
-    protected RisikoNatPersonType risikoNatPerson;
-    @XmlElement(name = "RisikoSonstPerson")
-    protected Object risikoSonstPerson;
-
-    /**
-     * Ruft den Wert der risikoNatPerson-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RisikoNatPersonType }
-     *     
-     */
-    public RisikoNatPersonType getRisikoNatPerson() {
-        return risikoNatPerson;
-    }
-
-    /**
-     * Legt den Wert der risikoNatPerson-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RisikoNatPersonType }
-     *     
-     */
-    public void setRisikoNatPerson(RisikoNatPersonType value) {
-        this.risikoNatPerson = value;
-    }
-
-    /**
-     * Ruft den Wert der risikoSonstPerson-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Object }
-     *     
-     */
-    public Object getRisikoSonstPerson() {
-        return risikoSonstPerson;
-    }
-
-    /**
-     * Legt den Wert der risikoSonstPerson-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     
-     */
-    public void setRisikoSonstPerson(Object value) {
-        this.risikoSonstPerson = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersicherteVeranstaltungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersicherteVeranstaltungType.java
deleted file mode 100644
index 2e97f010..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersicherteVeranstaltungType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Versicherte Veranstaltung basierend auf VersichertesInteresse_Type
- * 
- * 
Java-Klasse für VersicherteVeranstaltung_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VersicherteVeranstaltung_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}VersichertesInteresseMitAttributMetadaten_Type">
- *       <sequence>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VersicherteVeranstaltung_Type")
-public class VersicherteVeranstaltungType
-    extends VersichertesInteresseMitAttributMetadatenType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersichertesInteresseMitAttributMetadatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersichertesInteresseMitAttributMetadatenType.java
deleted file mode 100644
index 9625642b..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersichertesInteresseMitAttributMetadatenType.java
+++ /dev/null
@@ -1,85 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.RisikoGebaeudeType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.RisikoHaushaltType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.VersichertesObjektSachPrivatType;
-
-
-/**
- * Abstrakter Obertyp für versicherte Interessen, unterstützt Attribut-Metadaten
- * 
- * 
Java-Klasse für VersichertesInteresseMitAttributMetadaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VersichertesInteresseMitAttributMetadaten_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}VersichertesInteresse_Type">
- *       <sequence>
- *         <element name="AttributMetadaten" type="{urn:omds3CommonServiceTypes-1-1-0}AttributMetadaten_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VersichertesInteresseMitAttributMetadaten_Type", propOrder = {
-    "attributMetadaten"
-})
-@XmlSeeAlso({
-    VersichertesObjektSachPrivatType.class,
-    RisikoHaushaltType.class,
-    RisikoGebaeudeType.class,
-    VersichertePersonType.class,
-    VersicherteVeranstaltungType.class,
-    VersicherteLiegenschaftType.class
-})
-public abstract class VersichertesInteresseMitAttributMetadatenType
-    extends VersichertesInteresseType
-{
-
-    @XmlElement(name = "AttributMetadaten")
-    protected List attributMetadaten;
-
-    /**
-     * Gets the value of the attributMetadaten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the attributMetadaten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getAttributMetadaten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link AttributMetadatenType }
-     * 
-     * 
-     */
-    public List getAttributMetadaten() {
-        if (attributMetadaten == null) {
-            attributMetadaten = new ArrayList();
-        }
-        return this.attributMetadaten;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersichertesInteresseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersichertesInteresseType.java
deleted file mode 100644
index 965627d2..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersichertesInteresseType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Abstrakter Obertyp für versicherte Interessen
- * 
- * 
Java-Klasse für VersichertesInteresse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VersichertesInteresse_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="Lfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VersichertesInteresse_Type")
-@XmlSeeAlso({
-    FahrzeugType.class,
-    VersichertesInteresseMitAttributMetadatenType.class
-})
-public abstract class VersichertesInteresseType {
-
-    @XmlAttribute(name = "Lfnr", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer lfnr;
-
-    /**
-     * Ruft den Wert der lfnr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getLfnr() {
-        return lfnr;
-    }
-
-    /**
-     * Legt den Wert der lfnr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setLfnr(Integer value) {
-        this.lfnr = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersicherungssteuerType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersicherungssteuerType.java
deleted file mode 100644
index bbce1f14..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersicherungssteuerType.java
+++ /dev/null
@@ -1,123 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import java.math.BigDecimal;
-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;
-
-
-/**
- * Stellt die Versicherungsteuer einer Prämie dar
- * 
- * 
Java-Klasse für Versicherungssteuer_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Versicherungssteuer_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Versicherungssteuer" type="{urn:omds20}decimal"/>
- *         <element name="VersicherungssteuerArt" type="{urn:omds3CommonServiceTypes-1-1-0}VersicherungssteuerArt_Type"/>
- *         <element name="VersicherungssteuerSatz" type="{urn:omds20}decimal" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Versicherungssteuer_Type", propOrder = {
-    "versicherungssteuer",
-    "versicherungssteuerArt",
-    "versicherungssteuerSatz"
-})
-public class VersicherungssteuerType {
-
-    @XmlElement(name = "Versicherungssteuer", required = true)
-    protected BigDecimal versicherungssteuer;
-    @XmlElement(name = "VersicherungssteuerArt", required = true)
-    @XmlSchemaType(name = "anySimpleType")
-    protected String versicherungssteuerArt;
-    @XmlElement(name = "VersicherungssteuerSatz")
-    protected BigDecimal versicherungssteuerSatz;
-
-    /**
-     * Ruft den Wert der versicherungssteuer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getVersicherungssteuer() {
-        return versicherungssteuer;
-    }
-
-    /**
-     * Legt den Wert der versicherungssteuer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setVersicherungssteuer(BigDecimal value) {
-        this.versicherungssteuer = value;
-    }
-
-    /**
-     * Ruft den Wert der versicherungssteuerArt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVersicherungssteuerArt() {
-        return versicherungssteuerArt;
-    }
-
-    /**
-     * Legt den Wert der versicherungssteuerArt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVersicherungssteuerArt(String value) {
-        this.versicherungssteuerArt = value;
-    }
-
-    /**
-     * Ruft den Wert der versicherungssteuerSatz-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getVersicherungssteuerSatz() {
-        return versicherungssteuerSatz;
-    }
-
-    /**
-     * Legt den Wert der versicherungssteuerSatz-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setVersicherungssteuerSatz(BigDecimal value) {
-        this.versicherungssteuerSatz = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VertragspersonType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VertragspersonType.java
deleted file mode 100644
index bc52100b..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VertragspersonType.java
+++ /dev/null
@@ -1,88 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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 at.vvo.omds.types.omds2Types.v2_14.VtgRolleCdType;
-
-
-/**
- * Definiert Vertragspersonen als Referenz auf eine Person plus Vertragsrolle
- * 
- * 
Java-Klasse für Vertragsperson_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Vertragsperson_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="LfdNr" type="{http://www.w3.org/2001/XMLSchema}unsignedInt"/>
- *         <element name="Rolle" type="{urn:omds20}VtgRolleCd_Type"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Vertragsperson_Type", propOrder = {
-    "lfdNr",
-    "rolle"
-})
-public class VertragspersonType {
-
-    @XmlElement(name = "LfdNr")
-    @XmlSchemaType(name = "unsignedInt")
-    protected long lfdNr;
-    @XmlElement(name = "Rolle", required = true)
-    @XmlSchemaType(name = "string")
-    protected VtgRolleCdType rolle;
-
-    /**
-     * Ruft den Wert der lfdNr-Eigenschaft ab.
-     * 
-     */
-    public long getLfdNr() {
-        return lfdNr;
-    }
-
-    /**
-     * Legt den Wert der lfdNr-Eigenschaft fest.
-     * 
-     */
-    public void setLfdNr(long value) {
-        this.lfdNr = value;
-    }
-
-    /**
-     * Ruft den Wert der rolle-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VtgRolleCdType }
-     *     
-     */
-    public VtgRolleCdType getRolle() {
-        return rolle;
-    }
-
-    /**
-     * Legt den Wert der rolle-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VtgRolleCdType }
-     *     
-     */
-    public void setRolle(VtgRolleCdType value) {
-        this.rolle = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VinkularglaeubigerType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VinkularglaeubigerType.java
deleted file mode 100644
index cd221134..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VinkularglaeubigerType.java
+++ /dev/null
@@ -1,176 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Typ zur Beschreibung einer Bank als Vinkulargläubiger
- * 
- * 
Java-Klasse für Vinkularglaeubiger_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Vinkularglaeubiger_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Vertragsnummer">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <minLength value="1"/>
- *               <maxLength value="32"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="VinkularglaeubigerBank">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <minLength value="2"/>
- *               <maxLength value="100"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="VinkularglaeubigerPlz">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <minLength value="4"/>
- *               <maxLength value="5"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="VinkularglaeubigerStrasse" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <minLength value="3"/>
- *               <maxLength value="100"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Vinkularglaeubiger_Type", propOrder = {
-    "vertragsnummer",
-    "vinkularglaeubigerBank",
-    "vinkularglaeubigerPlz",
-    "vinkularglaeubigerStrasse"
-})
-public class VinkularglaeubigerType {
-
-    @XmlElement(name = "Vertragsnummer", required = true)
-    protected String vertragsnummer;
-    @XmlElement(name = "VinkularglaeubigerBank", required = true)
-    protected String vinkularglaeubigerBank;
-    @XmlElement(name = "VinkularglaeubigerPlz", required = true)
-    protected String vinkularglaeubigerPlz;
-    @XmlElement(name = "VinkularglaeubigerStrasse")
-    protected String vinkularglaeubigerStrasse;
-
-    /**
-     * Ruft den Wert der vertragsnummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVertragsnummer() {
-        return vertragsnummer;
-    }
-
-    /**
-     * Legt den Wert der vertragsnummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVertragsnummer(String value) {
-        this.vertragsnummer = value;
-    }
-
-    /**
-     * Ruft den Wert der vinkularglaeubigerBank-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVinkularglaeubigerBank() {
-        return vinkularglaeubigerBank;
-    }
-
-    /**
-     * Legt den Wert der vinkularglaeubigerBank-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVinkularglaeubigerBank(String value) {
-        this.vinkularglaeubigerBank = value;
-    }
-
-    /**
-     * Ruft den Wert der vinkularglaeubigerPlz-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVinkularglaeubigerPlz() {
-        return vinkularglaeubigerPlz;
-    }
-
-    /**
-     * Legt den Wert der vinkularglaeubigerPlz-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVinkularglaeubigerPlz(String value) {
-        this.vinkularglaeubigerPlz = value;
-    }
-
-    /**
-     * Ruft den Wert der vinkularglaeubigerStrasse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVinkularglaeubigerStrasse() {
-        return vinkularglaeubigerStrasse;
-    }
-
-    /**
-     * Legt den Wert der vinkularglaeubigerStrasse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVinkularglaeubigerStrasse(String value) {
-        this.vinkularglaeubigerStrasse = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VinkulierungPersonenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VinkulierungPersonenType.java
deleted file mode 100644
index 6dc77be7..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VinkulierungPersonenType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Sicherstellung vom Typ Vinkulierung
- * 
- * 
Java-Klasse für VinkulierungPersonen_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VinkulierungPersonen_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Sicherstellung_Type">
- *       <sequence>
- *         <element name="Vinkularglaeubiger" type="{urn:omds3CommonServiceTypes-1-1-0}Vinkularglaeubiger_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VinkulierungPersonen_Type", propOrder = {
-    "vinkularglaeubiger"
-})
-public class VinkulierungPersonenType
-    extends SicherstellungType
-{
-
-    @XmlElement(name = "Vinkularglaeubiger", required = true)
-    protected VinkularglaeubigerType vinkularglaeubiger;
-
-    /**
-     * Ruft den Wert der vinkularglaeubiger-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VinkularglaeubigerType }
-     *     
-     */
-    public VinkularglaeubigerType getVinkularglaeubiger() {
-        return vinkularglaeubiger;
-    }
-
-    /**
-     * Legt den Wert der vinkularglaeubiger-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VinkularglaeubigerType }
-     *     
-     */
-    public void setVinkularglaeubiger(VinkularglaeubigerType value) {
-        this.vinkularglaeubiger = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VinkulierungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VinkulierungType.java
deleted file mode 100644
index 829f1e3a..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VinkulierungType.java
+++ /dev/null
@@ -1,65 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds2Types.v2_14.PERSONType;
-
-
-/**
- * Type Vinkulierung
- * 
- * 
Java-Klasse für Vinkulierung_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Vinkulierung_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:omds20}PERSON"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Vinkulierung_Type", propOrder = {
-    "person"
-})
-public class VinkulierungType {
-
-    @XmlElement(name = "PERSON", namespace = "urn:omds20", required = true)
-    protected PERSONType person;
-
-    /**
-     * Ruft den Wert der person-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PERSONType }
-     *     
-     */
-    public PERSONType getPERSON() {
-        return person;
-    }
-
-    /**
-     * Legt den Wert der person-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PERSONType }
-     *     
-     */
-    public void setPERSON(PERSONType value) {
-        this.person = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VorversicherungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VorversicherungType.java
deleted file mode 100644
index 1a1d08db..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VorversicherungType.java
+++ /dev/null
@@ -1,129 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Angaben zu einer Vorversicherung
- * 
- * 
Java-Klasse für Vorversicherung_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Vorversicherung_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}VorversicherungenDetail_Type">
- *       <sequence>
- *         <element name="VtgSparteCd" type="{urn:omds20}VtgSparteCd_Type" minOccurs="0"/>
- *         <element name="SpartenCd" type="{urn:omds20}SpartenCd_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Polizzennr" type="{urn:omds20}Polizzennr" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Vorversicherung_Type", propOrder = {
-    "vtgSparteCd",
-    "spartenCd",
-    "polizzennr"
-})
-public class VorversicherungType
-    extends VorversicherungenDetailType
-{
-
-    @XmlElement(name = "VtgSparteCd")
-    protected String vtgSparteCd;
-    @XmlElement(name = "SpartenCd")
-    protected List spartenCd;
-    @XmlElement(name = "Polizzennr")
-    protected String polizzennr;
-
-    /**
-     * Ruft den Wert der vtgSparteCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVtgSparteCd() {
-        return vtgSparteCd;
-    }
-
-    /**
-     * Legt den Wert der vtgSparteCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVtgSparteCd(String value) {
-        this.vtgSparteCd = value;
-    }
-
-    /**
-     * Gets the value of the spartenCd property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the spartenCd property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getSpartenCd().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List getSpartenCd() {
-        if (spartenCd == null) {
-            spartenCd = new ArrayList();
-        }
-        return this.spartenCd;
-    }
-
-    /**
-     * Ruft den Wert der polizzennr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolizzennr() {
-        return polizzennr;
-    }
-
-    /**
-     * Legt den Wert der polizzennr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolizzennr(String value) {
-        this.polizzennr = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VorversicherungenDetailType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VorversicherungenDetailType.java
deleted file mode 100644
index b1948b73..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VorversicherungenDetailType.java
+++ /dev/null
@@ -1,191 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Details zu einer Vorversicherung
- * 
- * 
Java-Klasse für VorversicherungenDetail_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VorversicherungenDetail_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="WurdenVorversicherungenAufgeloest" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="Aufloesungsgrund" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <enumeration value="aus Schaden"/>
- *               <enumeration value="durch einvernehmliche Kündigung"/>
- *               <enumeration value="durch Ablauf"/>
- *               <enumeration value="durch Besitzwechsel"/>
- *               <enumeration value="aus sonstigen Gründen"/>
- *               <enumeration value="zum Ablauf gekündigte Vorversicherung"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="AuslaendischeVersicherungsgesellschaft" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="Versicherungsgesellschaft" type="{urn:omds3CommonServiceTypes-1-1-0}Versicherungsgesellschaft_Type"/>
- *         <element name="ZusaetzlicheVorversicherungsdaten" type="{urn:omds3CommonServiceTypes-1-1-0}ZusaetzlicheVorversicherungsdaten_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VorversicherungenDetail_Type", propOrder = {
-    "wurdenVorversicherungenAufgeloest",
-    "aufloesungsgrund",
-    "auslaendischeVersicherungsgesellschaft",
-    "versicherungsgesellschaft",
-    "zusaetzlicheVorversicherungsdaten"
-})
-@XmlSeeAlso({
-    VorversicherungType.class,
-    at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.VorversicherungenKfzType.VorversicherungKfz.class
-})
-public class VorversicherungenDetailType {
-
-    @XmlElement(name = "WurdenVorversicherungenAufgeloest")
-    protected boolean wurdenVorversicherungenAufgeloest;
-    @XmlElement(name = "Aufloesungsgrund")
-    protected String aufloesungsgrund;
-    @XmlElement(name = "AuslaendischeVersicherungsgesellschaft")
-    protected Boolean auslaendischeVersicherungsgesellschaft;
-    @XmlElement(name = "Versicherungsgesellschaft", required = true)
-    protected String versicherungsgesellschaft;
-    @XmlElement(name = "ZusaetzlicheVorversicherungsdaten")
-    protected List zusaetzlicheVorversicherungsdaten;
-
-    /**
-     * Ruft den Wert der wurdenVorversicherungenAufgeloest-Eigenschaft ab.
-     * 
-     */
-    public boolean isWurdenVorversicherungenAufgeloest() {
-        return wurdenVorversicherungenAufgeloest;
-    }
-
-    /**
-     * Legt den Wert der wurdenVorversicherungenAufgeloest-Eigenschaft fest.
-     * 
-     */
-    public void setWurdenVorversicherungenAufgeloest(boolean value) {
-        this.wurdenVorversicherungenAufgeloest = value;
-    }
-
-    /**
-     * Ruft den Wert der aufloesungsgrund-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAufloesungsgrund() {
-        return aufloesungsgrund;
-    }
-
-    /**
-     * Legt den Wert der aufloesungsgrund-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAufloesungsgrund(String value) {
-        this.aufloesungsgrund = value;
-    }
-
-    /**
-     * Ruft den Wert der auslaendischeVersicherungsgesellschaft-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isAuslaendischeVersicherungsgesellschaft() {
-        return auslaendischeVersicherungsgesellschaft;
-    }
-
-    /**
-     * Legt den Wert der auslaendischeVersicherungsgesellschaft-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setAuslaendischeVersicherungsgesellschaft(Boolean value) {
-        this.auslaendischeVersicherungsgesellschaft = value;
-    }
-
-    /**
-     * Ruft den Wert der versicherungsgesellschaft-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVersicherungsgesellschaft() {
-        return versicherungsgesellschaft;
-    }
-
-    /**
-     * Legt den Wert der versicherungsgesellschaft-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVersicherungsgesellschaft(String value) {
-        this.versicherungsgesellschaft = value;
-    }
-
-    /**
-     * Gets the value of the zusaetzlicheVorversicherungsdaten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zusaetzlicheVorversicherungsdaten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZusaetzlicheVorversicherungsdaten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ZusaetzlicheVorversicherungsdatenType }
-     * 
-     * 
-     */
-    public List getZusaetzlicheVorversicherungsdaten() {
-        if (zusaetzlicheVorversicherungsdaten == null) {
-            zusaetzlicheVorversicherungsdaten = new ArrayList();
-        }
-        return this.zusaetzlicheVorversicherungsdaten;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VorversicherungenImplType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VorversicherungenImplType.java
deleted file mode 100644
index 2a45a95e..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VorversicherungenImplType.java
+++ /dev/null
@@ -1,73 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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;
-
-
-/**
- * Standardimplementierung Vorversicherungen
- * 
- * 
Java-Klasse für VorversicherungenImpl_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VorversicherungenImpl_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Vorversicherungen_Type">
- *       <sequence>
- *         <element name="Vorversicherungen" type="{urn:omds3CommonServiceTypes-1-1-0}Vorversicherung_Type" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VorversicherungenImpl_Type", propOrder = {
-    "vorversicherungen"
-})
-public class VorversicherungenImplType
-    extends VorversicherungenType
-{
-
-    @XmlElement(name = "Vorversicherungen", required = true)
-    protected List vorversicherungen;
-
-    /**
-     * Gets the value of the vorversicherungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the vorversicherungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVorversicherungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link VorversicherungType }
-     * 
-     * 
-     */
-    public List getVorversicherungen() {
-        if (vorversicherungen == null) {
-            vorversicherungen = new ArrayList();
-        }
-        return this.vorversicherungen;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VorversicherungenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VorversicherungenType.java
deleted file mode 100644
index 051255e1..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VorversicherungenType.java
+++ /dev/null
@@ -1,38 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.VorversicherungenKfzType;
-
-
-/**
- * Abstrakter Typ zur Beschreibung der Vorversicherungen
- * 
- * 
Java-Klasse für Vorversicherungen_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Vorversicherungen_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Vorversicherungen_Type")
-@XmlSeeAlso({
-    VorversicherungenImplType.class,
-    VorversicherungenKfzType.class
-})
-public abstract class VorversicherungenType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZahlungsdatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZahlungsdatenType.java
deleted file mode 100644
index c931b06a..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZahlungsdatenType.java
+++ /dev/null
@@ -1,148 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Beschreibt die Zahlungsdaten in Antragsservices
- * 
- * 
Java-Klasse für Zahlungsdaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Zahlungsdaten_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Zahlungsart" type="{urn:omds20}ZahlWegCd_Type"/>
- *         <element name="Kontonummer" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="BIC" type="{urn:omds3CommonServiceTypes-1-1-0}BIC_Type" minOccurs="0"/>
- *         <element name="Beschreibung" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Zahlungsdaten_Type", propOrder = {
-    "zahlungsart",
-    "kontonummer",
-    "bic",
-    "beschreibung"
-})
-public class ZahlungsdatenType {
-
-    @XmlElement(name = "Zahlungsart", required = true)
-    protected String zahlungsart;
-    @XmlElement(name = "Kontonummer")
-    protected String kontonummer;
-    @XmlElement(name = "BIC")
-    protected String bic;
-    @XmlElement(name = "Beschreibung")
-    protected String beschreibung;
-
-    /**
-     * Ruft den Wert der zahlungsart-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getZahlungsart() {
-        return zahlungsart;
-    }
-
-    /**
-     * Legt den Wert der zahlungsart-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setZahlungsart(String value) {
-        this.zahlungsart = value;
-    }
-
-    /**
-     * Ruft den Wert der kontonummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getKontonummer() {
-        return kontonummer;
-    }
-
-    /**
-     * Legt den Wert der kontonummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setKontonummer(String value) {
-        this.kontonummer = value;
-    }
-
-    /**
-     * Ruft den Wert der bic-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBIC() {
-        return bic;
-    }
-
-    /**
-     * Legt den Wert der bic-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBIC(String value) {
-        this.bic = value;
-    }
-
-    /**
-     * Ruft den Wert der beschreibung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBeschreibung() {
-        return beschreibung;
-    }
-
-    /**
-     * Legt den Wert der beschreibung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBeschreibung(String value) {
-        this.beschreibung = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZahlwegImplType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZahlwegImplType.java
deleted file mode 100644
index 6543a3e7..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZahlwegImplType.java
+++ /dev/null
@@ -1,210 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlType;
-
-
-/**
- * Typ Zahlweg
- * 
- * 
Java-Klasse für ZahlwegImpl_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZahlwegImpl_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Zahlweg_Type">
- *       <choice>
- *         <element name="Zahlungsanweisung" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
- *         <element name="Lastschrift" type="{urn:omds3CommonServiceTypes-1-1-0}Bankverbindung_Type"/>
- *         <element name="Kundenkonto">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="Kundenkontonummer" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="Kreditkarte" type="{urn:omds3CommonServiceTypes-1-1-0}Kreditkarte_Type"/>
- *       </choice>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZahlwegImpl_Type", propOrder = {
-    "zahlungsanweisung",
-    "lastschrift",
-    "kundenkonto",
-    "kreditkarte"
-})
-public class ZahlwegImplType
-    extends ZahlwegType
-{
-
-    @XmlElement(name = "Zahlungsanweisung")
-    protected Object zahlungsanweisung;
-    @XmlElement(name = "Lastschrift")
-    protected BankverbindungType lastschrift;
-    @XmlElement(name = "Kundenkonto")
-    protected ZahlwegImplType.Kundenkonto kundenkonto;
-    @XmlElement(name = "Kreditkarte")
-    protected KreditkarteType kreditkarte;
-
-    /**
-     * Ruft den Wert der zahlungsanweisung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Object }
-     *     
-     */
-    public Object getZahlungsanweisung() {
-        return zahlungsanweisung;
-    }
-
-    /**
-     * Legt den Wert der zahlungsanweisung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     
-     */
-    public void setZahlungsanweisung(Object value) {
-        this.zahlungsanweisung = value;
-    }
-
-    /**
-     * Ruft den Wert der lastschrift-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BankverbindungType }
-     *     
-     */
-    public BankverbindungType getLastschrift() {
-        return lastschrift;
-    }
-
-    /**
-     * Legt den Wert der lastschrift-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BankverbindungType }
-     *     
-     */
-    public void setLastschrift(BankverbindungType value) {
-        this.lastschrift = value;
-    }
-
-    /**
-     * Ruft den Wert der kundenkonto-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ZahlwegImplType.Kundenkonto }
-     *     
-     */
-    public ZahlwegImplType.Kundenkonto getKundenkonto() {
-        return kundenkonto;
-    }
-
-    /**
-     * Legt den Wert der kundenkonto-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ZahlwegImplType.Kundenkonto }
-     *     
-     */
-    public void setKundenkonto(ZahlwegImplType.Kundenkonto value) {
-        this.kundenkonto = value;
-    }
-
-    /**
-     * Ruft den Wert der kreditkarte-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link KreditkarteType }
-     *     
-     */
-    public KreditkarteType getKreditkarte() {
-        return kreditkarte;
-    }
-
-    /**
-     * Legt den Wert der kreditkarte-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link KreditkarteType }
-     *     
-     */
-    public void setKreditkarte(KreditkarteType value) {
-        this.kreditkarte = value;
-    }
-
-
-    /**
-     * 
Java-Klasse für anonymous complex type.
-     * 
-     * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="Kundenkontonummer" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Kundenkonto {
-
-        @XmlAttribute(name = "Kundenkontonummer", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-        protected String kundenkontonummer;
-
-        /**
-         * Ruft den Wert der kundenkontonummer-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getKundenkontonummer() {
-            return kundenkontonummer;
-        }
-
-        /**
-         * Legt den Wert der kundenkontonummer-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setKundenkontonummer(String value) {
-            this.kundenkontonummer = value;
-        }
-
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZahlwegType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZahlwegType.java
deleted file mode 100644
index eba003d4..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZahlwegType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Typ Zahlweg
- * 
- * 
Java-Klasse für Zahlweg_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Zahlweg_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Zahlweg_Type")
-@XmlSeeAlso({
-    ZahlwegImplType.class
-})
-public abstract class ZahlwegType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZeitraumType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZeitraumType.java
deleted file mode 100644
index 1cb7e66c..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZeitraumType.java
+++ /dev/null
@@ -1,88 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.datatype.XMLGregorianCalendar;
-
-
-/**
- * Ein Zeitraum mit Beginn und Ende Datum
- * 
- * 
Java-Klasse für Zeitraum_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Zeitraum_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="ZRBeg" type="{urn:omds20}Datum" />
- *       <attribute name="ZREnd" type="{urn:omds20}Datum" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Zeitraum_Type")
-public class ZeitraumType {
-
-    @XmlAttribute(name = "ZRBeg", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected XMLGregorianCalendar zrBeg;
-    @XmlAttribute(name = "ZREnd", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected XMLGregorianCalendar zrEnd;
-
-    /**
-     * Ruft den Wert der zrBeg-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getZRBeg() {
-        return zrBeg;
-    }
-
-    /**
-     * Legt den Wert der zrBeg-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setZRBeg(XMLGregorianCalendar value) {
-        this.zrBeg = value;
-    }
-
-    /**
-     * Ruft den Wert der zrEnd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getZREnd() {
-        return zrEnd;
-    }
-
-    /**
-     * Legt den Wert der zrEnd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setZREnd(XMLGregorianCalendar value) {
-        this.zrEnd = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZulassungsdatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZulassungsdatenType.java
deleted file mode 100644
index 6ef27eb0..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZulassungsdatenType.java
+++ /dev/null
@@ -1,120 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Typ für Zulassungsdaten
- * 
- * 
Java-Klasse für Zulassungsdaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Zulassungsdaten_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="VBNummer" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Kennzeichen" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Fahrgestellnummer" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Zulassungsdaten_Type", propOrder = {
-    "vbNummer",
-    "kennzeichen",
-    "fahrgestellnummer"
-})
-public class ZulassungsdatenType {
-
-    @XmlElement(name = "VBNummer")
-    protected String vbNummer;
-    @XmlElement(name = "Kennzeichen")
-    protected String kennzeichen;
-    @XmlElement(name = "Fahrgestellnummer")
-    protected String fahrgestellnummer;
-
-    /**
-     * Ruft den Wert der vbNummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVBNummer() {
-        return vbNummer;
-    }
-
-    /**
-     * Legt den Wert der vbNummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVBNummer(String value) {
-        this.vbNummer = value;
-    }
-
-    /**
-     * Ruft den Wert der kennzeichen-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getKennzeichen() {
-        return kennzeichen;
-    }
-
-    /**
-     * Legt den Wert der kennzeichen-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setKennzeichen(String value) {
-        this.kennzeichen = value;
-    }
-
-    /**
-     * Ruft den Wert der fahrgestellnummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFahrgestellnummer() {
-        return fahrgestellnummer;
-    }
-
-    /**
-     * Legt den Wert der fahrgestellnummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFahrgestellnummer(String value) {
-        this.fahrgestellnummer = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheElementarproduktdatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheElementarproduktdatenType.java
deleted file mode 100644
index a8e0ec0b..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheElementarproduktdatenType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * VU-spezifische Erweiterungsmöglichkeit auf Ebene Elementarprodukt
- * 
- * 
Java-Klasse für ZusaetzlicheElementarproduktdaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheElementarproduktdaten_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheElementarproduktdaten_Type")
-public abstract class ZusaetzlicheElementarproduktdatenType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheFondsdatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheFondsdatenType.java
deleted file mode 100644
index e4e1363f..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheFondsdatenType.java
+++ /dev/null
@@ -1,30 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
Java-Klasse für ZusaetzlicheFondsdaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheFondsdaten_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheFondsdaten_Type")
-public abstract class ZusaetzlicheFondsdatenType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheProduktdatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheProduktdatenType.java
deleted file mode 100644
index 5135dec9..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheProduktdatenType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * VU-spezifische Erweiterungsmöglichkeit auf Ebene Produkt
- * 
- * 
Java-Klasse für ZusaetzlicheProduktdaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheProduktdaten_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheProduktdaten_Type")
-public abstract class ZusaetzlicheProduktdatenType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheRisikodatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheRisikodatenType.java
deleted file mode 100644
index 9ea0ceb4..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheRisikodatenType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * VU-spezifische Erweiterungsmöglichkeit für Personendaten
- * 
- * 
Java-Klasse für ZusaetzlicheRisikodaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheRisikodaten_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheRisikodaten_Type")
-public abstract class ZusaetzlicheRisikodatenType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheVerkaufproduktdatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheVerkaufproduktdatenType.java
deleted file mode 100644
index 22696adc..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheVerkaufproduktdatenType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * VU-spezifische Erweiterungsmöglichkeit auf Ebene Verkaufsprodukt
- * 
- * 
Java-Klasse für ZusaetzlicheVerkaufproduktdaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheVerkaufproduktdaten_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheVerkaufproduktdaten_Type")
-public abstract class ZusaetzlicheVerkaufproduktdatenType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheVorversicherungsdatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheVorversicherungsdatenType.java
deleted file mode 100644
index 0fdb9abd..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheVorversicherungsdatenType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * VU-spezifische Erweiterungsmöglichkeit für Vorversicherungsdaten
- * 
- * 
Java-Klasse für ZusaetzlicheVorversicherungsdaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheVorversicherungsdaten_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheVorversicherungsdaten_Type")
-public abstract class ZusaetzlicheVorversicherungsdatenType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheZusatzproduktdatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheZusatzproduktdatenType.java
deleted file mode 100644
index 222f5479..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusaetzlicheZusatzproduktdatenType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * VU-spezifische Erweiterungsmöglichkeit auf Ebene Zusatzprodukt
- * 
- * 
Java-Klasse für ZusaetzlicheZusatzproduktdaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheZusatzproduktdaten_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheZusatzproduktdaten_Type")
-public abstract class ZusaetzlicheZusatzproduktdatenType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusatzproduktGenerischType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusatzproduktGenerischType.java
deleted file mode 100644
index e19b5aed..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusatzproduktGenerischType.java
+++ /dev/null
@@ -1,183 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.ZusatzversicherungLebenType;
-
-
-/**
- * Basistyp für ein Zusatzprodukt, 2. Generation
- * 
- * 
Java-Klasse für ZusatzproduktGenerisch_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusatzproduktGenerisch_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Zusatzprodukt_Type">
- *       <sequence>
- *         <element name="Eingeschlossen" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="EinschlussAenderbar" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="AttributMetadaten" type="{urn:omds3CommonServiceTypes-1-1-0}AttributMetadaten_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="BeschreibungTxt" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Versicherungssumme" type="{urn:omds20}decimal14_2" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusatzproduktGenerisch_Type", propOrder = {
-    "eingeschlossen",
-    "einschlussAenderbar",
-    "attributMetadaten",
-    "beschreibungTxt",
-    "versicherungssumme"
-})
-@XmlSeeAlso({
-    ZusatzversicherungLebenType.class
-})
-public class ZusatzproduktGenerischType
-    extends ZusatzproduktType
-{
-
-    @XmlElement(name = "Eingeschlossen")
-    protected boolean eingeschlossen;
-    @XmlElement(name = "EinschlussAenderbar")
-    protected Boolean einschlussAenderbar;
-    @XmlElement(name = "AttributMetadaten")
-    protected List attributMetadaten;
-    @XmlElement(name = "BeschreibungTxt")
-    protected String beschreibungTxt;
-    @XmlElement(name = "Versicherungssumme")
-    protected BigDecimal versicherungssumme;
-
-    /**
-     * Ruft den Wert der eingeschlossen-Eigenschaft ab.
-     * 
-     */
-    public boolean isEingeschlossen() {
-        return eingeschlossen;
-    }
-
-    /**
-     * Legt den Wert der eingeschlossen-Eigenschaft fest.
-     * 
-     */
-    public void setEingeschlossen(boolean value) {
-        this.eingeschlossen = value;
-    }
-
-    /**
-     * Ruft den Wert der einschlussAenderbar-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isEinschlussAenderbar() {
-        return einschlussAenderbar;
-    }
-
-    /**
-     * Legt den Wert der einschlussAenderbar-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setEinschlussAenderbar(Boolean value) {
-        this.einschlussAenderbar = value;
-    }
-
-    /**
-     * Gets the value of the attributMetadaten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the attributMetadaten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getAttributMetadaten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link AttributMetadatenType }
-     * 
-     * 
-     */
-    public List getAttributMetadaten() {
-        if (attributMetadaten == null) {
-            attributMetadaten = new ArrayList();
-        }
-        return this.attributMetadaten;
-    }
-
-    /**
-     * Ruft den Wert der beschreibungTxt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBeschreibungTxt() {
-        return beschreibungTxt;
-    }
-
-    /**
-     * Legt den Wert der beschreibungTxt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBeschreibungTxt(String value) {
-        this.beschreibungTxt = value;
-    }
-
-    /**
-     * Ruft den Wert der versicherungssumme-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getVersicherungssumme() {
-        return versicherungssumme;
-    }
-
-    /**
-     * Legt den Wert der versicherungssumme-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setVersicherungssumme(BigDecimal value) {
-        this.versicherungssumme = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusatzproduktType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusatzproduktType.java
deleted file mode 100644
index 88507cd0..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZusatzproduktType.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * Basistyp für ein Zusatzprodukt
- * 
- * 
Java-Klasse für Zusatzprodukt_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Zusatzprodukt_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Produktbaustein_Type">
- *       <sequence>
- *         <element name="VtgBeg" type="{urn:omds20}Datum" minOccurs="0"/>
- *         <element name="ZusaetzlicheZusatzproduktdaten" type="{urn:omds3CommonServiceTypes-1-1-0}ZusaetzlicheZusatzproduktdaten_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Zusatzprodukt_Type", propOrder = {
-    "vtgBeg",
-    "zusaetzlicheZusatzproduktdaten"
-})
-@XmlSeeAlso({
-    ZusatzproduktGenerischType.class
-})
-public abstract class ZusatzproduktType
-    extends ProduktbausteinType
-{
-
-    @XmlElement(name = "VtgBeg")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar vtgBeg;
-    @XmlElement(name = "ZusaetzlicheZusatzproduktdaten")
-    protected List zusaetzlicheZusatzproduktdaten;
-
-    /**
-     * Ruft den Wert der vtgBeg-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getVtgBeg() {
-        return vtgBeg;
-    }
-
-    /**
-     * Legt den Wert der vtgBeg-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setVtgBeg(XMLGregorianCalendar value) {
-        this.vtgBeg = value;
-    }
-
-    /**
-     * Gets the value of the zusaetzlicheZusatzproduktdaten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zusaetzlicheZusatzproduktdaten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZusaetzlicheZusatzproduktdaten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ZusaetzlicheZusatzproduktdatenType }
-     * 
-     * 
-     */
-    public List getZusaetzlicheZusatzproduktdaten() {
-        if (zusaetzlicheZusatzproduktdaten == null) {
-            zusaetzlicheZusatzproduktdaten = new ArrayList();
-        }
-        return this.zusaetzlicheZusatzproduktdaten;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/package-info.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/package-info.java
deleted file mode 100644
index 928708c9..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:omds3CommonServiceTypes-1-1-0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package at.vvo.omds.types.omds3Types.r1_7_0.common;
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/AbstractStateChangeEventType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/AbstractStateChangeEventType.java
deleted file mode 100644
index 3dd95b8d..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/AbstractStateChangeEventType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstraktes Event einer Statusänderung 
- * 
- * 
Java-Klasse für AbstractStateChangeEvent_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AbstractStateChangeEvent_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AbstractStateChangeEvent_Type")
-@XmlSeeAlso({
-    StateChangeEventType.class
-})
-public abstract class AbstractStateChangeEventType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/AbstractStatusGeschaeftsfallType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/AbstractStatusGeschaeftsfallType.java
deleted file mode 100644
index a6152570..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/AbstractStatusGeschaeftsfallType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Status eines Geschaeftsfalls
- * 
- * 
Java-Klasse für AbstractStatusGeschaeftsfall_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AbstractStatusGeschaeftsfall_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AbstractStatusGeschaeftsfall_Type")
-@XmlSeeAlso({
-    StatusAntragsGeschaeftsfall.class
-})
-public abstract class AbstractStatusGeschaeftsfallType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/AddDocToBusinessCaseRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/AddDocToBusinessCaseRequestType.java
deleted file mode 100644
index 13f31ea1..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/AddDocToBusinessCaseRequestType.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.UploadDokumentType;
-
-
-/**
- * Typ des Requestobjekts, um Dokument zu Geschäftsfall hinzuzufügen
- * 
- * 
Java-Klasse für AddDocToBusinessCaseRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AddDocToBusinessCaseRequest_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="VUNr" type="{urn:omds20}VUNr"/>
- *         <element name="Geschaeftsfallnummer" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type"/>
- *         <element name="Dokument" type="{urn:omds3CommonServiceTypes-1-1-0}Upload_Dokument_Type"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AddDocToBusinessCaseRequest_Type", propOrder = {
-    "vuNr",
-    "geschaeftsfallnummer",
-    "dokument"
-})
-public class AddDocToBusinessCaseRequestType {
-
-    @XmlElement(name = "VUNr", required = true)
-    protected String vuNr;
-    @XmlElement(name = "Geschaeftsfallnummer", required = true)
-    protected ObjektIdType geschaeftsfallnummer;
-    @XmlElement(name = "Dokument", required = true)
-    protected UploadDokumentType dokument;
-
-    /**
-     * Ruft den Wert der vuNr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVUNr() {
-        return vuNr;
-    }
-
-    /**
-     * Legt den Wert der vuNr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVUNr(String value) {
-        this.vuNr = value;
-    }
-
-    /**
-     * Ruft den Wert der geschaeftsfallnummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getGeschaeftsfallnummer() {
-        return geschaeftsfallnummer;
-    }
-
-    /**
-     * Legt den Wert der geschaeftsfallnummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setGeschaeftsfallnummer(ObjektIdType value) {
-        this.geschaeftsfallnummer = value;
-    }
-
-    /**
-     * Ruft den Wert der dokument-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link UploadDokumentType }
-     *     
-     */
-    public UploadDokumentType getDokument() {
-        return dokument;
-    }
-
-    /**
-     * Legt den Wert der dokument-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link UploadDokumentType }
-     *     
-     */
-    public void setDokument(UploadDokumentType value) {
-        this.dokument = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/AddDocToBusinessCaseResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/AddDocToBusinessCaseResponseType.java
deleted file mode 100644
index 4fdeb234..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/AddDocToBusinessCaseResponseType.java
+++ /dev/null
@@ -1,79 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-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.XmlElements;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.DokumentenReferenzType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ServiceFault;
-
-
-/**
- * Response von der VU, wenn ein zusätzliches Dokument übergeben wurde
- * 
- * 
Java-Klasse für AddDocToBusinessCaseResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AddDocToBusinessCaseResponse_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element name="DocRef" type="{urn:omds3CommonServiceTypes-1-1-0}DokumentenReferenz_Type"/>
- *         <element name="ServiceFault" type="{urn:omds3CommonServiceTypes-1-1-0}ServiceFault" maxOccurs="unbounded"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AddDocToBusinessCaseResponse_Type", propOrder = {
-    "docRefOrServiceFault"
-})
-public class AddDocToBusinessCaseResponseType {
-
-    @XmlElements({
-        @XmlElement(name = "DocRef", type = DokumentenReferenzType.class),
-        @XmlElement(name = "ServiceFault", type = ServiceFault.class)
-    })
-    protected List docRefOrServiceFault;
-
-    /**
-     * Gets the value of the docRefOrServiceFault property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the docRefOrServiceFault property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDocRefOrServiceFault().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link DokumentenReferenzType }
-     * {@link ServiceFault }
-     * 
-     * 
-     */
-    public List getDocRefOrServiceFault() {
-        if (docRefOrServiceFault == null) {
-            docRefOrServiceFault = new ArrayList();
-        }
-        return this.docRefOrServiceFault;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/CreateFormRequest.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/CreateFormRequest.java
deleted file mode 100644
index 10b2d4a5..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/CreateFormRequest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-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.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonProcessRequestType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonProcessRequest_Type">
- *       <sequence>
- *         <element name="FormType" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Kontext" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "formType",
-    "kontext"
-})
-@XmlRootElement(name = "CreateFormRequest")
-public class CreateFormRequest
-    extends CommonProcessRequestType
-{
-
-    @XmlElement(name = "FormType", required = true)
-    protected String formType;
-    @XmlElement(name = "Kontext")
-    protected List kontext;
-
-    /**
-     * Ruft den Wert der formType-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFormType() {
-        return formType;
-    }
-
-    /**
-     * Legt den Wert der formType-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFormType(String value) {
-        this.formType = value;
-    }
-
-    /**
-     * Gets the value of the kontext property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the kontext property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getKontext().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List getKontext() {
-        if (kontext == null) {
-            kontext = new ArrayList();
-        }
-        return this.kontext;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/CreateFormResponse.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/CreateFormResponse.java
deleted file mode 100644
index fb5baa88..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/CreateFormResponse.java
+++ /dev/null
@@ -1,68 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonProcessResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.Formular;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonProcessResponse_Type">
- *       <sequence>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}Formular"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "formular"
-})
-@XmlRootElement(name = "CreateFormResponse")
-public class CreateFormResponse
-    extends CommonProcessResponseType
-{
-
-    @XmlElement(name = "Formular", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-    protected Formular formular;
-
-    /**
-     * Ruft den Wert der formular-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Formular }
-     *     
-     */
-    public Formular getFormular() {
-        return formular;
-    }
-
-    /**
-     * Legt den Wert der formular-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Formular }
-     *     
-     */
-    public void setFormular(Formular value) {
-        this.formular = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/CredentialsType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/CredentialsType.java
deleted file mode 100644
index be44d153..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/CredentialsType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Ein abstrakter Typ, dessen konkrete Implementierungen unterschiedliche Credentials aufnehmen können. 
- * 
- * 
Java-Klasse für Credentials_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Credentials_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Credentials_Type")
-public abstract class CredentialsType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/DeclareEndpointRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/DeclareEndpointRequestType.java
deleted file mode 100644
index 93e76e0d..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/DeclareEndpointRequestType.java
+++ /dev/null
@@ -1,183 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AuthorizationFilter;
-
-
-/**
- * Typ für den DeclareEndpointRequest
- * 
- * 
Java-Klasse für DeclareEndpointRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="DeclareEndpointRequest_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="VUNr" type="{urn:omds20}VUNr"/>
- *         <element name="BasisUrlEndpoint">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <maxLength value="1000"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element ref="{urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen}ArtAuthentifizierung"/>
- *         <element name="Credentials" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen}Credentials_Type"/>
- *         <element name="AuthorizationFilter" type="{urn:omds3CommonServiceTypes-1-1-0}AuthorizationFilter" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DeclareEndpointRequest_Type", propOrder = {
-    "vuNr",
-    "basisUrlEndpoint",
-    "artAuthentifizierung",
-    "credentials",
-    "authorizationFilter"
-})
-public class DeclareEndpointRequestType {
-
-    @XmlElement(name = "VUNr", required = true)
-    protected String vuNr;
-    @XmlElement(name = "BasisUrlEndpoint", required = true)
-    protected String basisUrlEndpoint;
-    @XmlElement(name = "ArtAuthentifizierung", required = true)
-    protected String artAuthentifizierung;
-    @XmlElement(name = "Credentials", required = true)
-    protected CredentialsType credentials;
-    @XmlElement(name = "AuthorizationFilter")
-    protected AuthorizationFilter authorizationFilter;
-
-    /**
-     * Ruft den Wert der vuNr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVUNr() {
-        return vuNr;
-    }
-
-    /**
-     * Legt den Wert der vuNr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVUNr(String value) {
-        this.vuNr = value;
-    }
-
-    /**
-     * Ruft den Wert der basisUrlEndpoint-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBasisUrlEndpoint() {
-        return basisUrlEndpoint;
-    }
-
-    /**
-     * Legt den Wert der basisUrlEndpoint-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBasisUrlEndpoint(String value) {
-        this.basisUrlEndpoint = value;
-    }
-
-    /**
-     * Ruft den Wert der artAuthentifizierung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getArtAuthentifizierung() {
-        return artAuthentifizierung;
-    }
-
-    /**
-     * Legt den Wert der artAuthentifizierung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setArtAuthentifizierung(String value) {
-        this.artAuthentifizierung = value;
-    }
-
-    /**
-     * Ruft den Wert der credentials-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CredentialsType }
-     *     
-     */
-    public CredentialsType getCredentials() {
-        return credentials;
-    }
-
-    /**
-     * Legt den Wert der credentials-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CredentialsType }
-     *     
-     */
-    public void setCredentials(CredentialsType value) {
-        this.credentials = value;
-    }
-
-    /**
-     * Ruft den Wert der authorizationFilter-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public AuthorizationFilter getAuthorizationFilter() {
-        return authorizationFilter;
-    }
-
-    /**
-     * Legt den Wert der authorizationFilter-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public void setAuthorizationFilter(AuthorizationFilter value) {
-        this.authorizationFilter = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/DeclareEndpointResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/DeclareEndpointResponseType.java
deleted file mode 100644
index 34564acb..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/DeclareEndpointResponseType.java
+++ /dev/null
@@ -1,99 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ServiceFault;
-
-
-/**
- * Response um als Makler der VU einen Endpoint bekannt zu geben
- * 
- * 
Java-Klasse für DeclareEndpointResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="DeclareEndpointResponse_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="RegistrierteBasisUrlMaklerEndpoint" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <maxLength value="1000"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="ServiceFault" type="{urn:omds3CommonServiceTypes-1-1-0}ServiceFault" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DeclareEndpointResponse_Type", propOrder = {
-    "registrierteBasisUrlMaklerEndpoint",
-    "serviceFault"
-})
-public class DeclareEndpointResponseType {
-
-    @XmlElement(name = "RegistrierteBasisUrlMaklerEndpoint")
-    protected String registrierteBasisUrlMaklerEndpoint;
-    @XmlElement(name = "ServiceFault")
-    protected ServiceFault serviceFault;
-
-    /**
-     * Ruft den Wert der registrierteBasisUrlMaklerEndpoint-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRegistrierteBasisUrlMaklerEndpoint() {
-        return registrierteBasisUrlMaklerEndpoint;
-    }
-
-    /**
-     * Legt den Wert der registrierteBasisUrlMaklerEndpoint-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRegistrierteBasisUrlMaklerEndpoint(String value) {
-        this.registrierteBasisUrlMaklerEndpoint = value;
-    }
-
-    /**
-     * Ruft den Wert der serviceFault-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ServiceFault }
-     *     
-     */
-    public ServiceFault getServiceFault() {
-        return serviceFault;
-    }
-
-    /**
-     * Legt den Wert der serviceFault-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ServiceFault }
-     *     
-     */
-    public void setServiceFault(ServiceFault value) {
-        this.serviceFault = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/DeclareStateChangesRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/DeclareStateChangesRequestType.java
deleted file mode 100644
index bef97b8e..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/DeclareStateChangesRequestType.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-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;
-
-
-/**
- * Typ fuer die Bekanntgabe von Statusänderungen
- * 
- * 
Java-Klasse für DeclareStateChangesRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="DeclareStateChangesRequest_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="StateChange" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen}AbstractStateChangeEvent_Type" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DeclareStateChangesRequest_Type", propOrder = {
-    "stateChange"
-})
-public class DeclareStateChangesRequestType {
-
-    @XmlElement(name = "StateChange", required = true)
-    protected List stateChange;
-
-    /**
-     * Gets the value of the stateChange property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the stateChange property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getStateChange().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link AbstractStateChangeEventType }
-     * 
-     * 
-     */
-    public List getStateChange() {
-        if (stateChange == null) {
-            stateChange = new ArrayList();
-        }
-        return this.stateChange;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/DeclareStateChangesResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/DeclareStateChangesResponseType.java
deleted file mode 100644
index 483616e1..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/DeclareStateChangesResponseType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Typ fuer die Annahme von Statusänderungen
- * 
- * 
Java-Klasse für DeclareStateChangesResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="DeclareStateChangesResponse_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DeclareStateChangesResponse_Type")
-public class DeclareStateChangesResponseType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/DocumentInfosResponseResultType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/DocumentInfosResponseResultType.java
deleted file mode 100644
index 647e74d4..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/DocumentInfosResponseResultType.java
+++ /dev/null
@@ -1,165 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-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 at.vvo.omds.types.omds3Types.r1_7_0.common.DokumentenReferenzType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ZeitraumType;
-
-
-/**
- * Informationen zu einem Dokument
- * 
- * 
Java-Klasse für DocumentInfosResponseResult_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="DocumentInfosResponseResult_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ActualOffset" type="{http://www.w3.org/2001/XMLSchema}unsignedInt"/>
- *         <element name="ActualMaxResults" type="{http://www.w3.org/2001/XMLSchema}unsignedInt"/>
- *         <element name="TotalResults" type="{http://www.w3.org/2001/XMLSchema}unsignedInt"/>
- *         <element name="DokumentInfos" type="{urn:omds3CommonServiceTypes-1-1-0}DokumentenReferenz_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Zeitraum" type="{urn:omds3CommonServiceTypes-1-1-0}Zeitraum_Type"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DocumentInfosResponseResult_Type", propOrder = {
-    "actualOffset",
-    "actualMaxResults",
-    "totalResults",
-    "dokumentInfos",
-    "zeitraum"
-})
-public class DocumentInfosResponseResultType {
-
-    @XmlElement(name = "ActualOffset")
-    @XmlSchemaType(name = "unsignedInt")
-    protected long actualOffset;
-    @XmlElement(name = "ActualMaxResults")
-    @XmlSchemaType(name = "unsignedInt")
-    protected long actualMaxResults;
-    @XmlElement(name = "TotalResults")
-    @XmlSchemaType(name = "unsignedInt")
-    protected long totalResults;
-    @XmlElement(name = "DokumentInfos")
-    protected List dokumentInfos;
-    @XmlElement(name = "Zeitraum", required = true)
-    protected ZeitraumType zeitraum;
-
-    /**
-     * Ruft den Wert der actualOffset-Eigenschaft ab.
-     * 
-     */
-    public long getActualOffset() {
-        return actualOffset;
-    }
-
-    /**
-     * Legt den Wert der actualOffset-Eigenschaft fest.
-     * 
-     */
-    public void setActualOffset(long value) {
-        this.actualOffset = value;
-    }
-
-    /**
-     * Ruft den Wert der actualMaxResults-Eigenschaft ab.
-     * 
-     */
-    public long getActualMaxResults() {
-        return actualMaxResults;
-    }
-
-    /**
-     * Legt den Wert der actualMaxResults-Eigenschaft fest.
-     * 
-     */
-    public void setActualMaxResults(long value) {
-        this.actualMaxResults = value;
-    }
-
-    /**
-     * Ruft den Wert der totalResults-Eigenschaft ab.
-     * 
-     */
-    public long getTotalResults() {
-        return totalResults;
-    }
-
-    /**
-     * Legt den Wert der totalResults-Eigenschaft fest.
-     * 
-     */
-    public void setTotalResults(long value) {
-        this.totalResults = value;
-    }
-
-    /**
-     * Gets the value of the dokumentInfos property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the dokumentInfos property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDokumentInfos().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link DokumentenReferenzType }
-     * 
-     * 
-     */
-    public List getDokumentInfos() {
-        if (dokumentInfos == null) {
-            dokumentInfos = new ArrayList();
-        }
-        return this.dokumentInfos;
-    }
-
-    /**
-     * Ruft den Wert der zeitraum-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ZeitraumType }
-     *     
-     */
-    public ZeitraumType getZeitraum() {
-        return zeitraum;
-    }
-
-    /**
-     * Legt den Wert der zeitraum-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ZeitraumType }
-     *     
-     */
-    public void setZeitraum(ZeitraumType value) {
-        this.zeitraum = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetDocumentsOfObjectRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetDocumentsOfObjectRequestType.java
deleted file mode 100644
index 120fb59d..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetDocumentsOfObjectRequestType.java
+++ /dev/null
@@ -1,272 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-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 at.vvo.omds.types.omds3Types.r1_7_0.common.AuthorizationFilter;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektSpezifikationType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ZeitraumType;
-
-
-/**
- * Typ mit Elementen fuer die Anfrage nach Dokumenten zu einem fachlichen Objekt
- * 
- * 
Java-Klasse für GetDocumentsOfObjectRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GetDocumentsOfObjectRequest_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="VUNr" type="{urn:omds20}VUNr"/>
- *         <element name="AuthFilter" type="{urn:omds3CommonServiceTypes-1-1-0}AuthorizationFilter" minOccurs="0"/>
- *         <element name="ObjektSpezifikation" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektSpezifikation_Type"/>
- *         <element name="Zeitraum" type="{urn:omds3CommonServiceTypes-1-1-0}Zeitraum_Type" minOccurs="0"/>
- *         <element name="DokumentType" type="{urn:omds3CommonServiceTypes-1-1-0}DocumentType" minOccurs="0"/>
- *         <element name="MaxResults" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/>
- *         <element name="Offset" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/>
- *         <element name="OrderBy" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <enumeration value="Erstellungsdatum aufsteigend"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GetDocumentsOfObjectRequest_Type", propOrder = {
-    "vuNr",
-    "authFilter",
-    "objektSpezifikation",
-    "zeitraum",
-    "dokumentType",
-    "maxResults",
-    "offset",
-    "orderBy"
-})
-public class GetDocumentsOfObjectRequestType {
-
-    @XmlElement(name = "VUNr", required = true)
-    protected String vuNr;
-    @XmlElement(name = "AuthFilter")
-    protected AuthorizationFilter authFilter;
-    @XmlElement(name = "ObjektSpezifikation", required = true)
-    protected ObjektSpezifikationType objektSpezifikation;
-    @XmlElement(name = "Zeitraum")
-    protected ZeitraumType zeitraum;
-    @XmlElement(name = "DokumentType")
-    protected Integer dokumentType;
-    @XmlElement(name = "MaxResults")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer maxResults;
-    @XmlElement(name = "Offset")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer offset;
-    @XmlElement(name = "OrderBy")
-    protected String orderBy;
-
-    /**
-     * Ruft den Wert der vuNr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVUNr() {
-        return vuNr;
-    }
-
-    /**
-     * Legt den Wert der vuNr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVUNr(String value) {
-        this.vuNr = value;
-    }
-
-    /**
-     * Ruft den Wert der authFilter-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public AuthorizationFilter getAuthFilter() {
-        return authFilter;
-    }
-
-    /**
-     * Legt den Wert der authFilter-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public void setAuthFilter(AuthorizationFilter value) {
-        this.authFilter = value;
-    }
-
-    /**
-     * Ruft den Wert der objektSpezifikation-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektSpezifikationType }
-     *     
-     */
-    public ObjektSpezifikationType getObjektSpezifikation() {
-        return objektSpezifikation;
-    }
-
-    /**
-     * Legt den Wert der objektSpezifikation-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektSpezifikationType }
-     *     
-     */
-    public void setObjektSpezifikation(ObjektSpezifikationType value) {
-        this.objektSpezifikation = value;
-    }
-
-    /**
-     * Ruft den Wert der zeitraum-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ZeitraumType }
-     *     
-     */
-    public ZeitraumType getZeitraum() {
-        return zeitraum;
-    }
-
-    /**
-     * Legt den Wert der zeitraum-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ZeitraumType }
-     *     
-     */
-    public void setZeitraum(ZeitraumType value) {
-        this.zeitraum = value;
-    }
-
-    /**
-     * Ruft den Wert der dokumentType-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getDokumentType() {
-        return dokumentType;
-    }
-
-    /**
-     * Legt den Wert der dokumentType-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setDokumentType(Integer value) {
-        this.dokumentType = value;
-    }
-
-    /**
-     * Ruft den Wert der maxResults-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getMaxResults() {
-        return maxResults;
-    }
-
-    /**
-     * Legt den Wert der maxResults-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setMaxResults(Integer value) {
-        this.maxResults = value;
-    }
-
-    /**
-     * Ruft den Wert der offset-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getOffset() {
-        return offset;
-    }
-
-    /**
-     * Legt den Wert der offset-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setOffset(Integer value) {
-        this.offset = value;
-    }
-
-    /**
-     * Ruft den Wert der orderBy-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderBy() {
-        return orderBy;
-    }
-
-    /**
-     * Legt den Wert der orderBy-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderBy(String value) {
-        this.orderBy = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetDocumentsOfObjectResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetDocumentsOfObjectResponseType.java
deleted file mode 100644
index 510e40a1..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetDocumentsOfObjectResponseType.java
+++ /dev/null
@@ -1,100 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ServiceFault;
-
-
-/**
- * Typ mit Informationen zu den Dokumenten eines fachlichen Objekts.
- * 
- * 
Java-Klasse für GetDocumentsOfObjectResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GetDocumentsOfObjectResponse_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="Result" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen}DocumentInfosResponseResult_Type"/>
- *         <element name="ServiceFault" type="{urn:omds3CommonServiceTypes-1-1-0}ServiceFault" maxOccurs="unbounded"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GetDocumentsOfObjectResponse_Type", propOrder = {
-    "result",
-    "serviceFault"
-})
-public class GetDocumentsOfObjectResponseType {
-
-    @XmlElement(name = "Result")
-    protected DocumentInfosResponseResultType result;
-    @XmlElement(name = "ServiceFault")
-    protected List serviceFault;
-
-    /**
-     * Ruft den Wert der result-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DocumentInfosResponseResultType }
-     *     
-     */
-    public DocumentInfosResponseResultType getResult() {
-        return result;
-    }
-
-    /**
-     * Legt den Wert der result-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DocumentInfosResponseResultType }
-     *     
-     */
-    public void setResult(DocumentInfosResponseResultType value) {
-        this.result = value;
-    }
-
-    /**
-     * Gets the value of the serviceFault property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the serviceFault property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getServiceFault().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ServiceFault }
-     * 
-     * 
-     */
-    public List getServiceFault() {
-        if (serviceFault == null) {
-            serviceFault = new ArrayList();
-        }
-        return this.serviceFault;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetDocumentsOfPeriodRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetDocumentsOfPeriodRequestType.java
deleted file mode 100644
index 2b50d004..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetDocumentsOfPeriodRequestType.java
+++ /dev/null
@@ -1,272 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-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 at.vvo.omds.types.omds3Types.r1_7_0.common.AuthorizationFilter;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektSpezifikationType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ZeitraumType;
-
-
-/**
- * Typ mit Elementen fuer die Anfrage nach Dokumenten eines Zeitraums
- * 
- * 
Java-Klasse für GetDocumentsOfPeriodRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GetDocumentsOfPeriodRequest_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="VUNr" type="{urn:omds20}VUNr"/>
- *         <element name="AuthFilter" type="{urn:omds3CommonServiceTypes-1-1-0}AuthorizationFilter" minOccurs="0"/>
- *         <element name="ObjektSpezifikation" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektSpezifikation_Type" minOccurs="0"/>
- *         <element name="Zeitraum" type="{urn:omds3CommonServiceTypes-1-1-0}Zeitraum_Type"/>
- *         <element name="DokumentType" type="{urn:omds3CommonServiceTypes-1-1-0}DocumentType" minOccurs="0"/>
- *         <element name="MaxResults" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/>
- *         <element name="Offset" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/>
- *         <element name="OrderBy" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <enumeration value="Erstellungsdatum aufsteigend"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GetDocumentsOfPeriodRequest_Type", propOrder = {
-    "vuNr",
-    "authFilter",
-    "objektSpezifikation",
-    "zeitraum",
-    "dokumentType",
-    "maxResults",
-    "offset",
-    "orderBy"
-})
-public class GetDocumentsOfPeriodRequestType {
-
-    @XmlElement(name = "VUNr", required = true)
-    protected String vuNr;
-    @XmlElement(name = "AuthFilter")
-    protected AuthorizationFilter authFilter;
-    @XmlElement(name = "ObjektSpezifikation")
-    protected ObjektSpezifikationType objektSpezifikation;
-    @XmlElement(name = "Zeitraum", required = true)
-    protected ZeitraumType zeitraum;
-    @XmlElement(name = "DokumentType")
-    protected Integer dokumentType;
-    @XmlElement(name = "MaxResults")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer maxResults;
-    @XmlElement(name = "Offset")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer offset;
-    @XmlElement(name = "OrderBy")
-    protected String orderBy;
-
-    /**
-     * Ruft den Wert der vuNr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVUNr() {
-        return vuNr;
-    }
-
-    /**
-     * Legt den Wert der vuNr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVUNr(String value) {
-        this.vuNr = value;
-    }
-
-    /**
-     * Ruft den Wert der authFilter-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public AuthorizationFilter getAuthFilter() {
-        return authFilter;
-    }
-
-    /**
-     * Legt den Wert der authFilter-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public void setAuthFilter(AuthorizationFilter value) {
-        this.authFilter = value;
-    }
-
-    /**
-     * Ruft den Wert der objektSpezifikation-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektSpezifikationType }
-     *     
-     */
-    public ObjektSpezifikationType getObjektSpezifikation() {
-        return objektSpezifikation;
-    }
-
-    /**
-     * Legt den Wert der objektSpezifikation-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektSpezifikationType }
-     *     
-     */
-    public void setObjektSpezifikation(ObjektSpezifikationType value) {
-        this.objektSpezifikation = value;
-    }
-
-    /**
-     * Ruft den Wert der zeitraum-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ZeitraumType }
-     *     
-     */
-    public ZeitraumType getZeitraum() {
-        return zeitraum;
-    }
-
-    /**
-     * Legt den Wert der zeitraum-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ZeitraumType }
-     *     
-     */
-    public void setZeitraum(ZeitraumType value) {
-        this.zeitraum = value;
-    }
-
-    /**
-     * Ruft den Wert der dokumentType-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getDokumentType() {
-        return dokumentType;
-    }
-
-    /**
-     * Legt den Wert der dokumentType-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setDokumentType(Integer value) {
-        this.dokumentType = value;
-    }
-
-    /**
-     * Ruft den Wert der maxResults-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getMaxResults() {
-        return maxResults;
-    }
-
-    /**
-     * Legt den Wert der maxResults-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setMaxResults(Integer value) {
-        this.maxResults = value;
-    }
-
-    /**
-     * Ruft den Wert der offset-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getOffset() {
-        return offset;
-    }
-
-    /**
-     * Legt den Wert der offset-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setOffset(Integer value) {
-        this.offset = value;
-    }
-
-    /**
-     * Ruft den Wert der orderBy-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderBy() {
-        return orderBy;
-    }
-
-    /**
-     * Legt den Wert der orderBy-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderBy(String value) {
-        this.orderBy = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetDocumentsOfPeriodResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetDocumentsOfPeriodResponseType.java
deleted file mode 100644
index b29d43a8..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetDocumentsOfPeriodResponseType.java
+++ /dev/null
@@ -1,100 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ServiceFault;
-
-
-/**
- * Typ mit Informationen zu den Dokumenten eines Zeitraums
- * 
- * 
Java-Klasse für GetDocumentsOfPeriodResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GetDocumentsOfPeriodResponse_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="Result" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen}DocumentInfosResponseResult_Type"/>
- *         <element name="ServiceFault" type="{urn:omds3CommonServiceTypes-1-1-0}ServiceFault" maxOccurs="unbounded"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GetDocumentsOfPeriodResponse_Type", propOrder = {
-    "result",
-    "serviceFault"
-})
-public class GetDocumentsOfPeriodResponseType {
-
-    @XmlElement(name = "Result")
-    protected DocumentInfosResponseResultType result;
-    @XmlElement(name = "ServiceFault")
-    protected List serviceFault;
-
-    /**
-     * Ruft den Wert der result-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DocumentInfosResponseResultType }
-     *     
-     */
-    public DocumentInfosResponseResultType getResult() {
-        return result;
-    }
-
-    /**
-     * Legt den Wert der result-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DocumentInfosResponseResultType }
-     *     
-     */
-    public void setResult(DocumentInfosResponseResultType value) {
-        this.result = value;
-    }
-
-    /**
-     * Gets the value of the serviceFault property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the serviceFault property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getServiceFault().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ServiceFault }
-     * 
-     * 
-     */
-    public List getServiceFault() {
-        if (serviceFault == null) {
-            serviceFault = new ArrayList();
-        }
-        return this.serviceFault;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetElementListRequest.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetElementListRequest.java
deleted file mode 100644
index a6808539..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetElementListRequest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element name="ListCd" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Context" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "listCd",
-    "context"
-})
-@XmlRootElement(name = "GetElementListRequest")
-public class GetElementListRequest
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "ListCd", required = true)
-    protected String listCd;
-    @XmlElement(name = "Context")
-    protected String context;
-
-    /**
-     * Ruft den Wert der listCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getListCd() {
-        return listCd;
-    }
-
-    /**
-     * Legt den Wert der listCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setListCd(String value) {
-        this.listCd = value;
-    }
-
-    /**
-     * Ruft den Wert der context-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getContext() {
-        return context;
-    }
-
-    /**
-     * Legt den Wert der context-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setContext(String value) {
-        this.context = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetElementListResponse.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetElementListResponse.java
deleted file mode 100644
index 11188ca1..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetElementListResponse.java
+++ /dev/null
@@ -1,161 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-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.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.EintragSchluessellisteType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence>
- *         <element name="Bezeichnung" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="BeschreibungTxt" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Values" type="{urn:omds3CommonServiceTypes-1-1-0}EintragSchluesselliste_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="MinAnz" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "bezeichnung",
-    "beschreibungTxt",
-    "values",
-    "minAnz"
-})
-@XmlRootElement(name = "GetElementListResponse")
-public class GetElementListResponse
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "Bezeichnung", required = true)
-    protected String bezeichnung;
-    @XmlElement(name = "BeschreibungTxt")
-    protected String beschreibungTxt;
-    @XmlElement(name = "Values")
-    protected List values;
-    @XmlElement(name = "MinAnz")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer minAnz;
-
-    /**
-     * Ruft den Wert der bezeichnung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBezeichnung() {
-        return bezeichnung;
-    }
-
-    /**
-     * Legt den Wert der bezeichnung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBezeichnung(String value) {
-        this.bezeichnung = value;
-    }
-
-    /**
-     * Ruft den Wert der beschreibungTxt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBeschreibungTxt() {
-        return beschreibungTxt;
-    }
-
-    /**
-     * Legt den Wert der beschreibungTxt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBeschreibungTxt(String value) {
-        this.beschreibungTxt = value;
-    }
-
-    /**
-     * Gets the value of the values property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the values property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getValues().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link EintragSchluessellisteType }
-     * 
-     * 
-     */
-    public List getValues() {
-        if (values == null) {
-            values = new ArrayList();
-        }
-        return this.values;
-    }
-
-    /**
-     * Ruft den Wert der minAnz-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getMinAnz() {
-        return minAnz;
-    }
-
-    /**
-     * Legt den Wert der minAnz-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setMinAnz(Integer value) {
-        this.minAnz = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetNumberOfDocumentsRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetNumberOfDocumentsRequestType.java
deleted file mode 100644
index f28593e8..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetNumberOfDocumentsRequestType.java
+++ /dev/null
@@ -1,179 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AuthorizationFilter;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektSpezifikationType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ZeitraumType;
-
-
-/**
- * Dieser Typ enthält die Elemente fuer die Anfrage nach Dokumenten
- * 
- * 
Java-Klasse für GetNumberOfDocumentsRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GetNumberOfDocumentsRequest_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="VUNr" type="{urn:omds20}VUNr"/>
- *         <element name="AuthFilter" type="{urn:omds3CommonServiceTypes-1-1-0}AuthorizationFilter" minOccurs="0"/>
- *         <element name="ObjektSpezifikation" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektSpezifikation_Type"/>
- *         <element name="Zeitraum" type="{urn:omds3CommonServiceTypes-1-1-0}Zeitraum_Type" minOccurs="0"/>
- *         <element name="DokumentType" type="{urn:omds3CommonServiceTypes-1-1-0}DocumentType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GetNumberOfDocumentsRequest_Type", propOrder = {
-    "vuNr",
-    "authFilter",
-    "objektSpezifikation",
-    "zeitraum",
-    "dokumentType"
-})
-public class GetNumberOfDocumentsRequestType {
-
-    @XmlElement(name = "VUNr", required = true)
-    protected String vuNr;
-    @XmlElement(name = "AuthFilter")
-    protected AuthorizationFilter authFilter;
-    @XmlElement(name = "ObjektSpezifikation", required = true)
-    protected ObjektSpezifikationType objektSpezifikation;
-    @XmlElement(name = "Zeitraum")
-    protected ZeitraumType zeitraum;
-    @XmlElement(name = "DokumentType")
-    protected Integer dokumentType;
-
-    /**
-     * Ruft den Wert der vuNr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVUNr() {
-        return vuNr;
-    }
-
-    /**
-     * Legt den Wert der vuNr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVUNr(String value) {
-        this.vuNr = value;
-    }
-
-    /**
-     * Ruft den Wert der authFilter-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public AuthorizationFilter getAuthFilter() {
-        return authFilter;
-    }
-
-    /**
-     * Legt den Wert der authFilter-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public void setAuthFilter(AuthorizationFilter value) {
-        this.authFilter = value;
-    }
-
-    /**
-     * Ruft den Wert der objektSpezifikation-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektSpezifikationType }
-     *     
-     */
-    public ObjektSpezifikationType getObjektSpezifikation() {
-        return objektSpezifikation;
-    }
-
-    /**
-     * Legt den Wert der objektSpezifikation-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektSpezifikationType }
-     *     
-     */
-    public void setObjektSpezifikation(ObjektSpezifikationType value) {
-        this.objektSpezifikation = value;
-    }
-
-    /**
-     * Ruft den Wert der zeitraum-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ZeitraumType }
-     *     
-     */
-    public ZeitraumType getZeitraum() {
-        return zeitraum;
-    }
-
-    /**
-     * Legt den Wert der zeitraum-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ZeitraumType }
-     *     
-     */
-    public void setZeitraum(ZeitraumType value) {
-        this.zeitraum = value;
-    }
-
-    /**
-     * Ruft den Wert der dokumentType-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getDokumentType() {
-        return dokumentType;
-    }
-
-    /**
-     * Legt den Wert der dokumentType-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setDokumentType(Integer value) {
-        this.dokumentType = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetNumberOfDocumentsResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetNumberOfDocumentsResponseType.java
deleted file mode 100644
index 63a9dd81..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetNumberOfDocumentsResponseType.java
+++ /dev/null
@@ -1,96 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-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 at.vvo.omds.types.omds3Types.r1_7_0.common.ServiceFault;
-
-
-/**
- * Typ mit Informationen zu den Dokumenten eines fachlichen Objekts
- * 
- * 
Java-Klasse für GetNumberOfDocumentsResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GetNumberOfDocumentsResponse_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="AnzDokumente" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"/>
- *         <element name="ServiceFault" type="{urn:omds3CommonServiceTypes-1-1-0}ServiceFault"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GetNumberOfDocumentsResponse_Type", propOrder = {
-    "anzDokumente",
-    "serviceFault"
-})
-public class GetNumberOfDocumentsResponseType {
-
-    @XmlElement(name = "AnzDokumente")
-    @XmlSchemaType(name = "nonNegativeInteger")
-    protected BigInteger anzDokumente;
-    @XmlElement(name = "ServiceFault")
-    protected ServiceFault serviceFault;
-
-    /**
-     * Ruft den Wert der anzDokumente-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getAnzDokumente() {
-        return anzDokumente;
-    }
-
-    /**
-     * Legt den Wert der anzDokumente-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setAnzDokumente(BigInteger value) {
-        this.anzDokumente = value;
-    }
-
-    /**
-     * Ruft den Wert der serviceFault-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ServiceFault }
-     *     
-     */
-    public ServiceFault getServiceFault() {
-        return serviceFault;
-    }
-
-    /**
-     * Legt den Wert der serviceFault-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ServiceFault }
-     *     
-     */
-    public void setServiceFault(ServiceFault value) {
-        this.serviceFault = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetStateChangesRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetStateChangesRequestType.java
deleted file mode 100644
index d2e5e3e5..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetStateChangesRequestType.java
+++ /dev/null
@@ -1,70 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-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 at.vvo.omds.types.omds3Types.r1_7_0.common.CommonSearchRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.GeschaeftsobjektArtType;
-
-
-/**
- * Typ des Requestobjektes um Geschäftsfalle abzuholen
- * 
- * 
Java-Klasse für GetStateChangesRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GetStateChangesRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonSearchRequest_Type">
- *       <sequence>
- *         <element name="GeschaeftsobjektArt" type="{urn:omds3CommonServiceTypes-1-1-0}GeschaeftsobjektArt_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GetStateChangesRequest_Type", propOrder = {
-    "geschaeftsobjektArt"
-})
-public class GetStateChangesRequestType
-    extends CommonSearchRequestType
-{
-
-    @XmlElement(name = "GeschaeftsobjektArt")
-    @XmlSchemaType(name = "string")
-    protected GeschaeftsobjektArtType geschaeftsobjektArt;
-
-    /**
-     * Ruft den Wert der geschaeftsobjektArt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GeschaeftsobjektArtType }
-     *     
-     */
-    public GeschaeftsobjektArtType getGeschaeftsobjektArt() {
-        return geschaeftsobjektArt;
-    }
-
-    /**
-     * Legt den Wert der geschaeftsobjektArt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GeschaeftsobjektArtType }
-     *     
-     */
-    public void setGeschaeftsobjektArt(GeschaeftsobjektArtType value) {
-        this.geschaeftsobjektArt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetStateChangesResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetStateChangesResponseType.java
deleted file mode 100644
index 2f5eeba1..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetStateChangesResponseType.java
+++ /dev/null
@@ -1,74 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonSearchResponseType;
-
-
-/**
- * Typ des Responseobjektes um Geschäftsfalle abzuholen
- * 
- * 
Java-Klasse für GetStateChangesResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GetStateChangesResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonSearchResponse_Type">
- *       <sequence>
- *         <element name="Event" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen}AbstractStateChangeEvent_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GetStateChangesResponse_Type", propOrder = {
-    "event"
-})
-public class GetStateChangesResponseType
-    extends CommonSearchResponseType
-{
-
-    @XmlElement(name = "Event")
-    protected List event;
-
-    /**
-     * Gets the value of the event property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the event property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getEvent().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link AbstractStateChangeEventType }
-     * 
-     * 
-     */
-    public List getEvent() {
-        if (event == null) {
-            event = new ArrayList();
-        }
-        return this.event;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetStateSignaturesRequest.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetStateSignaturesRequest.java
deleted file mode 100644
index c13140fa..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetStateSignaturesRequest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element name="Geschaeftsfallnummer" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "geschaeftsfallnummer"
-})
-@XmlRootElement(name = "GetStateSignaturesRequest")
-public class GetStateSignaturesRequest
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "Geschaeftsfallnummer", required = true)
-    protected ObjektIdType geschaeftsfallnummer;
-
-    /**
-     * Ruft den Wert der geschaeftsfallnummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getGeschaeftsfallnummer() {
-        return geschaeftsfallnummer;
-    }
-
-    /**
-     * Legt den Wert der geschaeftsfallnummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setGeschaeftsfallnummer(ObjektIdType value) {
-        this.geschaeftsfallnummer = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetStateSignaturesResponse.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetStateSignaturesResponse.java
deleted file mode 100644
index 94bf34ed..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/GetStateSignaturesResponse.java
+++ /dev/null
@@ -1,74 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-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.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence>
- *         <element name="ProzessDokumentStatus" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen}ProzessDokumentStatus_Type" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "prozessDokumentStatus"
-})
-@XmlRootElement(name = "GetStateSignaturesResponse")
-public class GetStateSignaturesResponse
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "ProzessDokumentStatus", required = true)
-    protected List prozessDokumentStatus;
-
-    /**
-     * Gets the value of the prozessDokumentStatus property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the prozessDokumentStatus property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getProzessDokumentStatus().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ProzessDokumentStatusType }
-     * 
-     * 
-     */
-    public List getProzessDokumentStatus() {
-        if (prozessDokumentStatus == null) {
-            prozessDokumentStatus = new ArrayList();
-        }
-        return this.prozessDokumentStatus;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/ObjectFactory.java
deleted file mode 100644
index 08777375..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/ObjectFactory.java
+++ /dev/null
@@ -1,461 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-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 at.vvo.omds.types.omds3Types.r1_7_0.on1basis package. 
- * 
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 _GetStateChangesRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", "GetStateChangesRequest");
-    private final static QName _GetStateChangesResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", "GetStateChangesResponse");
-    private final static QName _DeclareStateChangesRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", "DeclareStateChangesRequest");
-    private final static QName _DeclareStateChangesResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", "DeclareStateChangesResponse");
-    private final static QName _AddDocToBusinessCaseRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", "AddDocToBusinessCaseRequest");
-    private final static QName _AddDocToBusinessCaseResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", "AddDocToBusinessCaseResponse");
-    private final static QName _GetNumberOfDocumentsRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", "GetNumberOfDocumentsRequest");
-    private final static QName _GetNumberOfDocumentsResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", "GetNumberOfDocumentsResponse");
-    private final static QName _GetDocumentsOfObjectRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", "GetDocumentsOfObjectRequest");
-    private final static QName _GetDocumentsOfObjectResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", "GetDocumentsOfObjectResponse");
-    private final static QName _GetDocumentsOfPeriodRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", "GetDocumentsOfPeriodRequest");
-    private final static QName _GetDocumentsOfPeriodResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", "GetDocumentsOfPeriodResponse");
-    private final static QName _DeclareEndpointRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", "DeclareEndpointRequest");
-    private final static QName _ArtAuthentifizierung_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", "ArtAuthentifizierung");
-    private final static QName _DeclareEndpointResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", "DeclareEndpointResponse");
-    private final static QName _SecurityContextTokenRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", "SecurityContextTokenRequest");
-    private final static QName _SecurityContextTokenResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", "SecurityContextTokenResponse");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.vvo.omds.types.omds3Types.r1_7_0.on1basis
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link ProzessDokumentStatusType }
-     * 
-     */
-    public ProzessDokumentStatusType createProzessDokumentStatusType() {
-        return new ProzessDokumentStatusType();
-    }
-
-    /**
-     * Create an instance of {@link GetStateChangesRequestType }
-     * 
-     */
-    public GetStateChangesRequestType createGetStateChangesRequestType() {
-        return new GetStateChangesRequestType();
-    }
-
-    /**
-     * Create an instance of {@link GetStateChangesResponseType }
-     * 
-     */
-    public GetStateChangesResponseType createGetStateChangesResponseType() {
-        return new GetStateChangesResponseType();
-    }
-
-    /**
-     * Create an instance of {@link DeclareStateChangesRequestType }
-     * 
-     */
-    public DeclareStateChangesRequestType createDeclareStateChangesRequestType() {
-        return new DeclareStateChangesRequestType();
-    }
-
-    /**
-     * Create an instance of {@link DeclareStateChangesResponseType }
-     * 
-     */
-    public DeclareStateChangesResponseType createDeclareStateChangesResponseType() {
-        return new DeclareStateChangesResponseType();
-    }
-
-    /**
-     * Create an instance of {@link AddDocToBusinessCaseRequestType }
-     * 
-     */
-    public AddDocToBusinessCaseRequestType createAddDocToBusinessCaseRequestType() {
-        return new AddDocToBusinessCaseRequestType();
-    }
-
-    /**
-     * Create an instance of {@link AddDocToBusinessCaseResponseType }
-     * 
-     */
-    public AddDocToBusinessCaseResponseType createAddDocToBusinessCaseResponseType() {
-        return new AddDocToBusinessCaseResponseType();
-    }
-
-    /**
-     * Create an instance of {@link GetNumberOfDocumentsRequestType }
-     * 
-     */
-    public GetNumberOfDocumentsRequestType createGetNumberOfDocumentsRequestType() {
-        return new GetNumberOfDocumentsRequestType();
-    }
-
-    /**
-     * Create an instance of {@link GetNumberOfDocumentsResponseType }
-     * 
-     */
-    public GetNumberOfDocumentsResponseType createGetNumberOfDocumentsResponseType() {
-        return new GetNumberOfDocumentsResponseType();
-    }
-
-    /**
-     * Create an instance of {@link GetDocumentsOfObjectRequestType }
-     * 
-     */
-    public GetDocumentsOfObjectRequestType createGetDocumentsOfObjectRequestType() {
-        return new GetDocumentsOfObjectRequestType();
-    }
-
-    /**
-     * Create an instance of {@link GetDocumentsOfObjectResponseType }
-     * 
-     */
-    public GetDocumentsOfObjectResponseType createGetDocumentsOfObjectResponseType() {
-        return new GetDocumentsOfObjectResponseType();
-    }
-
-    /**
-     * Create an instance of {@link GetDocumentsOfPeriodRequestType }
-     * 
-     */
-    public GetDocumentsOfPeriodRequestType createGetDocumentsOfPeriodRequestType() {
-        return new GetDocumentsOfPeriodRequestType();
-    }
-
-    /**
-     * Create an instance of {@link GetDocumentsOfPeriodResponseType }
-     * 
-     */
-    public GetDocumentsOfPeriodResponseType createGetDocumentsOfPeriodResponseType() {
-        return new GetDocumentsOfPeriodResponseType();
-    }
-
-    /**
-     * Create an instance of {@link DeclareEndpointRequestType }
-     * 
-     */
-    public DeclareEndpointRequestType createDeclareEndpointRequestType() {
-        return new DeclareEndpointRequestType();
-    }
-
-    /**
-     * Create an instance of {@link DeclareEndpointResponseType }
-     * 
-     */
-    public DeclareEndpointResponseType createDeclareEndpointResponseType() {
-        return new DeclareEndpointResponseType();
-    }
-
-    /**
-     * Create an instance of {@link SecurityContextTokenRequestType }
-     * 
-     */
-    public SecurityContextTokenRequestType createSecurityContextTokenRequestType() {
-        return new SecurityContextTokenRequestType();
-    }
-
-    /**
-     * Create an instance of {@link SecurityContextTokenResponseType }
-     * 
-     */
-    public SecurityContextTokenResponseType createSecurityContextTokenResponseType() {
-        return new SecurityContextTokenResponseType();
-    }
-
-    /**
-     * Create an instance of {@link GetStateSignaturesRequest }
-     * 
-     */
-    public GetStateSignaturesRequest createGetStateSignaturesRequest() {
-        return new GetStateSignaturesRequest();
-    }
-
-    /**
-     * Create an instance of {@link GetStateSignaturesResponse }
-     * 
-     */
-    public GetStateSignaturesResponse createGetStateSignaturesResponse() {
-        return new GetStateSignaturesResponse();
-    }
-
-    /**
-     * Create an instance of {@link GetElementListRequest }
-     * 
-     */
-    public GetElementListRequest createGetElementListRequest() {
-        return new GetElementListRequest();
-    }
-
-    /**
-     * Create an instance of {@link GetElementListResponse }
-     * 
-     */
-    public GetElementListResponse createGetElementListResponse() {
-        return new GetElementListResponse();
-    }
-
-    /**
-     * Create an instance of {@link CreateFormRequest }
-     * 
-     */
-    public CreateFormRequest createCreateFormRequest() {
-        return new CreateFormRequest();
-    }
-
-    /**
-     * Create an instance of {@link CreateFormResponse }
-     * 
-     */
-    public CreateFormResponse createCreateFormResponse() {
-        return new CreateFormResponse();
-    }
-
-    /**
-     * Create an instance of {@link SubmitFormRequest }
-     * 
-     */
-    public SubmitFormRequest createSubmitFormRequest() {
-        return new SubmitFormRequest();
-    }
-
-    /**
-     * Create an instance of {@link SubmitFormResponse }
-     * 
-     */
-    public SubmitFormResponse createSubmitFormResponse() {
-        return new SubmitFormResponse();
-    }
-
-    /**
-     * Create an instance of {@link UnderwriteDocumentRequest }
-     * 
-     */
-    public UnderwriteDocumentRequest createUnderwriteDocumentRequest() {
-        return new UnderwriteDocumentRequest();
-    }
-
-    /**
-     * Create an instance of {@link UnderwriteDocumentResponse }
-     * 
-     */
-    public UnderwriteDocumentResponse createUnderwriteDocumentResponse() {
-        return new UnderwriteDocumentResponse();
-    }
-
-    /**
-     * Create an instance of {@link StateChangeEventType }
-     * 
-     */
-    public StateChangeEventType createStateChangeEventType() {
-        return new StateChangeEventType();
-    }
-
-    /**
-     * Create an instance of {@link StatusAntragsGeschaeftsfall }
-     * 
-     */
-    public StatusAntragsGeschaeftsfall createStatusAntragsGeschaeftsfall() {
-        return new StatusAntragsGeschaeftsfall();
-    }
-
-    /**
-     * Create an instance of {@link DocumentInfosResponseResultType }
-     * 
-     */
-    public DocumentInfosResponseResultType createDocumentInfosResponseResultType() {
-        return new DocumentInfosResponseResultType();
-    }
-
-    /**
-     * Create an instance of {@link UsernamePasswordCredentialsType }
-     * 
-     */
-    public UsernamePasswordCredentialsType createUsernamePasswordCredentialsType() {
-        return new UsernamePasswordCredentialsType();
-    }
-
-    /**
-     * Create an instance of {@link ProzessDokumentStatusType.Autorisierungen }
-     * 
-     */
-    public ProzessDokumentStatusType.Autorisierungen createProzessDokumentStatusTypeAutorisierungen() {
-        return new ProzessDokumentStatusType.Autorisierungen();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetStateChangesRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", name = "GetStateChangesRequest")
-    public JAXBElement createGetStateChangesRequest(GetStateChangesRequestType value) {
-        return new JAXBElement(_GetStateChangesRequest_QNAME, GetStateChangesRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetStateChangesResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", name = "GetStateChangesResponse")
-    public JAXBElement createGetStateChangesResponse(GetStateChangesResponseType value) {
-        return new JAXBElement(_GetStateChangesResponse_QNAME, GetStateChangesResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeclareStateChangesRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", name = "DeclareStateChangesRequest")
-    public JAXBElement createDeclareStateChangesRequest(DeclareStateChangesRequestType value) {
-        return new JAXBElement(_DeclareStateChangesRequest_QNAME, DeclareStateChangesRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeclareStateChangesResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", name = "DeclareStateChangesResponse")
-    public JAXBElement createDeclareStateChangesResponse(DeclareStateChangesResponseType value) {
-        return new JAXBElement(_DeclareStateChangesResponse_QNAME, DeclareStateChangesResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AddDocToBusinessCaseRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", name = "AddDocToBusinessCaseRequest")
-    public JAXBElement createAddDocToBusinessCaseRequest(AddDocToBusinessCaseRequestType value) {
-        return new JAXBElement(_AddDocToBusinessCaseRequest_QNAME, AddDocToBusinessCaseRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AddDocToBusinessCaseResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", name = "AddDocToBusinessCaseResponse")
-    public JAXBElement createAddDocToBusinessCaseResponse(AddDocToBusinessCaseResponseType value) {
-        return new JAXBElement(_AddDocToBusinessCaseResponse_QNAME, AddDocToBusinessCaseResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetNumberOfDocumentsRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", name = "GetNumberOfDocumentsRequest")
-    public JAXBElement createGetNumberOfDocumentsRequest(GetNumberOfDocumentsRequestType value) {
-        return new JAXBElement(_GetNumberOfDocumentsRequest_QNAME, GetNumberOfDocumentsRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetNumberOfDocumentsResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", name = "GetNumberOfDocumentsResponse")
-    public JAXBElement createGetNumberOfDocumentsResponse(GetNumberOfDocumentsResponseType value) {
-        return new JAXBElement(_GetNumberOfDocumentsResponse_QNAME, GetNumberOfDocumentsResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetDocumentsOfObjectRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", name = "GetDocumentsOfObjectRequest")
-    public JAXBElement createGetDocumentsOfObjectRequest(GetDocumentsOfObjectRequestType value) {
-        return new JAXBElement(_GetDocumentsOfObjectRequest_QNAME, GetDocumentsOfObjectRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetDocumentsOfObjectResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", name = "GetDocumentsOfObjectResponse")
-    public JAXBElement createGetDocumentsOfObjectResponse(GetDocumentsOfObjectResponseType value) {
-        return new JAXBElement(_GetDocumentsOfObjectResponse_QNAME, GetDocumentsOfObjectResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetDocumentsOfPeriodRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", name = "GetDocumentsOfPeriodRequest")
-    public JAXBElement createGetDocumentsOfPeriodRequest(GetDocumentsOfPeriodRequestType value) {
-        return new JAXBElement(_GetDocumentsOfPeriodRequest_QNAME, GetDocumentsOfPeriodRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetDocumentsOfPeriodResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", name = "GetDocumentsOfPeriodResponse")
-    public JAXBElement createGetDocumentsOfPeriodResponse(GetDocumentsOfPeriodResponseType value) {
-        return new JAXBElement(_GetDocumentsOfPeriodResponse_QNAME, GetDocumentsOfPeriodResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeclareEndpointRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", name = "DeclareEndpointRequest")
-    public JAXBElement createDeclareEndpointRequest(DeclareEndpointRequestType value) {
-        return new JAXBElement(_DeclareEndpointRequest_QNAME, DeclareEndpointRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", name = "ArtAuthentifizierung")
-    public JAXBElement createArtAuthentifizierung(String value) {
-        return new JAXBElement(_ArtAuthentifizierung_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeclareEndpointResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", name = "DeclareEndpointResponse")
-    public JAXBElement createDeclareEndpointResponse(DeclareEndpointResponseType value) {
-        return new JAXBElement(_DeclareEndpointResponse_QNAME, DeclareEndpointResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SecurityContextTokenRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", name = "SecurityContextTokenRequest")
-    public JAXBElement createSecurityContextTokenRequest(SecurityContextTokenRequestType value) {
-        return new JAXBElement(_SecurityContextTokenRequest_QNAME, SecurityContextTokenRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SecurityContextTokenResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", name = "SecurityContextTokenResponse")
-    public JAXBElement createSecurityContextTokenResponse(SecurityContextTokenResponseType value) {
-        return new JAXBElement(_SecurityContextTokenResponse_QNAME, SecurityContextTokenResponseType.class, null, value);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/ProzessDokumentStatusType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/ProzessDokumentStatusType.java
deleted file mode 100644
index 383b5cfb..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/ProzessDokumentStatusType.java
+++ /dev/null
@@ -1,188 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AutorisierungAsyncType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-
-
-/**
- * Unterschriftenstatus für ein Dokument
- * 
- * 
Java-Klasse für ProzessDokumentStatus_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProzessDokumentStatus_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Dokumenttyp" type="{urn:omds3CommonServiceTypes-1-1-0}DocumentType"/>
- *         <element name="Beschreibung">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <maxLength value="200"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="DokAnforderungsId" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type"/>
- *         <element name="Autorisierungen" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <extension base="{urn:omds3CommonServiceTypes-1-1-0}AutorisierungAsync_Type">
- *               </extension>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProzessDokumentStatus_Type", propOrder = {
-    "dokumenttyp",
-    "beschreibung",
-    "dokAnforderungsId",
-    "autorisierungen"
-})
-public class ProzessDokumentStatusType {
-
-    @XmlElement(name = "Dokumenttyp")
-    protected int dokumenttyp;
-    @XmlElement(name = "Beschreibung", required = true)
-    protected String beschreibung;
-    @XmlElement(name = "DokAnforderungsId", required = true)
-    protected ObjektIdType dokAnforderungsId;
-    @XmlElement(name = "Autorisierungen", required = true)
-    protected List autorisierungen;
-
-    /**
-     * Ruft den Wert der dokumenttyp-Eigenschaft ab.
-     * 
-     */
-    public int getDokumenttyp() {
-        return dokumenttyp;
-    }
-
-    /**
-     * Legt den Wert der dokumenttyp-Eigenschaft fest.
-     * 
-     */
-    public void setDokumenttyp(int value) {
-        this.dokumenttyp = value;
-    }
-
-    /**
-     * Ruft den Wert der beschreibung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBeschreibung() {
-        return beschreibung;
-    }
-
-    /**
-     * Legt den Wert der beschreibung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBeschreibung(String value) {
-        this.beschreibung = value;
-    }
-
-    /**
-     * Ruft den Wert der dokAnforderungsId-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getDokAnforderungsId() {
-        return dokAnforderungsId;
-    }
-
-    /**
-     * Legt den Wert der dokAnforderungsId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setDokAnforderungsId(ObjektIdType value) {
-        this.dokAnforderungsId = value;
-    }
-
-    /**
-     * Gets the value of the autorisierungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the autorisierungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getAutorisierungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ProzessDokumentStatusType.Autorisierungen }
-     * 
-     * 
-     */
-    public List getAutorisierungen() {
-        if (autorisierungen == null) {
-            autorisierungen = new ArrayList();
-        }
-        return this.autorisierungen;
-    }
-
-
-    /**
-     * 
Java-Klasse für anonymous complex type.
-     * 
-     * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}AutorisierungAsync_Type">
-     *     </extension>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Autorisierungen
-        extends AutorisierungAsyncType
-    {
-
-
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/SecurityContextTokenRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/SecurityContextTokenRequestType.java
deleted file mode 100644
index 8f197ac3..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/SecurityContextTokenRequestType.java
+++ /dev/null
@@ -1,64 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Request-Type zum Bezug eines Security-Context-Tokens
- * 
- * 
Java-Klasse für SecurityContextTokenRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SecurityContextTokenRequest_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Credentials" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen}Credentials_Type"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SecurityContextTokenRequest_Type", propOrder = {
-    "credentials"
-})
-public class SecurityContextTokenRequestType {
-
-    @XmlElement(name = "Credentials", required = true)
-    protected CredentialsType credentials;
-
-    /**
-     * Ruft den Wert der credentials-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CredentialsType }
-     *     
-     */
-    public CredentialsType getCredentials() {
-        return credentials;
-    }
-
-    /**
-     * Legt den Wert der credentials-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CredentialsType }
-     *     
-     */
-    public void setCredentials(CredentialsType value) {
-        this.credentials = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/SecurityContextTokenResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/SecurityContextTokenResponseType.java
deleted file mode 100644
index 727b04ff..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/SecurityContextTokenResponseType.java
+++ /dev/null
@@ -1,115 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-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;
-
-
-/**
- * Response-Type zum Bezug eines Securtity-Context-Tokens
- * 
- * 
Java-Klasse für SecurityContextTokenResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SecurityContextTokenResponse_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Token" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="DauerhaftGueltig" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="GueltigBis" type="{urn:omds20}Datum-Zeit" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SecurityContextTokenResponse_Type", propOrder = {
-    "token",
-    "dauerhaftGueltig",
-    "gueltigBis"
-})
-public class SecurityContextTokenResponseType {
-
-    @XmlElement(name = "Token", required = true)
-    protected String token;
-    @XmlElement(name = "DauerhaftGueltig")
-    protected boolean dauerhaftGueltig;
-    @XmlElement(name = "GueltigBis")
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar gueltigBis;
-
-    /**
-     * Ruft den Wert der token-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getToken() {
-        return token;
-    }
-
-    /**
-     * Legt den Wert der token-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setToken(String value) {
-        this.token = value;
-    }
-
-    /**
-     * Ruft den Wert der dauerhaftGueltig-Eigenschaft ab.
-     * 
-     */
-    public boolean isDauerhaftGueltig() {
-        return dauerhaftGueltig;
-    }
-
-    /**
-     * Legt den Wert der dauerhaftGueltig-Eigenschaft fest.
-     * 
-     */
-    public void setDauerhaftGueltig(boolean value) {
-        this.dauerhaftGueltig = value;
-    }
-
-    /**
-     * Ruft den Wert der gueltigBis-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getGueltigBis() {
-        return gueltigBis;
-    }
-
-    /**
-     * Legt den Wert der gueltigBis-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setGueltigBis(XMLGregorianCalendar value) {
-        this.gueltigBis = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/StateChangeEventType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/StateChangeEventType.java
deleted file mode 100644
index 4aed6f29..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/StateChangeEventType.java
+++ /dev/null
@@ -1,270 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.GeschaeftsobjektArtType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-
-
-/**
- * Standard-Event einer Statusänderung
- * 
- * 
Java-Klasse für StateChangeEvent_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="StateChangeEvent_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen}AbstractStateChangeEvent_Type">
- *       <sequence>
- *         <element name="Objektart" type="{urn:omds3CommonServiceTypes-1-1-0}GeschaeftsobjektArt_Type"/>
- *         <element name="ObjektId" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type"/>
- *         <element name="Geschaeftsfallnummer" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type" minOccurs="0"/>
- *         <element name="GeschaeftsfallArt" type="{urn:omds3CommonServiceTypes-1-1-0}GeschaeftsfallArt_Type" minOccurs="0"/>
- *         <element name="Aenderungsdatum" type="{urn:omds20}Datum-Zeit"/>
- *         <element name="StatusGueltigAbDatum" type="{urn:omds20}Datum-Zeit"/>
- *         <element name="BisherigerStatus" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen}AbstractStatusGeschaeftsfall_Type" minOccurs="0"/>
- *         <element name="NeuerStatus" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen}AbstractStatusGeschaeftsfall_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "StateChangeEvent_Type", propOrder = {
-    "objektart",
-    "objektId",
-    "geschaeftsfallnummer",
-    "geschaeftsfallArt",
-    "aenderungsdatum",
-    "statusGueltigAbDatum",
-    "bisherigerStatus",
-    "neuerStatus"
-})
-public class StateChangeEventType
-    extends AbstractStateChangeEventType
-{
-
-    @XmlElement(name = "Objektart", required = true)
-    @XmlSchemaType(name = "string")
-    protected GeschaeftsobjektArtType objektart;
-    @XmlElement(name = "ObjektId", required = true)
-    protected ObjektIdType objektId;
-    @XmlElement(name = "Geschaeftsfallnummer")
-    protected ObjektIdType geschaeftsfallnummer;
-    @XmlElement(name = "GeschaeftsfallArt")
-    @XmlSchemaType(name = "anySimpleType")
-    protected String geschaeftsfallArt;
-    @XmlElement(name = "Aenderungsdatum", required = true)
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar aenderungsdatum;
-    @XmlElement(name = "StatusGueltigAbDatum", required = true)
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar statusGueltigAbDatum;
-    @XmlElement(name = "BisherigerStatus")
-    protected AbstractStatusGeschaeftsfallType bisherigerStatus;
-    @XmlElement(name = "NeuerStatus", required = true)
-    protected AbstractStatusGeschaeftsfallType neuerStatus;
-
-    /**
-     * Ruft den Wert der objektart-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GeschaeftsobjektArtType }
-     *     
-     */
-    public GeschaeftsobjektArtType getObjektart() {
-        return objektart;
-    }
-
-    /**
-     * Legt den Wert der objektart-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GeschaeftsobjektArtType }
-     *     
-     */
-    public void setObjektart(GeschaeftsobjektArtType value) {
-        this.objektart = value;
-    }
-
-    /**
-     * Ruft den Wert der objektId-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getObjektId() {
-        return objektId;
-    }
-
-    /**
-     * Legt den Wert der objektId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setObjektId(ObjektIdType value) {
-        this.objektId = value;
-    }
-
-    /**
-     * Ruft den Wert der geschaeftsfallnummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getGeschaeftsfallnummer() {
-        return geschaeftsfallnummer;
-    }
-
-    /**
-     * Legt den Wert der geschaeftsfallnummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setGeschaeftsfallnummer(ObjektIdType value) {
-        this.geschaeftsfallnummer = value;
-    }
-
-    /**
-     * Ruft den Wert der geschaeftsfallArt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGeschaeftsfallArt() {
-        return geschaeftsfallArt;
-    }
-
-    /**
-     * Legt den Wert der geschaeftsfallArt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGeschaeftsfallArt(String value) {
-        this.geschaeftsfallArt = value;
-    }
-
-    /**
-     * Ruft den Wert der aenderungsdatum-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getAenderungsdatum() {
-        return aenderungsdatum;
-    }
-
-    /**
-     * Legt den Wert der aenderungsdatum-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setAenderungsdatum(XMLGregorianCalendar value) {
-        this.aenderungsdatum = value;
-    }
-
-    /**
-     * Ruft den Wert der statusGueltigAbDatum-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getStatusGueltigAbDatum() {
-        return statusGueltigAbDatum;
-    }
-
-    /**
-     * Legt den Wert der statusGueltigAbDatum-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setStatusGueltigAbDatum(XMLGregorianCalendar value) {
-        this.statusGueltigAbDatum = value;
-    }
-
-    /**
-     * Ruft den Wert der bisherigerStatus-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AbstractStatusGeschaeftsfallType }
-     *     
-     */
-    public AbstractStatusGeschaeftsfallType getBisherigerStatus() {
-        return bisherigerStatus;
-    }
-
-    /**
-     * Legt den Wert der bisherigerStatus-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AbstractStatusGeschaeftsfallType }
-     *     
-     */
-    public void setBisherigerStatus(AbstractStatusGeschaeftsfallType value) {
-        this.bisherigerStatus = value;
-    }
-
-    /**
-     * Ruft den Wert der neuerStatus-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AbstractStatusGeschaeftsfallType }
-     *     
-     */
-    public AbstractStatusGeschaeftsfallType getNeuerStatus() {
-        return neuerStatus;
-    }
-
-    /**
-     * Legt den Wert der neuerStatus-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AbstractStatusGeschaeftsfallType }
-     *     
-     */
-    public void setNeuerStatus(AbstractStatusGeschaeftsfallType value) {
-        this.neuerStatus = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/StatusAntragsGeschaeftsfall.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/StatusAntragsGeschaeftsfall.java
deleted file mode 100644
index c9aa3cd7..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/StatusAntragsGeschaeftsfall.java
+++ /dev/null
@@ -1,58 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Status eines Antrags
- * 
- * 
Java-Klasse für StatusAntragsGeschaeftsfall complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="StatusAntragsGeschaeftsfall">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen}AbstractStatusGeschaeftsfall_Type">
- *       <sequence>
- *         <element name="Antragstatus" type="{urn:omds3CommonServiceTypes-1-1-0}SubmitApplicationStatus_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "StatusAntragsGeschaeftsfall", propOrder = {
-    "antragstatus"
-})
-public class StatusAntragsGeschaeftsfall
-    extends AbstractStatusGeschaeftsfallType
-{
-
-    @XmlElement(name = "Antragstatus")
-    protected int antragstatus;
-
-    /**
-     * Ruft den Wert der antragstatus-Eigenschaft ab.
-     * 
-     */
-    public int getAntragstatus() {
-        return antragstatus;
-    }
-
-    /**
-     * Legt den Wert der antragstatus-Eigenschaft fest.
-     * 
-     */
-    public void setAntragstatus(int value) {
-        this.antragstatus = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/SubmitFormRequest.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/SubmitFormRequest.java
deleted file mode 100644
index 9d739766..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/SubmitFormRequest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonProcessRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.Formular;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonProcessRequest_Type">
- *       <sequence>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}Formular"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "formular"
-})
-@XmlRootElement(name = "SubmitFormRequest")
-public class SubmitFormRequest
-    extends CommonProcessRequestType
-{
-
-    @XmlElement(name = "Formular", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-    protected Formular formular;
-
-    /**
-     * Ruft den Wert der formular-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Formular }
-     *     
-     */
-    public Formular getFormular() {
-        return formular;
-    }
-
-    /**
-     * Legt den Wert der formular-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Formular }
-     *     
-     */
-    public void setFormular(Formular value) {
-        this.formular = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/SubmitFormResponse.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/SubmitFormResponse.java
deleted file mode 100644
index 2a2c1491..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/SubmitFormResponse.java
+++ /dev/null
@@ -1,68 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonProcessResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.Formular;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonProcessResponse_Type">
- *       <sequence>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}Formular"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "formular"
-})
-@XmlRootElement(name = "SubmitFormResponse")
-public class SubmitFormResponse
-    extends CommonProcessResponseType
-{
-
-    @XmlElement(name = "Formular", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-    protected Formular formular;
-
-    /**
-     * Ruft den Wert der formular-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Formular }
-     *     
-     */
-    public Formular getFormular() {
-        return formular;
-    }
-
-    /**
-     * Legt den Wert der formular-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Formular }
-     *     
-     */
-    public void setFormular(Formular value) {
-        this.formular = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/UnderwriteDocumentRequest.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/UnderwriteDocumentRequest.java
deleted file mode 100644
index 5e74073c..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/UnderwriteDocumentRequest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-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.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AutorisierungsAnforderungType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.DokumentDataType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element name="DokumentenVorlage" type="{urn:omds3CommonServiceTypes-1-1-0}DokumentData_Type"/>
- *         <element name="AngeforderteUnterschriften" type="{urn:omds3CommonServiceTypes-1-1-0}AutorisierungsAnforderung_Type" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "dokumentenVorlage",
-    "angeforderteUnterschriften"
-})
-@XmlRootElement(name = "UnderwriteDocumentRequest")
-public class UnderwriteDocumentRequest
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "DokumentenVorlage", required = true)
-    protected DokumentDataType dokumentenVorlage;
-    @XmlElement(name = "AngeforderteUnterschriften", required = true)
-    protected List angeforderteUnterschriften;
-
-    /**
-     * Ruft den Wert der dokumentenVorlage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DokumentDataType }
-     *     
-     */
-    public DokumentDataType getDokumentenVorlage() {
-        return dokumentenVorlage;
-    }
-
-    /**
-     * Legt den Wert der dokumentenVorlage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DokumentDataType }
-     *     
-     */
-    public void setDokumentenVorlage(DokumentDataType value) {
-        this.dokumentenVorlage = value;
-    }
-
-    /**
-     * Gets the value of the angeforderteUnterschriften property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the angeforderteUnterschriften property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getAngeforderteUnterschriften().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link AutorisierungsAnforderungType }
-     * 
-     * 
-     */
-    public List getAngeforderteUnterschriften() {
-        if (angeforderteUnterschriften == null) {
-            angeforderteUnterschriften = new ArrayList();
-        }
-        return this.angeforderteUnterschriften;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/UnderwriteDocumentResponse.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/UnderwriteDocumentResponse.java
deleted file mode 100644
index 23b14656..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/UnderwriteDocumentResponse.java
+++ /dev/null
@@ -1,104 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-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.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AutorisierungType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.DokumentDataType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence>
- *         <element name="DokData" type="{urn:omds3CommonServiceTypes-1-1-0}DokumentData_Type"/>
- *         <element name="Autorisierungen" type="{urn:omds3CommonServiceTypes-1-1-0}Autorisierung_Type" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "dokData",
-    "autorisierungen"
-})
-@XmlRootElement(name = "UnderwriteDocumentResponse")
-public class UnderwriteDocumentResponse
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "DokData", required = true)
-    protected DokumentDataType dokData;
-    @XmlElement(name = "Autorisierungen", required = true)
-    protected List autorisierungen;
-
-    /**
-     * Ruft den Wert der dokData-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DokumentDataType }
-     *     
-     */
-    public DokumentDataType getDokData() {
-        return dokData;
-    }
-
-    /**
-     * Legt den Wert der dokData-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DokumentDataType }
-     *     
-     */
-    public void setDokData(DokumentDataType value) {
-        this.dokData = value;
-    }
-
-    /**
-     * Gets the value of the autorisierungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the autorisierungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getAutorisierungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link AutorisierungType }
-     * 
-     * 
-     */
-    public List getAutorisierungen() {
-        if (autorisierungen == null) {
-            autorisierungen = new ArrayList();
-        }
-        return this.autorisierungen;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/UsernamePasswordCredentialsType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/UsernamePasswordCredentialsType.java
deleted file mode 100644
index 65919ed9..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/UsernamePasswordCredentialsType.java
+++ /dev/null
@@ -1,87 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Konkrete Implementierung von Credentials mit Username und Password
- * 
- * 
Java-Klasse für UsernamePasswordCredentials_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="UsernamePasswordCredentials_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="Username" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="Password" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "UsernamePasswordCredentials_Type")
-public class UsernamePasswordCredentialsType {
-
-    @XmlAttribute(name = "Username", namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", required = true)
-    protected String username;
-    @XmlAttribute(name = "Password", namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", required = true)
-    protected String password;
-
-    /**
-     * Ruft den Wert der username-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUsername() {
-        return username;
-    }
-
-    /**
-     * Legt den Wert der username-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUsername(String value) {
-        this.username = value;
-    }
-
-    /**
-     * Ruft den Wert der password-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPassword() {
-        return password;
-    }
-
-    /**
-     * Legt den Wert der password-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPassword(String value) {
-        this.password = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/package-info.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/package-info.java
deleted file mode 100644
index 3a233901..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package at.vvo.omds.types.omds3Types.r1_7_0.on1basis;
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/BOAProcessRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/BOAProcessRequestType.java
deleted file mode 100644
index e26020cb..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/BOAProcessRequestType.java
+++ /dev/null
@@ -1,110 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonProcessRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ErsatzpolizzeType;
-
-
-/**
- * Abstraktes Zwischenelement für alle BOA-Request-Types
- * 
- * 
Java-Klasse für BOAProcessRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="BOAProcessRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonProcessRequest_Type">
- *       <sequence>
- *         <element name="Aenderungsgrund" type="{urn:omds20}AendGrundCd_Type" minOccurs="0"/>
- *         <element name="Ersatzpolizzen" type="{urn:omds3CommonServiceTypes-1-1-0}Ersatzpolizze_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BOAProcessRequest_Type", propOrder = {
-    "aenderungsgrund",
-    "ersatzpolizzen"
-})
-@XmlSeeAlso({
-    SubmitApplicationRequestType.class,
-    CreateApplicationRequestType.class,
-    CreateOfferRequestType.class,
-    CalculateRequestType.class
-})
-public class BOAProcessRequestType
-    extends CommonProcessRequestType
-{
-
-    @XmlElement(name = "Aenderungsgrund")
-    protected String aenderungsgrund;
-    @XmlElement(name = "Ersatzpolizzen")
-    protected List ersatzpolizzen;
-
-    /**
-     * Ruft den Wert der aenderungsgrund-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAenderungsgrund() {
-        return aenderungsgrund;
-    }
-
-    /**
-     * Legt den Wert der aenderungsgrund-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAenderungsgrund(String value) {
-        this.aenderungsgrund = value;
-    }
-
-    /**
-     * Gets the value of the ersatzpolizzen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the ersatzpolizzen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getErsatzpolizzen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ErsatzpolizzeType }
-     * 
-     * 
-     */
-    public List getErsatzpolizzen() {
-        if (ersatzpolizzen == null) {
-            ersatzpolizzen = new ArrayList();
-        }
-        return this.ersatzpolizzen;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/BOAProcessResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/BOAProcessResponseType.java
deleted file mode 100644
index 09e3b267..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/BOAProcessResponseType.java
+++ /dev/null
@@ -1,110 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonProcessResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ErsatzpolizzeType;
-
-
-/**
- * Abstraktes Zwischenelement für alle BOA-Response-Types
- * 
- * 
Java-Klasse für BOAProcessResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="BOAProcessResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonProcessResponse_Type">
- *       <sequence>
- *         <element name="Aenderungsgrund" type="{urn:omds20}AendGrundCd_Type" minOccurs="0"/>
- *         <element name="Ersatzpolizzen" type="{urn:omds3CommonServiceTypes-1-1-0}Ersatzpolizze_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BOAProcessResponse_Type", propOrder = {
-    "aenderungsgrund",
-    "ersatzpolizzen"
-})
-@XmlSeeAlso({
-    SubmitApplicationResponseType.class,
-    CreateApplicationResponseType.class,
-    CreateOfferResponseType.class,
-    CalculateResponseType.class
-})
-public class BOAProcessResponseType
-    extends CommonProcessResponseType
-{
-
-    @XmlElement(name = "Aenderungsgrund")
-    protected String aenderungsgrund;
-    @XmlElement(name = "Ersatzpolizzen")
-    protected List ersatzpolizzen;
-
-    /**
-     * Ruft den Wert der aenderungsgrund-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAenderungsgrund() {
-        return aenderungsgrund;
-    }
-
-    /**
-     * Legt den Wert der aenderungsgrund-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAenderungsgrund(String value) {
-        this.aenderungsgrund = value;
-    }
-
-    /**
-     * Gets the value of the ersatzpolizzen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the ersatzpolizzen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getErsatzpolizzen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ErsatzpolizzeType }
-     * 
-     * 
-     */
-    public List getErsatzpolizzen() {
-        if (ersatzpolizzen == null) {
-            ersatzpolizzen = new ArrayList();
-        }
-        return this.ersatzpolizzen;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateRequestGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateRequestGenType.java
deleted file mode 100644
index c4dc37d3..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateRequestGenType.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CalculateSachPrivatRequestType;
-import kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CalculateKrankenRequest;
-import leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CalculateLebenRequestType;
-import rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CalculateRechtsschutzRequest;
-import unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CalculateUnfallRequestType;
-
-
-/**
- * Abstrakter Request für die Berechnung mit generischen Produktbausteinen
- * 
- * 
Java-Klasse für CalculateRequestGen_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CalculateRequestGen_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CalculateRequest_Type">
- *       <sequence>
- *         <element name="Produktmetadaten" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CalculateRequestGen_Type", propOrder = {
-    "produktmetadaten"
-})
-@XmlSeeAlso({
-    CalculateSachPrivatRequestType.class,
-    CalculateLebenRequestType.class,
-    CalculateUnfallRequestType.class,
-    CalculateRechtsschutzRequest.class,
-    CalculateKrankenRequest.class
-})
-public abstract class CalculateRequestGenType
-    extends CalculateRequestType
-{
-
-    @XmlElement(name = "Produktmetadaten")
-    protected boolean produktmetadaten;
-
-    /**
-     * Ruft den Wert der produktmetadaten-Eigenschaft ab.
-     * 
-     */
-    public boolean isProduktmetadaten() {
-        return produktmetadaten;
-    }
-
-    /**
-     * Legt den Wert der produktmetadaten-Eigenschaft fest.
-     * 
-     */
-    public void setProduktmetadaten(boolean value) {
-        this.produktmetadaten = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateRequestType.java
deleted file mode 100644
index fcd69132..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateRequestType.java
+++ /dev/null
@@ -1,64 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CalculateKfzRequestType;
-
-
-/**
- * Abstrakter Request für die Berechnung
- * 
- * 
Java-Klasse für CalculateRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CalculateRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}BOAProcessRequest_Type">
- *       <sequence>
- *         <element name="RequestUpselling" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CalculateRequest_Type", propOrder = {
-    "requestUpselling"
-})
-@XmlSeeAlso({
-    CalculateKfzRequestType.class,
-    CalculateRequestGenType.class
-})
-public abstract class CalculateRequestType
-    extends BOAProcessRequestType
-{
-
-    @XmlElement(name = "RequestUpselling", defaultValue = "false")
-    protected boolean requestUpselling;
-
-    /**
-     * Ruft den Wert der requestUpselling-Eigenschaft ab.
-     * 
-     */
-    public boolean isRequestUpselling() {
-        return requestUpselling;
-    }
-
-    /**
-     * Legt den Wert der requestUpselling-Eigenschaft fest.
-     * 
-     */
-    public void setRequestUpselling(boolean value) {
-        this.requestUpselling = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateResponseGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateResponseGenType.java
deleted file mode 100644
index ceaf205a..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateResponseGenType.java
+++ /dev/null
@@ -1,47 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CalculateSachPrivatResponseType;
-import kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CalculateKrankenResponse;
-import leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CalculateLebenResponseType;
-import rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CalculateRechtsschutzResponse;
-import unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CalculateUnfallResponseType;
-
-
-/**
- * Abstrakter Response Berechnung 
- * 
- * 
Java-Klasse für CalculateResponseGen_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CalculateResponseGen_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CalculateResponse_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CalculateResponseGen_Type")
-@XmlSeeAlso({
-    CalculateSachPrivatResponseType.class,
-    CalculateLebenResponseType.class,
-    CalculateUnfallResponseType.class,
-    CalculateRechtsschutzResponse.class,
-    CalculateKrankenResponse.class
-})
-public abstract class CalculateResponseGenType
-    extends CalculateResponseType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateResponseType.java
deleted file mode 100644
index 277a3398..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateResponseType.java
+++ /dev/null
@@ -1,40 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CalculateKfzResponseType;
-
-
-/**
- * Abstrakter Response, der das Ergebnis der Berechnung enthält bzw. Fehlermeldungen
- * 
- * 
Java-Klasse für CalculateResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CalculateResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}BOAProcessResponse_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CalculateResponse_Type")
-@XmlSeeAlso({
-    CalculateKfzResponseType.class,
-    CalculateResponseGenType.class
-})
-public abstract class CalculateResponseType
-    extends BOAProcessResponseType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationRequestGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationRequestGenType.java
deleted file mode 100644
index a202d28e..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationRequestGenType.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CreateApplicationSachPrivatRequestType;
-import kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CreateApplicationKrankenRequest;
-import leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CreateApplicationLebenRequestType;
-import rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateApplicationRechtsschutzRequest;
-import unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateApplicationUnfallRequestType;
-
-
-/**
- * Abstrakter Request der Antragserzeugung mit generischen Produktbausteinen
- * 
- * 
Java-Klasse für CreateApplicationRequestGen_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateApplicationRequestGen_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateApplicationRequest_Type">
- *       <sequence>
- *         <element name="Produktmetadaten" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateApplicationRequestGen_Type", propOrder = {
-    "produktmetadaten"
-})
-@XmlSeeAlso({
-    CreateApplicationSachPrivatRequestType.class,
-    CreateApplicationLebenRequestType.class,
-    CreateApplicationUnfallRequestType.class,
-    CreateApplicationRechtsschutzRequest.class,
-    CreateApplicationKrankenRequest.class
-})
-public abstract class CreateApplicationRequestGenType
-    extends CreateApplicationRequestType
-{
-
-    @XmlElement(name = "Produktmetadaten")
-    protected boolean produktmetadaten;
-
-    /**
-     * Ruft den Wert der produktmetadaten-Eigenschaft ab.
-     * 
-     */
-    public boolean isProduktmetadaten() {
-        return produktmetadaten;
-    }
-
-    /**
-     * Legt den Wert der produktmetadaten-Eigenschaft fest.
-     * 
-     */
-    public void setProduktmetadaten(boolean value) {
-        this.produktmetadaten = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationRequestType.java
deleted file mode 100644
index f3f5f506..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationRequestType.java
+++ /dev/null
@@ -1,80 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.DateianhangType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CreateApplicationKfzRequestType;
-
-
-/**
- * Abstrakter Request für den Antrag
- * 
- * 
Java-Klasse für CreateApplicationRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateApplicationRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}BOAProcessRequest_Type">
- *       <sequence>
- *         <element name="Dateianhaenge" type="{urn:omds3CommonServiceTypes-1-1-0}Dateianhang_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateApplicationRequest_Type", propOrder = {
-    "dateianhaenge"
-})
-@XmlSeeAlso({
-    CreateApplicationKfzRequestType.class,
-    CreateApplicationRequestGenType.class
-})
-public abstract class CreateApplicationRequestType
-    extends BOAProcessRequestType
-{
-
-    @XmlElement(name = "Dateianhaenge")
-    protected List dateianhaenge;
-
-    /**
-     * Gets the value of the dateianhaenge property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the dateianhaenge property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDateianhaenge().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link DateianhangType }
-     * 
-     * 
-     */
-    public List getDateianhaenge() {
-        if (dateianhaenge == null) {
-            dateianhaenge = new ArrayList();
-        }
-        return this.dateianhaenge;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationResponseGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationResponseGenType.java
deleted file mode 100644
index eeea7cb1..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationResponseGenType.java
+++ /dev/null
@@ -1,47 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CreateApplicationSachPrivatResponseType;
-import kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CreateApplicationKrankenResponse;
-import leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CreateApplicationLebenResponseType;
-import rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateApplicationRechtsschutzResponse;
-import unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateApplicationUnfallResponseType;
-
-
-/**
- * Abstrakter Response der Antragserzeugung
- * 
- * 
Java-Klasse für CreateApplicationResponseGen_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateApplicationResponseGen_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateApplicationResponse_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateApplicationResponseGen_Type")
-@XmlSeeAlso({
-    CreateApplicationSachPrivatResponseType.class,
-    CreateApplicationLebenResponseType.class,
-    CreateApplicationUnfallResponseType.class,
-    CreateApplicationRechtsschutzResponse.class,
-    CreateApplicationKrankenResponse.class
-})
-public abstract class CreateApplicationResponseGenType
-    extends CreateApplicationResponseType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationResponseType.java
deleted file mode 100644
index e896288b..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationResponseType.java
+++ /dev/null
@@ -1,171 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.DokumentInfoType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ProzessDokumentBasisType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CreateApplicationKfzResponseType;
-
-
-/**
- * Abstrakter Response, der den Antrag enthält bzw. Fehlermeldungen
- * 
- * 
Java-Klasse für CreateApplicationResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateApplicationResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}BOAProcessResponse_Type">
- *       <sequence>
- *         <element name="Antragstatus" type="{urn:omds3CommonServiceTypes-1-1-0}SubmitApplicationStatus_Type" minOccurs="0"/>
- *         <element name="Antragsnummer" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type" minOccurs="0"/>
- *         <element name="Dokumente" type="{urn:omds3CommonServiceTypes-1-1-0}DokumentInfo_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="DokumenteAnforderungen" type="{urn:omds3CommonServiceTypes-1-1-0}ProzessDokumentBasis_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateApplicationResponse_Type", propOrder = {
-    "antragstatus",
-    "antragsnummer",
-    "dokumente",
-    "dokumenteAnforderungen"
-})
-@XmlSeeAlso({
-    CreateApplicationKfzResponseType.class,
-    CreateApplicationResponseGenType.class
-})
-public abstract class CreateApplicationResponseType
-    extends BOAProcessResponseType
-{
-
-    @XmlElement(name = "Antragstatus")
-    protected Integer antragstatus;
-    @XmlElement(name = "Antragsnummer")
-    protected ObjektIdType antragsnummer;
-    @XmlElement(name = "Dokumente")
-    protected List dokumente;
-    @XmlElement(name = "DokumenteAnforderungen")
-    protected List dokumenteAnforderungen;
-
-    /**
-     * Ruft den Wert der antragstatus-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getAntragstatus() {
-        return antragstatus;
-    }
-
-    /**
-     * Legt den Wert der antragstatus-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setAntragstatus(Integer value) {
-        this.antragstatus = value;
-    }
-
-    /**
-     * Ruft den Wert der antragsnummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getAntragsnummer() {
-        return antragsnummer;
-    }
-
-    /**
-     * Legt den Wert der antragsnummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setAntragsnummer(ObjektIdType value) {
-        this.antragsnummer = value;
-    }
-
-    /**
-     * Gets the value of the dokumente property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the dokumente property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDokumente().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link DokumentInfoType }
-     * 
-     * 
-     */
-    public List getDokumente() {
-        if (dokumente == null) {
-            dokumente = new ArrayList();
-        }
-        return this.dokumente;
-    }
-
-    /**
-     * Gets the value of the dokumenteAnforderungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the dokumenteAnforderungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDokumenteAnforderungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ProzessDokumentBasisType }
-     * 
-     * 
-     */
-    public List getDokumenteAnforderungen() {
-        if (dokumenteAnforderungen == null) {
-            dokumenteAnforderungen = new ArrayList();
-        }
-        return this.dokumenteAnforderungen;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferRequestGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferRequestGenType.java
deleted file mode 100644
index bb356b78..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferRequestGenType.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CreateOfferSachPrivatRequestType;
-import kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CreateOfferKrankenRequest;
-import leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CreateOfferLebenRequestType;
-import rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateOfferRechtsschutzRequest;
-import unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateOfferUnfallRequestType;
-
-
-/**
- * Abstrakter Request für die Offerterstellung mit generischen Produktbausteinen
- * 
- * 
Java-Klasse für CreateOfferRequestGen_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateOfferRequestGen_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateOfferRequest_Type">
- *       <sequence>
- *         <element name="Produktmetadaten" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateOfferRequestGen_Type", propOrder = {
-    "produktmetadaten"
-})
-@XmlSeeAlso({
-    CreateOfferSachPrivatRequestType.class,
-    CreateOfferLebenRequestType.class,
-    CreateOfferUnfallRequestType.class,
-    CreateOfferRechtsschutzRequest.class,
-    CreateOfferKrankenRequest.class
-})
-public abstract class CreateOfferRequestGenType
-    extends CreateOfferRequestType
-{
-
-    @XmlElement(name = "Produktmetadaten")
-    protected boolean produktmetadaten;
-
-    /**
-     * Ruft den Wert der produktmetadaten-Eigenschaft ab.
-     * 
-     */
-    public boolean isProduktmetadaten() {
-        return produktmetadaten;
-    }
-
-    /**
-     * Legt den Wert der produktmetadaten-Eigenschaft fest.
-     * 
-     */
-    public void setProduktmetadaten(boolean value) {
-        this.produktmetadaten = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferRequestType.java
deleted file mode 100644
index 152b73ae..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferRequestType.java
+++ /dev/null
@@ -1,40 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CreateOfferKfzRequestType;
-
-
-/**
- * Abstrakter Request für das Offert
- * 
- * 
Java-Klasse für CreateOfferRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateOfferRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}BOAProcessRequest_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateOfferRequest_Type")
-@XmlSeeAlso({
-    CreateOfferKfzRequestType.class,
-    CreateOfferRequestGenType.class
-})
-public abstract class CreateOfferRequestType
-    extends BOAProcessRequestType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferResponseGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferResponseGenType.java
deleted file mode 100644
index 42dd436b..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferResponseGenType.java
+++ /dev/null
@@ -1,47 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CreateOfferSachPrivatResponseType;
-import kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CreateOfferKrankenResponse;
-import leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CreateOfferLebenResponseType;
-import rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateOfferRechtsschutzResponse;
-import unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateOfferUnfallResponseType;
-
-
-/**
- * Abstrakter Response der Offerterstellung
- * 
- * 
Java-Klasse für CreateOfferResponseGen_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateOfferResponseGen_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateOfferResponse_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateOfferResponseGen_Type")
-@XmlSeeAlso({
-    CreateOfferSachPrivatResponseType.class,
-    CreateOfferLebenResponseType.class,
-    CreateOfferUnfallResponseType.class,
-    CreateOfferRechtsschutzResponse.class,
-    CreateOfferKrankenResponse.class
-})
-public abstract class CreateOfferResponseGenType
-    extends CreateOfferResponseType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferResponseType.java
deleted file mode 100644
index 3da45020..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferResponseType.java
+++ /dev/null
@@ -1,114 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.DokumentInfoType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ProzessDokumentBasisType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CreateOfferKfzResponseType;
-
-
-/**
- * Abstrakter Response, der das Offert enthält bzw. Fehlermeldungen
- * 
- * 
Java-Klasse für CreateOfferResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateOfferResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}BOAProcessResponse_Type">
- *       <sequence>
- *         <element name="Dokumente" type="{urn:omds3CommonServiceTypes-1-1-0}DokumentInfo_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="DokumenteAnforderungen" type="{urn:omds3CommonServiceTypes-1-1-0}ProzessDokumentBasis_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateOfferResponse_Type", propOrder = {
-    "dokumente",
-    "dokumenteAnforderungen"
-})
-@XmlSeeAlso({
-    CreateOfferKfzResponseType.class,
-    CreateOfferResponseGenType.class
-})
-public abstract class CreateOfferResponseType
-    extends BOAProcessResponseType
-{
-
-    @XmlElement(name = "Dokumente")
-    protected List dokumente;
-    @XmlElement(name = "DokumenteAnforderungen")
-    protected List dokumenteAnforderungen;
-
-    /**
-     * Gets the value of the dokumente property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the dokumente property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDokumente().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link DokumentInfoType }
-     * 
-     * 
-     */
-    public List getDokumente() {
-        if (dokumente == null) {
-            dokumente = new ArrayList();
-        }
-        return this.dokumente;
-    }
-
-    /**
-     * Gets the value of the dokumenteAnforderungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the dokumenteAnforderungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDokumenteAnforderungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ProzessDokumentBasisType }
-     * 
-     * 
-     */
-    public List getDokumenteAnforderungen() {
-        if (dokumenteAnforderungen == null) {
-            dokumenteAnforderungen = new ArrayList();
-        }
-        return this.dokumenteAnforderungen;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/FetchPolicyRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/FetchPolicyRequestType.java
deleted file mode 100644
index 599664ee..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/FetchPolicyRequestType.java
+++ /dev/null
@@ -1,95 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonProcessRequestType;
-
-
-/**
- * Request um Daten eines Vertrags anzufordern
- * 
- * 
Java-Klasse für FetchPolicyRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="FetchPolicyRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonProcessRequest_Type">
- *       <sequence>
- *         <element name="Polizzennr" type="{urn:omds20}Polizzennr"/>
- *         <element name="VertragsID" type="{urn:omds20}VertragsID" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FetchPolicyRequest_Type", propOrder = {
-    "polizzennr",
-    "vertragsID"
-})
-public class FetchPolicyRequestType
-    extends CommonProcessRequestType
-{
-
-    @XmlElement(name = "Polizzennr", required = true, defaultValue = "false")
-    protected String polizzennr;
-    @XmlElement(name = "VertragsID")
-    protected String vertragsID;
-
-    /**
-     * Ruft den Wert der polizzennr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolizzennr() {
-        return polizzennr;
-    }
-
-    /**
-     * Legt den Wert der polizzennr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolizzennr(String value) {
-        this.polizzennr = value;
-    }
-
-    /**
-     * Ruft den Wert der vertragsID-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVertragsID() {
-        return vertragsID;
-    }
-
-    /**
-     * Legt den Wert der vertragsID-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVertragsID(String value) {
-        this.vertragsID = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/FetchPolicyResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/FetchPolicyResponseType.java
deleted file mode 100644
index 64ddb7e5..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/FetchPolicyResponseType.java
+++ /dev/null
@@ -1,72 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonProcessResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.FetchPolicyKfzResponse;
-
-
-/**
- * Response, der Daten zu einem Vertrag enthält
- * 
- * 
Java-Klasse für FetchPolicyResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="FetchPolicyResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonProcessResponse_Type">
- *       <sequence>
- *         <element name="Vertrag" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezVertrag_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FetchPolicyResponse_Type", propOrder = {
-    "vertrag"
-})
-@XmlSeeAlso({
-    FetchPolicyKfzResponse.class
-})
-public class FetchPolicyResponseType
-    extends CommonProcessResponseType
-{
-
-    @XmlElement(name = "Vertrag")
-    protected SpezVertragType vertrag;
-
-    /**
-     * Ruft den Wert der vertrag-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezVertragType }
-     *     
-     */
-    public SpezVertragType getVertrag() {
-        return vertrag;
-    }
-
-    /**
-     * Legt den Wert der vertrag-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezVertragType }
-     *     
-     */
-    public void setVertrag(SpezVertragType value) {
-        this.vertrag = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/GetApplicationDocumentRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/GetApplicationDocumentRequestType.java
deleted file mode 100644
index 6f24c57c..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/GetApplicationDocumentRequestType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-
-
-/**
- * Typ um Offert- und Antragsdokumente zu beziehen
- * 
- * 
Java-Klasse für GetApplicationDocumentRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GetApplicationDocumentRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element name="DokumentId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GetApplicationDocumentRequest_Type", propOrder = {
-    "dokumentId"
-})
-public class GetApplicationDocumentRequestType
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "DokumentId", required = true)
-    protected String dokumentId;
-
-    /**
-     * Ruft den Wert der dokumentId-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDokumentId() {
-        return dokumentId;
-    }
-
-    /**
-     * Legt den Wert der dokumentId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDokumentId(String value) {
-        this.dokumentId = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/GetApplicationDocumentResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/GetApplicationDocumentResponseType.java
deleted file mode 100644
index 2d07773f..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/GetApplicationDocumentResponseType.java
+++ /dev/null
@@ -1,68 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.DokumentInfoType;
-
-
-/**
- * Typ um Offert- und Antragsdokumente zurückzugeben
- * 
- * 
Java-Klasse für GetApplicationDocumentResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GetApplicationDocumentResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence>
- *         <element name="Dokument" type="{urn:omds3CommonServiceTypes-1-1-0}DokumentInfo_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GetApplicationDocumentResponse_Type", propOrder = {
-    "dokument"
-})
-public class GetApplicationDocumentResponseType
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "Dokument")
-    protected DokumentInfoType dokument;
-
-    /**
-     * Ruft den Wert der dokument-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DokumentInfoType }
-     *     
-     */
-    public DokumentInfoType getDokument() {
-        return dokument;
-    }
-
-    /**
-     * Legt den Wert der dokument-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DokumentInfoType }
-     *     
-     */
-    public void setDokument(DokumentInfoType value) {
-        this.dokument = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/ObjectFactory.java
deleted file mode 100644
index f400c99e..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/ObjectFactory.java
+++ /dev/null
@@ -1,119 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-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 at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common package. 
- * 
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 _GetApplicationDocumentRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common", "GetApplicationDocumentRequest");
-    private final static QName _GetApplicationDocumentResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common", "GetApplicationDocumentResponse");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link GetApplicationDocumentRequestType }
-     * 
-     */
-    public GetApplicationDocumentRequestType createGetApplicationDocumentRequestType() {
-        return new GetApplicationDocumentRequestType();
-    }
-
-    /**
-     * Create an instance of {@link GetApplicationDocumentResponseType }
-     * 
-     */
-    public GetApplicationDocumentResponseType createGetApplicationDocumentResponseType() {
-        return new GetApplicationDocumentResponseType();
-    }
-
-    /**
-     * Create an instance of {@link StartPolicyChangeRequest }
-     * 
-     */
-    public StartPolicyChangeRequest createStartPolicyChangeRequest() {
-        return new StartPolicyChangeRequest();
-    }
-
-    /**
-     * Create an instance of {@link StartPolicyChangeResponse }
-     * 
-     */
-    public StartPolicyChangeResponse createStartPolicyChangeResponse() {
-        return new StartPolicyChangeResponse();
-    }
-
-    /**
-     * Create an instance of {@link BOAProcessRequestType }
-     * 
-     */
-    public BOAProcessRequestType createBOAProcessRequestType() {
-        return new BOAProcessRequestType();
-    }
-
-    /**
-     * Create an instance of {@link BOAProcessResponseType }
-     * 
-     */
-    public BOAProcessResponseType createBOAProcessResponseType() {
-        return new BOAProcessResponseType();
-    }
-
-    /**
-     * Create an instance of {@link FetchPolicyRequestType }
-     * 
-     */
-    public FetchPolicyRequestType createFetchPolicyRequestType() {
-        return new FetchPolicyRequestType();
-    }
-
-    /**
-     * Create an instance of {@link FetchPolicyResponseType }
-     * 
-     */
-    public FetchPolicyResponseType createFetchPolicyResponseType() {
-        return new FetchPolicyResponseType();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetApplicationDocumentRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common", name = "GetApplicationDocumentRequest")
-    public JAXBElement createGetApplicationDocumentRequest(GetApplicationDocumentRequestType value) {
-        return new JAXBElement(_GetApplicationDocumentRequest_QNAME, GetApplicationDocumentRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetApplicationDocumentResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common", name = "GetApplicationDocumentResponse")
-    public JAXBElement createGetApplicationDocumentResponse(GetApplicationDocumentResponseType value) {
-        return new JAXBElement(_GetApplicationDocumentResponse_QNAME, GetApplicationDocumentResponseType.class, null, value);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezAntragBasisType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezAntragBasisType.java
deleted file mode 100644
index 73ff6e53..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezAntragBasisType.java
+++ /dev/null
@@ -1,531 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AbgelehnteRisikenType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AntragsartType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.BeteiligtePersonVertragType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.DatenverwendungType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ErsatzpolizzenType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.KontierungType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.PolizzenversandType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VertragspersonType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VorversicherungenType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ZahlungsdatenType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.SpezAntragKfzType;
-
-
-/**
- * Abstrakter Basistyp für Antrag, der bei Request und bei Response gleich ist
- * 
- * 
Java-Klasse für SpezAntragBasis_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezAntragBasis_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Antragsart" type="{urn:omds3CommonServiceTypes-1-1-0}Antragsart_Type" minOccurs="0"/>
- *         <element name="Personen" type="{urn:omds3CommonServiceTypes-1-1-0}BeteiligtePersonVertrag_Type" maxOccurs="unbounded"/>
- *         <element name="Versicherungsnehmer" type="{http://www.w3.org/2001/XMLSchema}unsignedShort"/>
- *         <element name="AbweichenderPraemienzahler" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/>
- *         <element name="WeitereVersicherungsnehmer" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="WeitereVertragspersonen" type="{urn:omds3CommonServiceTypes-1-1-0}Vertragsperson_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="AbgelehnteRisiken" type="{urn:omds3CommonServiceTypes-1-1-0}AbgelehnteRisiken_Type" minOccurs="0"/>
- *         <element name="Vorversicherungen" type="{urn:omds3CommonServiceTypes-1-1-0}Vorversicherungen_Type" minOccurs="0"/>
- *         <element name="Zahlungsdaten" type="{urn:omds3CommonServiceTypes-1-1-0}Zahlungsdaten_Type"/>
- *         <element name="Sepa" type="{urn:omds3CommonServiceTypes-1-1-0}SepaCd_Type" minOccurs="0"/>
- *         <element name="Polizzenversand" type="{urn:omds3CommonServiceTypes-1-1-0}PolizzenversandType" minOccurs="0"/>
- *         <element name="Datenschutzbestimmungen" type="{urn:omds3CommonServiceTypes-1-1-0}Datenverwendung_Type"/>
- *         <element name="Kontierung" type="{urn:omds3CommonServiceTypes-1-1-0}Kontierung_Type" maxOccurs="3" minOccurs="0"/>
- *         <element name="Ersatzpolizzennummer" type="{urn:omds3CommonServiceTypes-1-1-0}Ersatzpolizzen_Type" minOccurs="0"/>
- *         <element name="ZusendungWeitereDokumente" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="ZusaetzlicheAntragsdaten" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}ZusaetzlicheAntragsdaten_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezAntragBasis_Type", propOrder = {
-    "antragsart",
-    "personen",
-    "versicherungsnehmer",
-    "abweichenderPraemienzahler",
-    "weitereVersicherungsnehmer",
-    "weitereVertragspersonen",
-    "abgelehnteRisiken",
-    "vorversicherungen",
-    "zahlungsdaten",
-    "sepa",
-    "polizzenversand",
-    "datenschutzbestimmungen",
-    "kontierung",
-    "ersatzpolizzennummer",
-    "zusendungWeitereDokumente",
-    "zusaetzlicheAntragsdaten"
-})
-@XmlSeeAlso({
-    SpezAntragKfzType.class,
-    SpezAntragType.class
-})
-public abstract class SpezAntragBasisType {
-
-    @XmlElement(name = "Antragsart")
-    @XmlSchemaType(name = "string")
-    protected AntragsartType antragsart;
-    @XmlElement(name = "Personen", required = true)
-    protected List personen;
-    @XmlElement(name = "Versicherungsnehmer")
-    @XmlSchemaType(name = "unsignedShort")
-    protected int versicherungsnehmer;
-    @XmlElement(name = "AbweichenderPraemienzahler")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer abweichenderPraemienzahler;
-    @XmlElement(name = "WeitereVersicherungsnehmer", type = Integer.class)
-    @XmlSchemaType(name = "unsignedShort")
-    protected List weitereVersicherungsnehmer;
-    @XmlElement(name = "WeitereVertragspersonen")
-    protected List weitereVertragspersonen;
-    @XmlElement(name = "AbgelehnteRisiken")
-    protected AbgelehnteRisikenType abgelehnteRisiken;
-    @XmlElement(name = "Vorversicherungen")
-    protected VorversicherungenType vorversicherungen;
-    @XmlElement(name = "Zahlungsdaten", required = true)
-    protected ZahlungsdatenType zahlungsdaten;
-    @XmlElement(name = "Sepa")
-    @XmlSchemaType(name = "unsignedByte")
-    protected Short sepa;
-    @XmlElement(name = "Polizzenversand")
-    @XmlSchemaType(name = "string")
-    protected PolizzenversandType polizzenversand;
-    @XmlElement(name = "Datenschutzbestimmungen", required = true)
-    protected DatenverwendungType datenschutzbestimmungen;
-    @XmlElement(name = "Kontierung")
-    protected List kontierung;
-    @XmlElement(name = "Ersatzpolizzennummer")
-    protected ErsatzpolizzenType ersatzpolizzennummer;
-    @XmlElement(name = "ZusendungWeitereDokumente")
-    protected List zusendungWeitereDokumente;
-    @XmlElement(name = "ZusaetzlicheAntragsdaten")
-    protected List zusaetzlicheAntragsdaten;
-
-    /**
-     * Ruft den Wert der antragsart-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AntragsartType }
-     *     
-     */
-    public AntragsartType getAntragsart() {
-        return antragsart;
-    }
-
-    /**
-     * Legt den Wert der antragsart-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AntragsartType }
-     *     
-     */
-    public void setAntragsart(AntragsartType value) {
-        this.antragsart = value;
-    }
-
-    /**
-     * Gets the value of the personen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the personen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getPersonen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link BeteiligtePersonVertragType }
-     * 
-     * 
-     */
-    public List getPersonen() {
-        if (personen == null) {
-            personen = new ArrayList();
-        }
-        return this.personen;
-    }
-
-    /**
-     * Ruft den Wert der versicherungsnehmer-Eigenschaft ab.
-     * 
-     */
-    public int getVersicherungsnehmer() {
-        return versicherungsnehmer;
-    }
-
-    /**
-     * Legt den Wert der versicherungsnehmer-Eigenschaft fest.
-     * 
-     */
-    public void setVersicherungsnehmer(int value) {
-        this.versicherungsnehmer = value;
-    }
-
-    /**
-     * Ruft den Wert der abweichenderPraemienzahler-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getAbweichenderPraemienzahler() {
-        return abweichenderPraemienzahler;
-    }
-
-    /**
-     * Legt den Wert der abweichenderPraemienzahler-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setAbweichenderPraemienzahler(Integer value) {
-        this.abweichenderPraemienzahler = value;
-    }
-
-    /**
-     * Gets the value of the weitereVersicherungsnehmer property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the weitereVersicherungsnehmer property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getWeitereVersicherungsnehmer().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link Integer }
-     * 
-     * 
-     */
-    public List getWeitereVersicherungsnehmer() {
-        if (weitereVersicherungsnehmer == null) {
-            weitereVersicherungsnehmer = new ArrayList();
-        }
-        return this.weitereVersicherungsnehmer;
-    }
-
-    /**
-     * Gets the value of the weitereVertragspersonen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the weitereVertragspersonen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getWeitereVertragspersonen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link VertragspersonType }
-     * 
-     * 
-     */
-    public List getWeitereVertragspersonen() {
-        if (weitereVertragspersonen == null) {
-            weitereVertragspersonen = new ArrayList();
-        }
-        return this.weitereVertragspersonen;
-    }
-
-    /**
-     * Ruft den Wert der abgelehnteRisiken-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AbgelehnteRisikenType }
-     *     
-     */
-    public AbgelehnteRisikenType getAbgelehnteRisiken() {
-        return abgelehnteRisiken;
-    }
-
-    /**
-     * Legt den Wert der abgelehnteRisiken-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AbgelehnteRisikenType }
-     *     
-     */
-    public void setAbgelehnteRisiken(AbgelehnteRisikenType value) {
-        this.abgelehnteRisiken = value;
-    }
-
-    /**
-     * Ruft den Wert der vorversicherungen-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VorversicherungenType }
-     *     
-     */
-    public VorversicherungenType getVorversicherungen() {
-        return vorversicherungen;
-    }
-
-    /**
-     * Legt den Wert der vorversicherungen-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VorversicherungenType }
-     *     
-     */
-    public void setVorversicherungen(VorversicherungenType value) {
-        this.vorversicherungen = value;
-    }
-
-    /**
-     * Ruft den Wert der zahlungsdaten-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ZahlungsdatenType }
-     *     
-     */
-    public ZahlungsdatenType getZahlungsdaten() {
-        return zahlungsdaten;
-    }
-
-    /**
-     * Legt den Wert der zahlungsdaten-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ZahlungsdatenType }
-     *     
-     */
-    public void setZahlungsdaten(ZahlungsdatenType value) {
-        this.zahlungsdaten = value;
-    }
-
-    /**
-     * Ruft den Wert der sepa-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Short }
-     *     
-     */
-    public Short getSepa() {
-        return sepa;
-    }
-
-    /**
-     * Legt den Wert der sepa-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Short }
-     *     
-     */
-    public void setSepa(Short value) {
-        this.sepa = value;
-    }
-
-    /**
-     * Ruft den Wert der polizzenversand-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PolizzenversandType }
-     *     
-     */
-    public PolizzenversandType getPolizzenversand() {
-        return polizzenversand;
-    }
-
-    /**
-     * Legt den Wert der polizzenversand-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PolizzenversandType }
-     *     
-     */
-    public void setPolizzenversand(PolizzenversandType value) {
-        this.polizzenversand = value;
-    }
-
-    /**
-     * Ruft den Wert der datenschutzbestimmungen-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DatenverwendungType }
-     *     
-     */
-    public DatenverwendungType getDatenschutzbestimmungen() {
-        return datenschutzbestimmungen;
-    }
-
-    /**
-     * Legt den Wert der datenschutzbestimmungen-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DatenverwendungType }
-     *     
-     */
-    public void setDatenschutzbestimmungen(DatenverwendungType value) {
-        this.datenschutzbestimmungen = value;
-    }
-
-    /**
-     * Gets the value of the kontierung property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the kontierung property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getKontierung().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link KontierungType }
-     * 
-     * 
-     */
-    public List getKontierung() {
-        if (kontierung == null) {
-            kontierung = new ArrayList();
-        }
-        return this.kontierung;
-    }
-
-    /**
-     * Ruft den Wert der ersatzpolizzennummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ErsatzpolizzenType }
-     *     
-     */
-    public ErsatzpolizzenType getErsatzpolizzennummer() {
-        return ersatzpolizzennummer;
-    }
-
-    /**
-     * Legt den Wert der ersatzpolizzennummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ErsatzpolizzenType }
-     *     
-     */
-    public void setErsatzpolizzennummer(ErsatzpolizzenType value) {
-        this.ersatzpolizzennummer = value;
-    }
-
-    /**
-     * Gets the value of the zusendungWeitereDokumente property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zusendungWeitereDokumente property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZusendungWeitereDokumente().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List getZusendungWeitereDokumente() {
-        if (zusendungWeitereDokumente == null) {
-            zusendungWeitereDokumente = new ArrayList();
-        }
-        return this.zusendungWeitereDokumente;
-    }
-
-    /**
-     * Gets the value of the zusaetzlicheAntragsdaten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zusaetzlicheAntragsdaten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZusaetzlicheAntragsdaten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ZusaetzlicheAntragsdatenType }
-     * 
-     * 
-     */
-    public List getZusaetzlicheAntragsdaten() {
-        if (zusaetzlicheAntragsdaten == null) {
-            zusaetzlicheAntragsdaten = new ArrayList();
-        }
-        return this.zusaetzlicheAntragsdaten;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezAntragPersonenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezAntragPersonenType.java
deleted file mode 100644
index c738bd7c..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezAntragPersonenType.java
+++ /dev/null
@@ -1,159 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.FATCAType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.GMSGType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.PEPType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.TreuhaenderfrageType;
-import leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.SpezAntragLebenType;
-
-
-/**
- * Abstrakter Basistyp für Antrag in der Personenversicherung, der bei Request und bei Response gleich ist
- * 
- * 
Java-Klasse für SpezAntragPersonen_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezAntragPersonen_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezAntrag_Type">
- *       <sequence>
- *         <element name="FATCA" type="{urn:omds3CommonServiceTypes-1-1-0}FATCA_Type" minOccurs="0"/>
- *         <element name="GSGM" type="{urn:omds3CommonServiceTypes-1-1-0}GMSG_Type" minOccurs="0"/>
- *         <element name="PEP" type="{urn:omds3CommonServiceTypes-1-1-0}PEP_Type"/>
- *         <element name="Treuhaenderfrage" type="{urn:omds3CommonServiceTypes-1-1-0}Treuhaenderfrage_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezAntragPersonen_Type", propOrder = {
-    "fatca",
-    "gsgm",
-    "pep",
-    "treuhaenderfrage"
-})
-@XmlSeeAlso({
-    SpezAntragLebenType.class
-})
-public abstract class SpezAntragPersonenType
-    extends SpezAntragType
-{
-
-    @XmlElement(name = "FATCA")
-    protected FATCAType fatca;
-    @XmlElement(name = "GSGM")
-    protected GMSGType gsgm;
-    @XmlElement(name = "PEP", required = true)
-    protected PEPType pep;
-    @XmlElement(name = "Treuhaenderfrage", required = true)
-    protected TreuhaenderfrageType treuhaenderfrage;
-
-    /**
-     * Ruft den Wert der fatca-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FATCAType }
-     *     
-     */
-    public FATCAType getFATCA() {
-        return fatca;
-    }
-
-    /**
-     * Legt den Wert der fatca-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FATCAType }
-     *     
-     */
-    public void setFATCA(FATCAType value) {
-        this.fatca = value;
-    }
-
-    /**
-     * Ruft den Wert der gsgm-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GMSGType }
-     *     
-     */
-    public GMSGType getGSGM() {
-        return gsgm;
-    }
-
-    /**
-     * Legt den Wert der gsgm-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GMSGType }
-     *     
-     */
-    public void setGSGM(GMSGType value) {
-        this.gsgm = value;
-    }
-
-    /**
-     * Ruft den Wert der pep-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PEPType }
-     *     
-     */
-    public PEPType getPEP() {
-        return pep;
-    }
-
-    /**
-     * Legt den Wert der pep-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PEPType }
-     *     
-     */
-    public void setPEP(PEPType value) {
-        this.pep = value;
-    }
-
-    /**
-     * Ruft den Wert der treuhaenderfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TreuhaenderfrageType }
-     *     
-     */
-    public TreuhaenderfrageType getTreuhaenderfrage() {
-        return treuhaenderfrage;
-    }
-
-    /**
-     * Legt den Wert der treuhaenderfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TreuhaenderfrageType }
-     *     
-     */
-    public void setTreuhaenderfrage(TreuhaenderfrageType value) {
-        this.treuhaenderfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezAntragType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezAntragType.java
deleted file mode 100644
index f915e5c8..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezAntragType.java
+++ /dev/null
@@ -1,120 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.EinwilligungType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.SicherstellungType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.AntragSachPrivatType;
-import kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.SpezAntragKrankenType;
-import rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SpezAntragRechtsschutzType;
-import unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SpezAntragUnfallType;
-
-
-/**
- * Abstrakter Typ für Antrag, welcher auf SpezAntragBasis_Type ergänzt und der bei Request und bei Response gleich ist
- * 
- * 
Java-Klasse für SpezAntrag_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezAntrag_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezAntragBasis_Type">
- *       <sequence>
- *         <element name="Sicherstellungen" type="{urn:omds3CommonServiceTypes-1-1-0}Sicherstellung_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Einwilligungen" type="{urn:omds3CommonServiceTypes-1-1-0}Einwilligung_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezAntrag_Type", propOrder = {
-    "sicherstellungen",
-    "einwilligungen"
-})
-@XmlSeeAlso({
-    AntragSachPrivatType.class,
-    SpezAntragPersonenType.class,
-    SpezAntragKrankenType.class,
-    SpezAntragUnfallType.class,
-    SpezAntragRechtsschutzType.class
-})
-public abstract class SpezAntragType
-    extends SpezAntragBasisType
-{
-
-    @XmlElement(name = "Sicherstellungen")
-    protected List sicherstellungen;
-    @XmlElement(name = "Einwilligungen")
-    protected List einwilligungen;
-
-    /**
-     * Gets the value of the sicherstellungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the sicherstellungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getSicherstellungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link SicherstellungType }
-     * 
-     * 
-     */
-    public List getSicherstellungen() {
-        if (sicherstellungen == null) {
-            sicherstellungen = new ArrayList();
-        }
-        return this.sicherstellungen;
-    }
-
-    /**
-     * Gets the value of the einwilligungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the einwilligungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getEinwilligungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link EinwilligungType }
-     * 
-     * 
-     */
-    public List getEinwilligungen() {
-        if (einwilligungen == null) {
-            einwilligungen = new ArrayList();
-        }
-        return this.einwilligungen;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezBerechnungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezBerechnungType.java
deleted file mode 100644
index 76fde84d..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezBerechnungType.java
+++ /dev/null
@@ -1,87 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.BeteiligtePersonVertragType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.SpezBerechnungKfzType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.BerechnungSachPrivatType;
-import kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.SpezBerechnungKrankenType;
-import leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.SpezBerechnungLebenType;
-import rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SpezBerechnungRechtsschutzType;
-import unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SpezBerechnungUnfallType;
-
-
-/**
- * Abstrakter Basistyp Berechnung, der bei Request und bei Response gleich ist
- * 
- * 
Java-Klasse für SpezBerechnung_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezBerechnung_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Personen" type="{urn:omds3CommonServiceTypes-1-1-0}BeteiligtePersonVertrag_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezBerechnung_Type", propOrder = {
-    "personen"
-})
-@XmlSeeAlso({
-    BerechnungSachPrivatType.class,
-    SpezBerechnungLebenType.class,
-    SpezBerechnungKrankenType.class,
-    SpezBerechnungKfzType.class,
-    SpezBerechnungUnfallType.class,
-    SpezBerechnungRechtsschutzType.class
-})
-public abstract class SpezBerechnungType {
-
-    @XmlElement(name = "Personen")
-    protected List personen;
-
-    /**
-     * Gets the value of the personen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the personen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getPersonen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link BeteiligtePersonVertragType }
-     * 
-     * 
-     */
-    public List getPersonen() {
-        if (personen == null) {
-            personen = new ArrayList();
-        }
-        return this.personen;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezOffertType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezOffertType.java
deleted file mode 100644
index 87f67ba3..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezOffertType.java
+++ /dev/null
@@ -1,138 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.BeteiligtePersonVertragType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.SpezOffertKfzType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.OffertSachPrivatType;
-import kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.SpezOffertKrankenType;
-import leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.SpezOffertLebenType;
-import rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SpezOffertRechtsschutzType;
-import unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SpezOffertUnfallType;
-
-
-/**
- * Abstrakter Basistyp Offert, der bei Request und Response gleich ist
- * 
- * 
Java-Klasse für SpezOffert_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezOffert_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Offertnummer" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type" minOccurs="0"/>
- *         <element name="Personen" type="{urn:omds3CommonServiceTypes-1-1-0}BeteiligtePersonVertrag_Type" maxOccurs="unbounded"/>
- *         <element name="Versicherungsnehmer" type="{http://www.w3.org/2001/XMLSchema}unsignedShort"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezOffert_Type", propOrder = {
-    "offertnummer",
-    "personen",
-    "versicherungsnehmer"
-})
-@XmlSeeAlso({
-    OffertSachPrivatType.class,
-    SpezOffertLebenType.class,
-    SpezOffertKrankenType.class,
-    SpezOffertKfzType.class,
-    SpezOffertUnfallType.class,
-    SpezOffertRechtsschutzType.class
-})
-public abstract class SpezOffertType {
-
-    @XmlElement(name = "Offertnummer")
-    protected ObjektIdType offertnummer;
-    @XmlElement(name = "Personen", required = true)
-    protected List personen;
-    @XmlElement(name = "Versicherungsnehmer")
-    @XmlSchemaType(name = "unsignedShort")
-    protected int versicherungsnehmer;
-
-    /**
-     * Ruft den Wert der offertnummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getOffertnummer() {
-        return offertnummer;
-    }
-
-    /**
-     * Legt den Wert der offertnummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setOffertnummer(ObjektIdType value) {
-        this.offertnummer = value;
-    }
-
-    /**
-     * Gets the value of the personen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the personen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getPersonen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link BeteiligtePersonVertragType }
-     * 
-     * 
-     */
-    public List getPersonen() {
-        if (personen == null) {
-            personen = new ArrayList();
-        }
-        return this.personen;
-    }
-
-    /**
-     * Ruft den Wert der versicherungsnehmer-Eigenschaft ab.
-     * 
-     */
-    public int getVersicherungsnehmer() {
-        return versicherungsnehmer;
-    }
-
-    /**
-     * Legt den Wert der versicherungsnehmer-Eigenschaft fest.
-     * 
-     */
-    public void setVersicherungsnehmer(int value) {
-        this.versicherungsnehmer = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezVertragType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezVertragType.java
deleted file mode 100644
index 1982c91c..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezVertragType.java
+++ /dev/null
@@ -1,321 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.BeteiligtePersonVertragType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.KontierungType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VertragspersonType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ZahlungsdatenType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.SpezVertragKfzType;
-
-
-/**
- * Abstrakter Basistyp für Vertrag
- * 
- * 
Java-Klasse für SpezVertrag_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezVertrag_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Personen" type="{urn:omds3CommonServiceTypes-1-1-0}BeteiligtePersonVertrag_Type" maxOccurs="unbounded"/>
- *         <element name="Versicherungsnehmer" type="{http://www.w3.org/2001/XMLSchema}unsignedShort"/>
- *         <element name="AbweichenderPraemienzahler" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/>
- *         <element name="WeitereVersicherungsnehmer" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="WeitereVertragspersonen" type="{urn:omds3CommonServiceTypes-1-1-0}Vertragsperson_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Zahlungsdaten" type="{urn:omds3CommonServiceTypes-1-1-0}Zahlungsdaten_Type"/>
- *         <element name="Sepa" type="{urn:omds3CommonServiceTypes-1-1-0}SepaCd_Type" minOccurs="0"/>
- *         <element name="Kontierung" type="{urn:omds3CommonServiceTypes-1-1-0}Kontierung_Type" maxOccurs="3" minOccurs="0"/>
- *         <element name="ZusaetzlicheVertragsdaten" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}ZusaetzlicheVertragsdaten_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezVertrag_Type", propOrder = {
-    "personen",
-    "versicherungsnehmer",
-    "abweichenderPraemienzahler",
-    "weitereVersicherungsnehmer",
-    "weitereVertragspersonen",
-    "zahlungsdaten",
-    "sepa",
-    "kontierung",
-    "zusaetzlicheVertragsdaten"
-})
-@XmlSeeAlso({
-    SpezVertragKfzType.class
-})
-public abstract class SpezVertragType {
-
-    @XmlElement(name = "Personen", required = true)
-    protected List personen;
-    @XmlElement(name = "Versicherungsnehmer")
-    @XmlSchemaType(name = "unsignedShort")
-    protected int versicherungsnehmer;
-    @XmlElement(name = "AbweichenderPraemienzahler")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer abweichenderPraemienzahler;
-    @XmlElement(name = "WeitereVersicherungsnehmer", type = Integer.class)
-    @XmlSchemaType(name = "unsignedShort")
-    protected List weitereVersicherungsnehmer;
-    @XmlElement(name = "WeitereVertragspersonen")
-    protected List weitereVertragspersonen;
-    @XmlElement(name = "Zahlungsdaten", required = true)
-    protected ZahlungsdatenType zahlungsdaten;
-    @XmlElement(name = "Sepa")
-    @XmlSchemaType(name = "unsignedByte")
-    protected Short sepa;
-    @XmlElement(name = "Kontierung")
-    protected List kontierung;
-    @XmlElement(name = "ZusaetzlicheVertragsdaten")
-    protected List zusaetzlicheVertragsdaten;
-
-    /**
-     * Gets the value of the personen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the personen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getPersonen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link BeteiligtePersonVertragType }
-     * 
-     * 
-     */
-    public List getPersonen() {
-        if (personen == null) {
-            personen = new ArrayList();
-        }
-        return this.personen;
-    }
-
-    /**
-     * Ruft den Wert der versicherungsnehmer-Eigenschaft ab.
-     * 
-     */
-    public int getVersicherungsnehmer() {
-        return versicherungsnehmer;
-    }
-
-    /**
-     * Legt den Wert der versicherungsnehmer-Eigenschaft fest.
-     * 
-     */
-    public void setVersicherungsnehmer(int value) {
-        this.versicherungsnehmer = value;
-    }
-
-    /**
-     * Ruft den Wert der abweichenderPraemienzahler-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getAbweichenderPraemienzahler() {
-        return abweichenderPraemienzahler;
-    }
-
-    /**
-     * Legt den Wert der abweichenderPraemienzahler-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setAbweichenderPraemienzahler(Integer value) {
-        this.abweichenderPraemienzahler = value;
-    }
-
-    /**
-     * Gets the value of the weitereVersicherungsnehmer property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the weitereVersicherungsnehmer property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getWeitereVersicherungsnehmer().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link Integer }
-     * 
-     * 
-     */
-    public List getWeitereVersicherungsnehmer() {
-        if (weitereVersicherungsnehmer == null) {
-            weitereVersicherungsnehmer = new ArrayList();
-        }
-        return this.weitereVersicherungsnehmer;
-    }
-
-    /**
-     * Gets the value of the weitereVertragspersonen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the weitereVertragspersonen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getWeitereVertragspersonen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link VertragspersonType }
-     * 
-     * 
-     */
-    public List getWeitereVertragspersonen() {
-        if (weitereVertragspersonen == null) {
-            weitereVertragspersonen = new ArrayList();
-        }
-        return this.weitereVertragspersonen;
-    }
-
-    /**
-     * Ruft den Wert der zahlungsdaten-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ZahlungsdatenType }
-     *     
-     */
-    public ZahlungsdatenType getZahlungsdaten() {
-        return zahlungsdaten;
-    }
-
-    /**
-     * Legt den Wert der zahlungsdaten-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ZahlungsdatenType }
-     *     
-     */
-    public void setZahlungsdaten(ZahlungsdatenType value) {
-        this.zahlungsdaten = value;
-    }
-
-    /**
-     * Ruft den Wert der sepa-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Short }
-     *     
-     */
-    public Short getSepa() {
-        return sepa;
-    }
-
-    /**
-     * Legt den Wert der sepa-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Short }
-     *     
-     */
-    public void setSepa(Short value) {
-        this.sepa = value;
-    }
-
-    /**
-     * Gets the value of the kontierung property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the kontierung property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getKontierung().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link KontierungType }
-     * 
-     * 
-     */
-    public List getKontierung() {
-        if (kontierung == null) {
-            kontierung = new ArrayList();
-        }
-        return this.kontierung;
-    }
-
-    /**
-     * Gets the value of the zusaetzlicheVertragsdaten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zusaetzlicheVertragsdaten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZusaetzlicheVertragsdaten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ZusaetzlicheVertragsdatenType }
-     * 
-     * 
-     */
-    public List getZusaetzlicheVertragsdaten() {
-        if (zusaetzlicheVertragsdaten == null) {
-            zusaetzlicheVertragsdaten = new ArrayList();
-        }
-        return this.zusaetzlicheVertragsdaten;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/StartPolicyChangeRequest.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/StartPolicyChangeRequest.java
deleted file mode 100644
index a8ff67d5..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/StartPolicyChangeRequest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-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.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonProcessRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ErsatzpolizzeType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonProcessRequest_Type">
- *       <sequence>
- *         <element name="Vertrag" type="{urn:omds3CommonServiceTypes-1-1-0}Ersatzpolizze_Type" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "vertrag"
-})
-@XmlRootElement(name = "StartPolicyChangeRequest")
-public class StartPolicyChangeRequest
-    extends CommonProcessRequestType
-{
-
-    @XmlElement(name = "Vertrag", required = true)
-    protected List vertrag;
-
-    /**
-     * Gets the value of the vertrag property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the vertrag property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVertrag().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ErsatzpolizzeType }
-     * 
-     * 
-     */
-    public List getVertrag() {
-        if (vertrag == null) {
-            vertrag = new ArrayList();
-        }
-        return this.vertrag;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/StartPolicyChangeResponse.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/StartPolicyChangeResponse.java
deleted file mode 100644
index 7011dba1..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/StartPolicyChangeResponse.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonProcessResponseType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonProcessResponse_Type">
- *       <sequence>
- *         <element name="Vertrag" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezVertrag_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "vertrag"
-})
-@XmlRootElement(name = "StartPolicyChangeResponse")
-public class StartPolicyChangeResponse
-    extends CommonProcessResponseType
-{
-
-    @XmlElement(name = "Vertrag")
-    protected SpezVertragType vertrag;
-
-    /**
-     * Ruft den Wert der vertrag-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezVertragType }
-     *     
-     */
-    public SpezVertragType getVertrag() {
-        return vertrag;
-    }
-
-    /**
-     * Legt den Wert der vertrag-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezVertragType }
-     *     
-     */
-    public void setVertrag(SpezVertragType value) {
-        this.vertrag = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationRequestGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationRequestGenType.java
deleted file mode 100644
index 92fe7c50..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationRequestGenType.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.SubmitApplicationSachPrivatRequestType;
-import kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.SubmitApplicationKrankenRequest;
-import leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.SubmitApplicationLebenRequestType;
-import rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SubmitApplicationRechtsschutzRequest;
-import unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SubmitApplicationUnfallRequestType;
-
-
-/**
- * Abstrakter Request der Antragsüberleitung mit generischen Produktbausteinen
- * 
- * 
Java-Klasse für SubmitApplicationRequestGen_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SubmitApplicationRequestGen_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SubmitApplicationRequest_Type">
- *       <sequence>
- *         <element name="Produktmetadaten" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SubmitApplicationRequestGen_Type", propOrder = {
-    "produktmetadaten"
-})
-@XmlSeeAlso({
-    SubmitApplicationSachPrivatRequestType.class,
-    SubmitApplicationLebenRequestType.class,
-    SubmitApplicationUnfallRequestType.class,
-    SubmitApplicationRechtsschutzRequest.class,
-    SubmitApplicationKrankenRequest.class
-})
-public abstract class SubmitApplicationRequestGenType
-    extends SubmitApplicationRequestType
-{
-
-    @XmlElement(name = "Produktmetadaten")
-    protected boolean produktmetadaten;
-
-    /**
-     * Ruft den Wert der produktmetadaten-Eigenschaft ab.
-     * 
-     */
-    public boolean isProduktmetadaten() {
-        return produktmetadaten;
-    }
-
-    /**
-     * Legt den Wert der produktmetadaten-Eigenschaft fest.
-     * 
-     */
-    public void setProduktmetadaten(boolean value) {
-        this.produktmetadaten = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationRequestType.java
deleted file mode 100644
index 51d324fa..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationRequestType.java
+++ /dev/null
@@ -1,143 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.DateianhangType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ProzessDokumentType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.SubmitApplicationKfzRequestType;
-
-
-/**
- * Abstrakter Request für die Antragsüberleitung
- * 
- * 
Java-Klasse für SubmitApplicationRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SubmitApplicationRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}BOAProcessRequest_Type">
- *       <sequence>
- *         <element name="Dateianhaenge" type="{urn:omds3CommonServiceTypes-1-1-0}Dateianhang_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Dokumente" type="{urn:omds3CommonServiceTypes-1-1-0}ProzessDokument_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Antragsnummer" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SubmitApplicationRequest_Type", propOrder = {
-    "dateianhaenge",
-    "dokumente",
-    "antragsnummer"
-})
-@XmlSeeAlso({
-    SubmitApplicationKfzRequestType.class,
-    SubmitApplicationRequestGenType.class
-})
-public abstract class SubmitApplicationRequestType
-    extends BOAProcessRequestType
-{
-
-    @XmlElement(name = "Dateianhaenge")
-    protected List dateianhaenge;
-    @XmlElement(name = "Dokumente")
-    protected List dokumente;
-    @XmlElement(name = "Antragsnummer")
-    protected ObjektIdType antragsnummer;
-
-    /**
-     * Gets the value of the dateianhaenge property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the dateianhaenge property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDateianhaenge().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link DateianhangType }
-     * 
-     * 
-     */
-    public List getDateianhaenge() {
-        if (dateianhaenge == null) {
-            dateianhaenge = new ArrayList();
-        }
-        return this.dateianhaenge;
-    }
-
-    /**
-     * Gets the value of the dokumente property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the dokumente property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDokumente().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ProzessDokumentType }
-     * 
-     * 
-     */
-    public List getDokumente() {
-        if (dokumente == null) {
-            dokumente = new ArrayList();
-        }
-        return this.dokumente;
-    }
-
-    /**
-     * Ruft den Wert der antragsnummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getAntragsnummer() {
-        return antragsnummer;
-    }
-
-    /**
-     * Legt den Wert der antragsnummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setAntragsnummer(ObjektIdType value) {
-        this.antragsnummer = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationResponseGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationResponseGenType.java
deleted file mode 100644
index 3e7068c3..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationResponseGenType.java
+++ /dev/null
@@ -1,47 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.SubmitApplicationSachPrivatResponseType;
-import kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.SubmitApplicationKrankenResponse;
-import leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.SubmitApplicationLebenResponseType;
-import rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SubmitApplicationRechtsschutzResponse;
-import unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SubmitApplicationUnfallResponseType;
-
-
-/**
- * Abstrakter Response der Antragsüberleitung
- * 
- * 
Java-Klasse für SubmitApplicationResponseGen_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SubmitApplicationResponseGen_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SubmitApplicationResponse_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SubmitApplicationResponseGen_Type")
-@XmlSeeAlso({
-    SubmitApplicationSachPrivatResponseType.class,
-    SubmitApplicationLebenResponseType.class,
-    SubmitApplicationUnfallResponseType.class,
-    SubmitApplicationRechtsschutzResponse.class,
-    SubmitApplicationKrankenResponse.class
-})
-public abstract class SubmitApplicationResponseGenType
-    extends SubmitApplicationResponseType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationResponseType.java
deleted file mode 100644
index e75b3129..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationResponseType.java
+++ /dev/null
@@ -1,163 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.DokumentInfoType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ProzessDokumentBasisType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.SubmitApplicationKfzResponseType;
-
-
-/**
- * Abstrakter Response der Antragsüberleitung
- * 
- * 
Java-Klasse für SubmitApplicationResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SubmitApplicationResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}BOAProcessResponse_Type">
- *       <sequence>
- *         <element name="Antragstatus" type="{urn:omds3CommonServiceTypes-1-1-0}SubmitApplicationStatus_Type"/>
- *         <element name="Antragsnummer" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type"/>
- *         <element name="Dokumente" type="{urn:omds3CommonServiceTypes-1-1-0}DokumentInfo_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="DokumenteAnforderungen" type="{urn:omds3CommonServiceTypes-1-1-0}ProzessDokumentBasis_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SubmitApplicationResponse_Type", propOrder = {
-    "antragstatus",
-    "antragsnummer",
-    "dokumente",
-    "dokumenteAnforderungen"
-})
-@XmlSeeAlso({
-    SubmitApplicationKfzResponseType.class,
-    SubmitApplicationResponseGenType.class
-})
-public abstract class SubmitApplicationResponseType
-    extends BOAProcessResponseType
-{
-
-    @XmlElement(name = "Antragstatus")
-    protected int antragstatus;
-    @XmlElement(name = "Antragsnummer", required = true)
-    protected ObjektIdType antragsnummer;
-    @XmlElement(name = "Dokumente")
-    protected List dokumente;
-    @XmlElement(name = "DokumenteAnforderungen")
-    protected List dokumenteAnforderungen;
-
-    /**
-     * Ruft den Wert der antragstatus-Eigenschaft ab.
-     * 
-     */
-    public int getAntragstatus() {
-        return antragstatus;
-    }
-
-    /**
-     * Legt den Wert der antragstatus-Eigenschaft fest.
-     * 
-     */
-    public void setAntragstatus(int value) {
-        this.antragstatus = value;
-    }
-
-    /**
-     * Ruft den Wert der antragsnummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getAntragsnummer() {
-        return antragsnummer;
-    }
-
-    /**
-     * Legt den Wert der antragsnummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setAntragsnummer(ObjektIdType value) {
-        this.antragsnummer = value;
-    }
-
-    /**
-     * Gets the value of the dokumente property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the dokumente property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDokumente().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link DokumentInfoType }
-     * 
-     * 
-     */
-    public List getDokumente() {
-        if (dokumente == null) {
-            dokumente = new ArrayList();
-        }
-        return this.dokumente;
-    }
-
-    /**
-     * Gets the value of the dokumenteAnforderungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the dokumenteAnforderungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDokumenteAnforderungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ProzessDokumentBasisType }
-     * 
-     * 
-     */
-    public List getDokumenteAnforderungen() {
-        if (dokumenteAnforderungen == null) {
-            dokumenteAnforderungen = new ArrayList();
-        }
-        return this.dokumenteAnforderungen;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/ZusaetzlicheAntragsdatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/ZusaetzlicheAntragsdatenType.java
deleted file mode 100644
index 35a71f93..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/ZusaetzlicheAntragsdatenType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Typ fuer die Erweiterung des Antrags um Elemente, die nicht im Standard enthalten sind
- * 
- * 
Java-Klasse für ZusaetzlicheAntragsdaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheAntragsdaten_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheAntragsdaten_Type")
-public abstract class ZusaetzlicheAntragsdatenType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/ZusaetzlicheVertragsdatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/ZusaetzlicheVertragsdatenType.java
deleted file mode 100644
index 06ee3c8d..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/ZusaetzlicheVertragsdatenType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Typ fuer die Erweiterung des Vertrags um Elemente, die nicht im Standard enthalten sind
- * 
- * 
Java-Klasse für ZusaetzlicheVertragsdaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheVertragsdaten_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheVertragsdaten_Type")
-public abstract class ZusaetzlicheVertragsdatenType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/package-info.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/package-info.java
deleted file mode 100644
index d95cefc7..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common;
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ArtBesichtigungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ArtBesichtigungType.java
deleted file mode 100644
index 82594a3b..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ArtBesichtigungType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
Java-Klasse für ArtBesichtigung_Type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

- * 
- * <simpleType name="ArtBesichtigung_Type">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="Besichtigung durch Betreuer"/>
- *     <enumeration value="Kaufvertrag Markenhaendler mit Beschreibung"/>
- *     <enumeration value="Besichtigung durch ARBOE, OEAMTC"/>
- *     <enumeration value="Nachbesichtigung"/>
- *   </restriction>
- * </simpleType>
- * 

- * 
- */
-@XmlType(name = "ArtBesichtigung_Type")
-@XmlEnum
-public enum ArtBesichtigungType {
-
-    @XmlEnumValue("Besichtigung durch Betreuer")
-    BESICHTIGUNG_DURCH_BETREUER("Besichtigung durch Betreuer"),
-    @XmlEnumValue("Kaufvertrag Markenhaendler mit Beschreibung")
-    KAUFVERTRAG_MARKENHAENDLER_MIT_BESCHREIBUNG("Kaufvertrag Markenhaendler mit Beschreibung"),
-    @XmlEnumValue("Besichtigung durch ARBOE, OEAMTC")
-    BESICHTIGUNG_DURCH_ARBOE_OEAMTC("Besichtigung durch ARBOE, OEAMTC"),
-    @XmlEnumValue("Nachbesichtigung")
-    NACHBESICHTIGUNG("Nachbesichtigung");
-    private final String value;
-
-    ArtBesichtigungType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static ArtBesichtigungType fromValue(String v) {
-        for (ArtBesichtigungType c: ArtBesichtigungType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/AssistanceKfzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/AssistanceKfzType.java
deleted file mode 100644
index 284e85dc..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/AssistanceKfzType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Typ für das Elementarprodukt KFZ-Assistance
- * 
- * 
Java-Klasse für AssistanceKfz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AssistanceKfz_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}ElementarproduktKfz_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AssistanceKfz_Type")
-public class AssistanceKfzType
-    extends ElementarproduktKfzType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CalculateKfzRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CalculateKfzRequestType.java
deleted file mode 100644
index 901b6d52..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CalculateKfzRequestType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CalculateRequestType;
-
-
-/**
- * Typ des Requestobjekts für eine Kfz-Berechnung
- * 
- * 
Java-Klasse für CalculateKfzRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CalculateKfzRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CalculateRequest_Type">
- *       <sequence>
- *         <element name="Berechnungsanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}SpezBerechnungKfz_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CalculateKfzRequest_Type", propOrder = {
-    "berechnungsanfrage"
-})
-public class CalculateKfzRequestType
-    extends CalculateRequestType
-{
-
-    @XmlElement(name = "Berechnungsanfrage", required = true)
-    protected SpezBerechnungKfzType berechnungsanfrage;
-
-    /**
-     * Ruft den Wert der berechnungsanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezBerechnungKfzType }
-     *     
-     */
-    public SpezBerechnungKfzType getBerechnungsanfrage() {
-        return berechnungsanfrage;
-    }
-
-    /**
-     * Legt den Wert der berechnungsanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezBerechnungKfzType }
-     *     
-     */
-    public void setBerechnungsanfrage(SpezBerechnungKfzType value) {
-        this.berechnungsanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CalculateKfzResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CalculateKfzResponseType.java
deleted file mode 100644
index a0e92564..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CalculateKfzResponseType.java
+++ /dev/null
@@ -1,95 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CalculateResponseType;
-
-
-/**
- * Typ des Responseobjekts für eine Kfz-Berechnung
- * 
- * 
Java-Klasse für CalculateKfzResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CalculateKfzResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CalculateResponse_Type">
- *       <sequence>
- *         <element name="Berechnungsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}SpezBerechnungKfz_Type" minOccurs="0"/>
- *         <element name="ResponseUpselling" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}UpsellingKfzResponse_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CalculateKfzResponse_Type", propOrder = {
-    "berechnungsantwort",
-    "responseUpselling"
-})
-public class CalculateKfzResponseType
-    extends CalculateResponseType
-{
-
-    @XmlElement(name = "Berechnungsantwort")
-    protected SpezBerechnungKfzType berechnungsantwort;
-    @XmlElement(name = "ResponseUpselling")
-    protected UpsellingKfzResponseType responseUpselling;
-
-    /**
-     * Ruft den Wert der berechnungsantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezBerechnungKfzType }
-     *     
-     */
-    public SpezBerechnungKfzType getBerechnungsantwort() {
-        return berechnungsantwort;
-    }
-
-    /**
-     * Legt den Wert der berechnungsantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezBerechnungKfzType }
-     *     
-     */
-    public void setBerechnungsantwort(SpezBerechnungKfzType value) {
-        this.berechnungsantwort = value;
-    }
-
-    /**
-     * Ruft den Wert der responseUpselling-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link UpsellingKfzResponseType }
-     *     
-     */
-    public UpsellingKfzResponseType getResponseUpselling() {
-        return responseUpselling;
-    }
-
-    /**
-     * Legt den Wert der responseUpselling-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link UpsellingKfzResponseType }
-     *     
-     */
-    public void setResponseUpselling(UpsellingKfzResponseType value) {
-        this.responseUpselling = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CreateApplicationKfzRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CreateApplicationKfzRequestType.java
deleted file mode 100644
index dc28cc07..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CreateApplicationKfzRequestType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateApplicationRequestType;
-
-
-/**
- * Typ des Requestobjekts für die Erzeugung eines Kfz-Antrags
- * 
- * 
Java-Klasse für CreateApplicationKfzRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateApplicationKfzRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateApplicationRequest_Type">
- *       <sequence>
- *         <element name="Antraganfrage" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}SpezAntragKfz_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateApplicationKfzRequest_Type", propOrder = {
-    "antraganfrage"
-})
-public class CreateApplicationKfzRequestType
-    extends CreateApplicationRequestType
-{
-
-    @XmlElement(name = "Antraganfrage", required = true)
-    protected SpezAntragKfzType antraganfrage;
-
-    /**
-     * Ruft den Wert der antraganfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezAntragKfzType }
-     *     
-     */
-    public SpezAntragKfzType getAntraganfrage() {
-        return antraganfrage;
-    }
-
-    /**
-     * Legt den Wert der antraganfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezAntragKfzType }
-     *     
-     */
-    public void setAntraganfrage(SpezAntragKfzType value) {
-        this.antraganfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CreateApplicationKfzResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CreateApplicationKfzResponseType.java
deleted file mode 100644
index adfb75ab..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CreateApplicationKfzResponseType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateApplicationResponseType;
-
-
-/**
- * Typ des Responseobjekts für die Erzeugung eines Kfz-Antrags
- * 
- * 
Java-Klasse für CreateApplicationKfzResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateApplicationKfzResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateApplicationResponse_Type">
- *       <sequence>
- *         <element name="Antragantwort" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}SpezAntragKfz_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateApplicationKfzResponse_Type", propOrder = {
-    "antragantwort"
-})
-public class CreateApplicationKfzResponseType
-    extends CreateApplicationResponseType
-{
-
-    @XmlElement(name = "Antragantwort")
-    protected SpezAntragKfzType antragantwort;
-
-    /**
-     * Ruft den Wert der antragantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezAntragKfzType }
-     *     
-     */
-    public SpezAntragKfzType getAntragantwort() {
-        return antragantwort;
-    }
-
-    /**
-     * Legt den Wert der antragantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezAntragKfzType }
-     *     
-     */
-    public void setAntragantwort(SpezAntragKfzType value) {
-        this.antragantwort = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CreateOfferKfzRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CreateOfferKfzRequestType.java
deleted file mode 100644
index 66d50c64..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CreateOfferKfzRequestType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateOfferRequestType;
-
-
-/**
- * Typ des Request für ein Kfz-Offert
- * 
- * 
Java-Klasse für CreateOfferKfzRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateOfferKfzRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateOfferRequest_Type">
- *       <sequence>
- *         <element name="Offertanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}SpezOffertKfz_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateOfferKfzRequest_Type", propOrder = {
-    "offertanfrage"
-})
-public class CreateOfferKfzRequestType
-    extends CreateOfferRequestType
-{
-
-    @XmlElement(name = "Offertanfrage", required = true)
-    protected SpezOffertKfzType offertanfrage;
-
-    /**
-     * Ruft den Wert der offertanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezOffertKfzType }
-     *     
-     */
-    public SpezOffertKfzType getOffertanfrage() {
-        return offertanfrage;
-    }
-
-    /**
-     * Legt den Wert der offertanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezOffertKfzType }
-     *     
-     */
-    public void setOffertanfrage(SpezOffertKfzType value) {
-        this.offertanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CreateOfferKfzResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CreateOfferKfzResponseType.java
deleted file mode 100644
index 13e9e773..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/CreateOfferKfzResponseType.java
+++ /dev/null
@@ -1,100 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateOfferResponseType;
-
-
-/**
- * Typ des Response für ein Kfz-Offert
- * 
- * 
Java-Klasse für CreateOfferKfzResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateOfferKfzResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateOfferResponse_Type">
- *       <sequence>
- *         <element name="Offertantwort" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}SpezOffertKfz_Type">
- *               </extension>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateOfferKfzResponse_Type", propOrder = {
-    "offertantwort"
-})
-public class CreateOfferKfzResponseType
-    extends CreateOfferResponseType
-{
-
-    @XmlElement(name = "Offertantwort")
-    protected CreateOfferKfzResponseType.Offertantwort offertantwort;
-
-    /**
-     * Ruft den Wert der offertantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CreateOfferKfzResponseType.Offertantwort }
-     *     
-     */
-    public CreateOfferKfzResponseType.Offertantwort getOffertantwort() {
-        return offertantwort;
-    }
-
-    /**
-     * Legt den Wert der offertantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CreateOfferKfzResponseType.Offertantwort }
-     *     
-     */
-    public void setOffertantwort(CreateOfferKfzResponseType.Offertantwort value) {
-        this.offertantwort = value;
-    }
-
-
-    /**
-     * 
Java-Klasse für anonymous complex type.
-     * 
-     * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}SpezOffertKfz_Type">
-     *     </extension>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Offertantwort
-        extends SpezOffertKfzType
-    {
-
-
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ElementarproduktKfzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ElementarproduktKfzType.java
deleted file mode 100644
index 2b9c7f79..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ElementarproduktKfzType.java
+++ /dev/null
@@ -1,103 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ElementarproduktType;
-
-
-/**
- * Abstrakte Basisklasse für KFZ-Elementarprodukte
- * 
- * 
Java-Klasse für ElementarproduktKfz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ElementarproduktKfz_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Elementarprodukt_Type">
- *       <sequence>
- *         <element ref="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}FahrzeugRefLfdNr" minOccurs="0"/>
- *         <element name="LeasingVerbundUnternehmen" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ElementarproduktKfz_Type", propOrder = {
-    "fahrzeugRefLfdNr",
-    "leasingVerbundUnternehmen"
-})
-@XmlSeeAlso({
-    HaftpflichtKfzType.class,
-    KaskoKfzType.class,
-    InsassenUnfallKfzType.class,
-    LenkerUnfallKfzType.class,
-    AssistanceKfzType.class
-})
-public abstract class ElementarproduktKfzType
-    extends ElementarproduktType
-{
-
-    @XmlElement(name = "FahrzeugRefLfdNr")
-    protected String fahrzeugRefLfdNr;
-    @XmlElement(name = "LeasingVerbundUnternehmen")
-    protected Boolean leasingVerbundUnternehmen;
-
-    /**
-     * Ruft den Wert der fahrzeugRefLfdNr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFahrzeugRefLfdNr() {
-        return fahrzeugRefLfdNr;
-    }
-
-    /**
-     * Legt den Wert der fahrzeugRefLfdNr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFahrzeugRefLfdNr(String value) {
-        this.fahrzeugRefLfdNr = value;
-    }
-
-    /**
-     * Ruft den Wert der leasingVerbundUnternehmen-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isLeasingVerbundUnternehmen() {
-        return leasingVerbundUnternehmen;
-    }
-
-    /**
-     * Legt den Wert der leasingVerbundUnternehmen-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setLeasingVerbundUnternehmen(Boolean value) {
-        this.leasingVerbundUnternehmen = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/FetchPolicyKfzResponse.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/FetchPolicyKfzResponse.java
deleted file mode 100644
index 1e1594b9..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/FetchPolicyKfzResponse.java
+++ /dev/null
@@ -1,85 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-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.XmlElementRef;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.FetchPolicyResponseType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}FetchPolicyResponse_Type">
- *       <sequence>
- *         <element name="Vertrag" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}SpezVertragKfz_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "rest"
-})
-@XmlRootElement(name = "FetchPolicyKfzResponse")
-public class FetchPolicyKfzResponse
-    extends FetchPolicyResponseType
-{
-
-    @XmlElementRef(name = "Vertrag", namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", type = JAXBElement.class, required = false)
-    protected List> rest;
-
-    /**
-     * Ruft das restliche Contentmodell ab. 
-     * 
-     * 

-     * Sie rufen diese "catch-all"-Eigenschaft aus folgendem Grund ab: 
-     * Der Feldname "Vertrag" wird von zwei verschiedenen Teilen eines Schemas verwendet. Siehe: 
-     * Zeile 425 von file:/C:/Users/jensb/git/omdsservicedefinitions/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Kfz.xsd
-     * Zeile 577 von file:/C:/Users/jensb/git/omdsservicedefinitions/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Common.xsd
-     * 

-     * Um diese Eigenschaft zu entfernen, wenden Sie eine Eigenschaftenanpassung für eine
-     * der beiden folgenden Deklarationen an, um deren Namen zu ändern: 
-     * Gets the value of the rest property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the rest property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getRest().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link SpezVertragKfzType }{@code >}
-     * 
-     * 
-     */
-    public List> getRest() {
-        if (rest == null) {
-            rest = new ArrayList>();
-        }
-        return this.rest;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/FzZustandBesichtigungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/FzZustandBesichtigungType.java
deleted file mode 100644
index 1c81f588..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/FzZustandBesichtigungType.java
+++ /dev/null
@@ -1,295 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-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.datatype.XMLGregorianCalendar;
-
-
-/**
- * Ergebnisse einer Besichtigung
- * 
- * 
Java-Klasse für FzZustandBesichtigung_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="FzZustandBesichtigung_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ZustandsberichtLiegtAlsFormularBei" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="ArtBesichtigung" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}ArtBesichtigung_Type"/>
- *         <element name="SchaedenAnScheibenKleinglas" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}SchaedenAnScheibenKleinglas_Type" minOccurs="0"/>
- *         <element name="SchaedenAmFahrzeug" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}SchaedenAmFahrzeug_Type" minOccurs="0"/>
- *         <element name="KilometerLtBesichtigung" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
- *         <element name="Vorschaeden" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Besichtigungsort" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Besichtigungsdatum" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
- *         <element name="GrundFuerNachbesichtigung" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FzZustandBesichtigung_Type", propOrder = {
-    "zustandsberichtLiegtAlsFormularBei",
-    "artBesichtigung",
-    "schaedenAnScheibenKleinglas",
-    "schaedenAmFahrzeug",
-    "kilometerLtBesichtigung",
-    "vorschaeden",
-    "besichtigungsort",
-    "besichtigungsdatum",
-    "grundFuerNachbesichtigung"
-})
-public class FzZustandBesichtigungType {
-
-    @XmlElement(name = "ZustandsberichtLiegtAlsFormularBei")
-    protected Boolean zustandsberichtLiegtAlsFormularBei;
-    @XmlElement(name = "ArtBesichtigung", required = true)
-    @XmlSchemaType(name = "string")
-    protected ArtBesichtigungType artBesichtigung;
-    @XmlElement(name = "SchaedenAnScheibenKleinglas")
-    @XmlSchemaType(name = "string")
-    protected SchaedenAnScheibenKleinglasType schaedenAnScheibenKleinglas;
-    @XmlElement(name = "SchaedenAmFahrzeug")
-    @XmlSchemaType(name = "string")
-    protected SchaedenAmFahrzeugType schaedenAmFahrzeug;
-    @XmlElement(name = "KilometerLtBesichtigung")
-    protected BigInteger kilometerLtBesichtigung;
-    @XmlElement(name = "Vorschaeden")
-    protected String vorschaeden;
-    @XmlElement(name = "Besichtigungsort")
-    protected String besichtigungsort;
-    @XmlElement(name = "Besichtigungsdatum")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar besichtigungsdatum;
-    @XmlElement(name = "GrundFuerNachbesichtigung")
-    protected String grundFuerNachbesichtigung;
-
-    /**
-     * Ruft den Wert der zustandsberichtLiegtAlsFormularBei-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isZustandsberichtLiegtAlsFormularBei() {
-        return zustandsberichtLiegtAlsFormularBei;
-    }
-
-    /**
-     * Legt den Wert der zustandsberichtLiegtAlsFormularBei-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setZustandsberichtLiegtAlsFormularBei(Boolean value) {
-        this.zustandsberichtLiegtAlsFormularBei = value;
-    }
-
-    /**
-     * Ruft den Wert der artBesichtigung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ArtBesichtigungType }
-     *     
-     */
-    public ArtBesichtigungType getArtBesichtigung() {
-        return artBesichtigung;
-    }
-
-    /**
-     * Legt den Wert der artBesichtigung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ArtBesichtigungType }
-     *     
-     */
-    public void setArtBesichtigung(ArtBesichtigungType value) {
-        this.artBesichtigung = value;
-    }
-
-    /**
-     * Ruft den Wert der schaedenAnScheibenKleinglas-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SchaedenAnScheibenKleinglasType }
-     *     
-     */
-    public SchaedenAnScheibenKleinglasType getSchaedenAnScheibenKleinglas() {
-        return schaedenAnScheibenKleinglas;
-    }
-
-    /**
-     * Legt den Wert der schaedenAnScheibenKleinglas-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SchaedenAnScheibenKleinglasType }
-     *     
-     */
-    public void setSchaedenAnScheibenKleinglas(SchaedenAnScheibenKleinglasType value) {
-        this.schaedenAnScheibenKleinglas = value;
-    }
-
-    /**
-     * Ruft den Wert der schaedenAmFahrzeug-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SchaedenAmFahrzeugType }
-     *     
-     */
-    public SchaedenAmFahrzeugType getSchaedenAmFahrzeug() {
-        return schaedenAmFahrzeug;
-    }
-
-    /**
-     * Legt den Wert der schaedenAmFahrzeug-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SchaedenAmFahrzeugType }
-     *     
-     */
-    public void setSchaedenAmFahrzeug(SchaedenAmFahrzeugType value) {
-        this.schaedenAmFahrzeug = value;
-    }
-
-    /**
-     * Ruft den Wert der kilometerLtBesichtigung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getKilometerLtBesichtigung() {
-        return kilometerLtBesichtigung;
-    }
-
-    /**
-     * Legt den Wert der kilometerLtBesichtigung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setKilometerLtBesichtigung(BigInteger value) {
-        this.kilometerLtBesichtigung = value;
-    }
-
-    /**
-     * Ruft den Wert der vorschaeden-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVorschaeden() {
-        return vorschaeden;
-    }
-
-    /**
-     * Legt den Wert der vorschaeden-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVorschaeden(String value) {
-        this.vorschaeden = value;
-    }
-
-    /**
-     * Ruft den Wert der besichtigungsort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBesichtigungsort() {
-        return besichtigungsort;
-    }
-
-    /**
-     * Legt den Wert der besichtigungsort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBesichtigungsort(String value) {
-        this.besichtigungsort = value;
-    }
-
-    /**
-     * Ruft den Wert der besichtigungsdatum-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getBesichtigungsdatum() {
-        return besichtigungsdatum;
-    }
-
-    /**
-     * Legt den Wert der besichtigungsdatum-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setBesichtigungsdatum(XMLGregorianCalendar value) {
-        this.besichtigungsdatum = value;
-    }
-
-    /**
-     * Ruft den Wert der grundFuerNachbesichtigung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGrundFuerNachbesichtigung() {
-        return grundFuerNachbesichtigung;
-    }
-
-    /**
-     * Legt den Wert der grundFuerNachbesichtigung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGrundFuerNachbesichtigung(String value) {
-        this.grundFuerNachbesichtigung = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/HaftpflichtKfzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/HaftpflichtKfzType.java
deleted file mode 100644
index 626f6ade..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/HaftpflichtKfzType.java
+++ /dev/null
@@ -1,211 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import java.math.BigDecimal;
-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 at.vvo.omds.types.omds2Types.v2_14.ELEinstufungType;
-import at.vvo.omds.types.omds2Types.v2_14.ELVersicherungssummeType;
-
-
-/**
- * Typ für das Elementarprodukt KFZ-Haftpflicht
- * 
- * 
Java-Klasse für HaftpflichtKfz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="HaftpflichtKfz_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}ElementarproduktKfz_Type">
- *       <sequence>
- *         <element name="Art" type="{urn:omds20}VtgSparteCd_Type"/>
- *         <element ref="{urn:omds20}EL-Versicherungssumme"/>
- *         <element name="VarianteLeihwagen" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}VarianteLeihwagen_Type"/>
- *         <element ref="{urn:omds20}EL-Einstufung"/>
- *         <element name="Zielpraemie" type="{urn:omds20}decimal" minOccurs="0"/>
- *         <element name="VDNummer" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HaftpflichtKfz_Type", propOrder = {
-    "art",
-    "elVersicherungssumme",
-    "varianteLeihwagen",
-    "elEinstufung",
-    "zielpraemie",
-    "vdNummer"
-})
-public class HaftpflichtKfzType
-    extends ElementarproduktKfzType
-{
-
-    @XmlElement(name = "Art", required = true)
-    protected String art;
-    @XmlElement(name = "EL-Versicherungssumme", namespace = "urn:omds20", required = true)
-    protected ELVersicherungssummeType elVersicherungssumme;
-    @XmlElement(name = "VarianteLeihwagen", required = true)
-    @XmlSchemaType(name = "string")
-    protected VarianteLeihwagenType varianteLeihwagen;
-    @XmlElement(name = "EL-Einstufung", namespace = "urn:omds20", required = true)
-    protected ELEinstufungType elEinstufung;
-    @XmlElement(name = "Zielpraemie")
-    protected BigDecimal zielpraemie;
-    @XmlElement(name = "VDNummer")
-    protected String vdNummer;
-
-    /**
-     * Ruft den Wert der art-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getArt() {
-        return art;
-    }
-
-    /**
-     * Legt den Wert der art-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setArt(String value) {
-        this.art = value;
-    }
-
-    /**
-     * Versicherungssumme Haftpflicht
-     * 
-     * @return
-     *     possible object is
-     *     {@link ELVersicherungssummeType }
-     *     
-     */
-    public ELVersicherungssummeType getELVersicherungssumme() {
-        return elVersicherungssumme;
-    }
-
-    /**
-     * Legt den Wert der elVersicherungssumme-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ELVersicherungssummeType }
-     *     
-     */
-    public void setELVersicherungssumme(ELVersicherungssummeType value) {
-        this.elVersicherungssumme = value;
-    }
-
-    /**
-     * Ruft den Wert der varianteLeihwagen-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VarianteLeihwagenType }
-     *     
-     */
-    public VarianteLeihwagenType getVarianteLeihwagen() {
-        return varianteLeihwagen;
-    }
-
-    /**
-     * Legt den Wert der varianteLeihwagen-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VarianteLeihwagenType }
-     *     
-     */
-    public void setVarianteLeihwagen(VarianteLeihwagenType value) {
-        this.varianteLeihwagen = value;
-    }
-
-    /**
-     * Ruft den Wert der elEinstufung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ELEinstufungType }
-     *     
-     */
-    public ELEinstufungType getELEinstufung() {
-        return elEinstufung;
-    }
-
-    /**
-     * Legt den Wert der elEinstufung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ELEinstufungType }
-     *     
-     */
-    public void setELEinstufung(ELEinstufungType value) {
-        this.elEinstufung = value;
-    }
-
-    /**
-     * Ruft den Wert der zielpraemie-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getZielpraemie() {
-        return zielpraemie;
-    }
-
-    /**
-     * Legt den Wert der zielpraemie-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setZielpraemie(BigDecimal value) {
-        this.zielpraemie = value;
-    }
-
-    /**
-     * Ruft den Wert der vdNummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVDNummer() {
-        return vdNummer;
-    }
-
-    /**
-     * Legt den Wert der vdNummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVDNummer(String value) {
-        this.vdNummer = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/InsassenUnfallKfzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/InsassenUnfallKfzType.java
deleted file mode 100644
index e7c05176..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/InsassenUnfallKfzType.java
+++ /dev/null
@@ -1,68 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-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;
-
-
-/**
- * Typ für das Elementarprodukt KFZ-Insassenunfall
- * 
- * 
Java-Klasse für InsassenUnfallKfz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="InsassenUnfallKfz_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}ElementarproduktKfz_Type">
- *       <sequence>
- *         <element name="InsassenUnfallSystem" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}InsassenUnfallSystem_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "InsassenUnfallKfz_Type", propOrder = {
-    "insassenUnfallSystem"
-})
-public class InsassenUnfallKfzType
-    extends ElementarproduktKfzType
-{
-
-    @XmlElement(name = "InsassenUnfallSystem", required = true)
-    @XmlSchemaType(name = "string")
-    protected InsassenUnfallSystemType insassenUnfallSystem;
-
-    /**
-     * Ruft den Wert der insassenUnfallSystem-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InsassenUnfallSystemType }
-     *     
-     */
-    public InsassenUnfallSystemType getInsassenUnfallSystem() {
-        return insassenUnfallSystem;
-    }
-
-    /**
-     * Legt den Wert der insassenUnfallSystem-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InsassenUnfallSystemType }
-     *     
-     */
-    public void setInsassenUnfallSystem(InsassenUnfallSystemType value) {
-        this.insassenUnfallSystem = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/InsassenUnfallSystemType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/InsassenUnfallSystemType.java
deleted file mode 100644
index f9f1599c..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/InsassenUnfallSystemType.java
+++ /dev/null
@@ -1,63 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
Java-Klasse für InsassenUnfallSystem_Type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

- * 
- * <simpleType name="InsassenUnfallSystem_Type">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="Pauschalsystem"/>
- *     <enumeration value="Platzsystem1"/>
- *     <enumeration value="Platzsystem2"/>
- *     <enumeration value="Personensystem"/>
- *     <enumeration value="Lenkerunfallversicherung"/>
- *     <enumeration value="Aufsassenunfallversicherung"/>
- *   </restriction>
- * </simpleType>
- * 

- * 
- */
-@XmlType(name = "InsassenUnfallSystem_Type")
-@XmlEnum
-public enum InsassenUnfallSystemType {
-
-    @XmlEnumValue("Pauschalsystem")
-    PAUSCHALSYSTEM("Pauschalsystem"),
-    @XmlEnumValue("Platzsystem1")
-    PLATZSYSTEM_1("Platzsystem1"),
-    @XmlEnumValue("Platzsystem2")
-    PLATZSYSTEM_2("Platzsystem2"),
-    @XmlEnumValue("Personensystem")
-    PERSONENSYSTEM("Personensystem"),
-    @XmlEnumValue("Lenkerunfallversicherung")
-    LENKERUNFALLVERSICHERUNG("Lenkerunfallversicherung"),
-    @XmlEnumValue("Aufsassenunfallversicherung")
-    AUFSASSENUNFALLVERSICHERUNG("Aufsassenunfallversicherung");
-    private final String value;
-
-    InsassenUnfallSystemType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static InsassenUnfallSystemType fromValue(String v) {
-        for (InsassenUnfallSystemType c: InsassenUnfallSystemType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/KaskoKfzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/KaskoKfzType.java
deleted file mode 100644
index c6a57601..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/KaskoKfzType.java
+++ /dev/null
@@ -1,264 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import java.math.BigDecimal;
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.BezugsrechtType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VinkulierungType;
-
-
-/**
- * Abstrakter Basistyp für die Kasko-Elementarprodukte
- * 
- * 
Java-Klasse für KaskoKfz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="KaskoKfz_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}ElementarproduktKfz_Type">
- *       <sequence>
- *         <element name="Art" type="{urn:omds20}VtgSparteCd_Type"/>
- *         <element name="SelbstbehaltBisBetrag" type="{urn:omds20}decimal" minOccurs="0"/>
- *         <element name="KMLeistung" type="{http://www.w3.org/2001/XMLSchema}unsignedInt" minOccurs="0"/>
- *         <element name="VorsteuerAbzugBerechtigung" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="Vinkulierung" type="{urn:omds3CommonServiceTypes-1-1-0}Vinkulierung_Type" minOccurs="0"/>
- *         <element name="Bezugsrecht" type="{urn:omds3CommonServiceTypes-1-1-0}Bezugsrecht_Type" minOccurs="0"/>
- *         <element name="Zielpraemie" type="{urn:omds20}decimal" minOccurs="0"/>
- *         <element name="Eingeschraenkt" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "KaskoKfz_Type", propOrder = {
-    "art",
-    "selbstbehaltBisBetrag",
-    "kmLeistung",
-    "vorsteuerAbzugBerechtigung",
-    "vinkulierung",
-    "bezugsrecht",
-    "zielpraemie",
-    "eingeschraenkt"
-})
-@XmlSeeAlso({
-    TeilkaskoKfzType.class,
-    VollkaskoKfzType.class
-})
-public abstract class KaskoKfzType
-    extends ElementarproduktKfzType
-{
-
-    @XmlElement(name = "Art", required = true)
-    protected String art;
-    @XmlElement(name = "SelbstbehaltBisBetrag")
-    protected BigDecimal selbstbehaltBisBetrag;
-    @XmlElement(name = "KMLeistung")
-    @XmlSchemaType(name = "unsignedInt")
-    protected Long kmLeistung;
-    @XmlElement(name = "VorsteuerAbzugBerechtigung")
-    protected boolean vorsteuerAbzugBerechtigung;
-    @XmlElement(name = "Vinkulierung")
-    protected VinkulierungType vinkulierung;
-    @XmlElement(name = "Bezugsrecht")
-    protected BezugsrechtType bezugsrecht;
-    @XmlElement(name = "Zielpraemie")
-    protected BigDecimal zielpraemie;
-    @XmlElement(name = "Eingeschraenkt", defaultValue = "0")
-    protected Boolean eingeschraenkt;
-
-    /**
-     * Ruft den Wert der art-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getArt() {
-        return art;
-    }
-
-    /**
-     * Legt den Wert der art-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setArt(String value) {
-        this.art = value;
-    }
-
-    /**
-     * Ruft den Wert der selbstbehaltBisBetrag-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getSelbstbehaltBisBetrag() {
-        return selbstbehaltBisBetrag;
-    }
-
-    /**
-     * Legt den Wert der selbstbehaltBisBetrag-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setSelbstbehaltBisBetrag(BigDecimal value) {
-        this.selbstbehaltBisBetrag = value;
-    }
-
-    /**
-     * Ruft den Wert der kmLeistung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Long }
-     *     
-     */
-    public Long getKMLeistung() {
-        return kmLeistung;
-    }
-
-    /**
-     * Legt den Wert der kmLeistung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Long }
-     *     
-     */
-    public void setKMLeistung(Long value) {
-        this.kmLeistung = value;
-    }
-
-    /**
-     * Ruft den Wert der vorsteuerAbzugBerechtigung-Eigenschaft ab.
-     * 
-     */
-    public boolean isVorsteuerAbzugBerechtigung() {
-        return vorsteuerAbzugBerechtigung;
-    }
-
-    /**
-     * Legt den Wert der vorsteuerAbzugBerechtigung-Eigenschaft fest.
-     * 
-     */
-    public void setVorsteuerAbzugBerechtigung(boolean value) {
-        this.vorsteuerAbzugBerechtigung = value;
-    }
-
-    /**
-     * Ruft den Wert der vinkulierung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VinkulierungType }
-     *     
-     */
-    public VinkulierungType getVinkulierung() {
-        return vinkulierung;
-    }
-
-    /**
-     * Legt den Wert der vinkulierung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VinkulierungType }
-     *     
-     */
-    public void setVinkulierung(VinkulierungType value) {
-        this.vinkulierung = value;
-    }
-
-    /**
-     * Ruft den Wert der bezugsrecht-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BezugsrechtType }
-     *     
-     */
-    public BezugsrechtType getBezugsrecht() {
-        return bezugsrecht;
-    }
-
-    /**
-     * Legt den Wert der bezugsrecht-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BezugsrechtType }
-     *     
-     */
-    public void setBezugsrecht(BezugsrechtType value) {
-        this.bezugsrecht = value;
-    }
-
-    /**
-     * Ruft den Wert der zielpraemie-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getZielpraemie() {
-        return zielpraemie;
-    }
-
-    /**
-     * Legt den Wert der zielpraemie-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setZielpraemie(BigDecimal value) {
-        this.zielpraemie = value;
-    }
-
-    /**
-     * Ruft den Wert der eingeschraenkt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isEingeschraenkt() {
-        return eingeschraenkt;
-    }
-
-    /**
-     * Legt den Wert der eingeschraenkt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setEingeschraenkt(Boolean value) {
-        this.eingeschraenkt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/LenkerUnfallKfzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/LenkerUnfallKfzType.java
deleted file mode 100644
index 07d19064..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/LenkerUnfallKfzType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Typ für das Elementarprodukt KFZ-Lenkerunfall
- * 
- * 
Java-Klasse für LenkerUnfallKfz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="LenkerUnfallKfz_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}ElementarproduktKfz_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "LenkerUnfallKfz_Type")
-public class LenkerUnfallKfzType
-    extends ElementarproduktKfzType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ObjectFactory.java
deleted file mode 100644
index 68b68185..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ObjectFactory.java
+++ /dev/null
@@ -1,386 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.FetchPolicyRequestType;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz package. 
- * 
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 _FetchPolicyKfzRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", "FetchPolicyKfzRequest");
-    private final static QName _CalculateKfzRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", "CalculateKfzRequest");
-    private final static QName _CalculateKfzResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", "CalculateKfzResponse");
-    private final static QName _CreateOfferKfzRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", "CreateOfferKfzRequest");
-    private final static QName _CreateOfferKfzResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", "CreateOfferKfzResponse");
-    private final static QName _CreateApplicationKfzRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", "CreateApplicationKfzRequest");
-    private final static QName _CreateApplicationKfzResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", "CreateApplicationKfzResponse");
-    private final static QName _SubmitApplicationKfzRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", "SubmitApplicationKfzRequest");
-    private final static QName _SubmitApplicationKfzResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", "SubmitApplicationKfzResponse");
-    private final static QName _FahrzeugRefLfdNr_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", "FahrzeugRefLfdNr");
-    private final static QName _FetchPolicyKfzResponseVertrag_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", "Vertrag");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link VorversicherungenKfzType }
-     * 
-     */
-    public VorversicherungenKfzType createVorversicherungenKfzType() {
-        return new VorversicherungenKfzType();
-    }
-
-    /**
-     * Create an instance of {@link CreateOfferKfzResponseType }
-     * 
-     */
-    public CreateOfferKfzResponseType createCreateOfferKfzResponseType() {
-        return new CreateOfferKfzResponseType();
-    }
-
-    /**
-     * Create an instance of {@link FetchPolicyKfzResponse }
-     * 
-     */
-    public FetchPolicyKfzResponse createFetchPolicyKfzResponse() {
-        return new FetchPolicyKfzResponse();
-    }
-
-    /**
-     * Create an instance of {@link SpezVertragKfzType }
-     * 
-     */
-    public SpezVertragKfzType createSpezVertragKfzType() {
-        return new SpezVertragKfzType();
-    }
-
-    /**
-     * Create an instance of {@link CalculateKfzRequestType }
-     * 
-     */
-    public CalculateKfzRequestType createCalculateKfzRequestType() {
-        return new CalculateKfzRequestType();
-    }
-
-    /**
-     * Create an instance of {@link CalculateKfzResponseType }
-     * 
-     */
-    public CalculateKfzResponseType createCalculateKfzResponseType() {
-        return new CalculateKfzResponseType();
-    }
-
-    /**
-     * Create an instance of {@link CreateOfferKfzRequestType }
-     * 
-     */
-    public CreateOfferKfzRequestType createCreateOfferKfzRequestType() {
-        return new CreateOfferKfzRequestType();
-    }
-
-    /**
-     * Create an instance of {@link CreateApplicationKfzRequestType }
-     * 
-     */
-    public CreateApplicationKfzRequestType createCreateApplicationKfzRequestType() {
-        return new CreateApplicationKfzRequestType();
-    }
-
-    /**
-     * Create an instance of {@link CreateApplicationKfzResponseType }
-     * 
-     */
-    public CreateApplicationKfzResponseType createCreateApplicationKfzResponseType() {
-        return new CreateApplicationKfzResponseType();
-    }
-
-    /**
-     * Create an instance of {@link SubmitApplicationKfzRequestType }
-     * 
-     */
-    public SubmitApplicationKfzRequestType createSubmitApplicationKfzRequestType() {
-        return new SubmitApplicationKfzRequestType();
-    }
-
-    /**
-     * Create an instance of {@link SubmitApplicationKfzResponseType }
-     * 
-     */
-    public SubmitApplicationKfzResponseType createSubmitApplicationKfzResponseType() {
-        return new SubmitApplicationKfzResponseType();
-    }
-
-    /**
-     * Create an instance of {@link VerkaufsproduktKfzType }
-     * 
-     */
-    public VerkaufsproduktKfzType createVerkaufsproduktKfzType() {
-        return new VerkaufsproduktKfzType();
-    }
-
-    /**
-     * Create an instance of {@link ProduktKfzType }
-     * 
-     */
-    public ProduktKfzType createProduktKfzType() {
-        return new ProduktKfzType();
-    }
-
-    /**
-     * Create an instance of {@link HaftpflichtKfzType }
-     * 
-     */
-    public HaftpflichtKfzType createHaftpflichtKfzType() {
-        return new HaftpflichtKfzType();
-    }
-
-    /**
-     * Create an instance of {@link TeilkaskoKfzType }
-     * 
-     */
-    public TeilkaskoKfzType createTeilkaskoKfzType() {
-        return new TeilkaskoKfzType();
-    }
-
-    /**
-     * Create an instance of {@link VollkaskoKfzType }
-     * 
-     */
-    public VollkaskoKfzType createVollkaskoKfzType() {
-        return new VollkaskoKfzType();
-    }
-
-    /**
-     * Create an instance of {@link InsassenUnfallKfzType }
-     * 
-     */
-    public InsassenUnfallKfzType createInsassenUnfallKfzType() {
-        return new InsassenUnfallKfzType();
-    }
-
-    /**
-     * Create an instance of {@link LenkerUnfallKfzType }
-     * 
-     */
-    public LenkerUnfallKfzType createLenkerUnfallKfzType() {
-        return new LenkerUnfallKfzType();
-    }
-
-    /**
-     * Create an instance of {@link AssistanceKfzType }
-     * 
-     */
-    public AssistanceKfzType createAssistanceKfzType() {
-        return new AssistanceKfzType();
-    }
-
-    /**
-     * Create an instance of {@link ProduktKfzRechtsschutzType }
-     * 
-     */
-    public ProduktKfzRechtsschutzType createProduktKfzRechtsschutzType() {
-        return new ProduktKfzRechtsschutzType();
-    }
-
-    /**
-     * Create an instance of {@link VerkehrsrechtsschutzKfzType }
-     * 
-     */
-    public VerkehrsrechtsschutzKfzType createVerkehrsrechtsschutzKfzType() {
-        return new VerkehrsrechtsschutzKfzType();
-    }
-
-    /**
-     * Create an instance of {@link SpezBerechnungKfzType }
-     * 
-     */
-    public SpezBerechnungKfzType createSpezBerechnungKfzType() {
-        return new SpezBerechnungKfzType();
-    }
-
-    /**
-     * Create an instance of {@link SpezOffertKfzType }
-     * 
-     */
-    public SpezOffertKfzType createSpezOffertKfzType() {
-        return new SpezOffertKfzType();
-    }
-
-    /**
-     * Create an instance of {@link SpezAntragKfzType }
-     * 
-     */
-    public SpezAntragKfzType createSpezAntragKfzType() {
-        return new SpezAntragKfzType();
-    }
-
-    /**
-     * Create an instance of {@link ZusaetzlicheKfzdatenType }
-     * 
-     */
-    public ZusaetzlicheKfzdatenType createZusaetzlicheKfzdatenType() {
-        return new ZusaetzlicheKfzdatenType();
-    }
-
-    /**
-     * Create an instance of {@link WechselkennzeichenType }
-     * 
-     */
-    public WechselkennzeichenType createWechselkennzeichenType() {
-        return new WechselkennzeichenType();
-    }
-
-    /**
-     * Create an instance of {@link FzZustandBesichtigungType }
-     * 
-     */
-    public FzZustandBesichtigungType createFzZustandBesichtigungType() {
-        return new FzZustandBesichtigungType();
-    }
-
-    /**
-     * Create an instance of {@link ZusaetzlicheAntragsdatenKfzType }
-     * 
-     */
-    public ZusaetzlicheAntragsdatenKfzType createZusaetzlicheAntragsdatenKfzType() {
-        return new ZusaetzlicheAntragsdatenKfzType();
-    }
-
-    /**
-     * Create an instance of {@link VorversicherungenKfzType.VorversicherungKfz }
-     * 
-     */
-    public VorversicherungenKfzType.VorversicherungKfz createVorversicherungenKfzTypeVorversicherungKfz() {
-        return new VorversicherungenKfzType.VorversicherungKfz();
-    }
-
-    /**
-     * Create an instance of {@link CreateOfferKfzResponseType.Offertantwort }
-     * 
-     */
-    public CreateOfferKfzResponseType.Offertantwort createCreateOfferKfzResponseTypeOffertantwort() {
-        return new CreateOfferKfzResponseType.Offertantwort();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link FetchPolicyRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", name = "FetchPolicyKfzRequest")
-    public JAXBElement createFetchPolicyKfzRequest(FetchPolicyRequestType value) {
-        return new JAXBElement(_FetchPolicyKfzRequest_QNAME, FetchPolicyRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CalculateKfzRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", name = "CalculateKfzRequest")
-    public JAXBElement createCalculateKfzRequest(CalculateKfzRequestType value) {
-        return new JAXBElement(_CalculateKfzRequest_QNAME, CalculateKfzRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CalculateKfzResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", name = "CalculateKfzResponse")
-    public JAXBElement createCalculateKfzResponse(CalculateKfzResponseType value) {
-        return new JAXBElement(_CalculateKfzResponse_QNAME, CalculateKfzResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateOfferKfzRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", name = "CreateOfferKfzRequest")
-    public JAXBElement createCreateOfferKfzRequest(CreateOfferKfzRequestType value) {
-        return new JAXBElement(_CreateOfferKfzRequest_QNAME, CreateOfferKfzRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateOfferKfzResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", name = "CreateOfferKfzResponse")
-    public JAXBElement createCreateOfferKfzResponse(CreateOfferKfzResponseType value) {
-        return new JAXBElement(_CreateOfferKfzResponse_QNAME, CreateOfferKfzResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateApplicationKfzRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", name = "CreateApplicationKfzRequest")
-    public JAXBElement createCreateApplicationKfzRequest(CreateApplicationKfzRequestType value) {
-        return new JAXBElement(_CreateApplicationKfzRequest_QNAME, CreateApplicationKfzRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateApplicationKfzResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", name = "CreateApplicationKfzResponse")
-    public JAXBElement createCreateApplicationKfzResponse(CreateApplicationKfzResponseType value) {
-        return new JAXBElement(_CreateApplicationKfzResponse_QNAME, CreateApplicationKfzResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SubmitApplicationKfzRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", name = "SubmitApplicationKfzRequest")
-    public JAXBElement createSubmitApplicationKfzRequest(SubmitApplicationKfzRequestType value) {
-        return new JAXBElement(_SubmitApplicationKfzRequest_QNAME, SubmitApplicationKfzRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SubmitApplicationKfzResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", name = "SubmitApplicationKfzResponse")
-    public JAXBElement createSubmitApplicationKfzResponse(SubmitApplicationKfzResponseType value) {
-        return new JAXBElement(_SubmitApplicationKfzResponse_QNAME, SubmitApplicationKfzResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", name = "FahrzeugRefLfdNr")
-    public JAXBElement createFahrzeugRefLfdNr(String value) {
-        return new JAXBElement(_FahrzeugRefLfdNr_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SpezVertragKfzType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", name = "Vertrag", scope = FetchPolicyKfzResponse.class)
-    public JAXBElement createFetchPolicyKfzResponseVertrag(SpezVertragKfzType value) {
-        return new JAXBElement(_FetchPolicyKfzResponseVertrag_QNAME, SpezVertragKfzType.class, FetchPolicyKfzResponse.class, value);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ProduktKfzRechtsschutzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ProduktKfzRechtsschutzType.java
deleted file mode 100644
index 2e57f3bb..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ProduktKfzRechtsschutzType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Typ für eine Kfz-Rechtsschutz-Versicherung, welches einer Vertragssparte entspricht
- * 
- * 
Java-Klasse für ProduktKfzRechtsschutz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProduktKfzRechtsschutz_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}ZusatzproduktKfz_Type">
- *       <sequence>
- *         <element name="Verkehrsrechtsschutz" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}VerkehrsrechtsschutzKfz_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProduktKfzRechtsschutz_Type", propOrder = {
-    "verkehrsrechtsschutz"
-})
-public class ProduktKfzRechtsschutzType
-    extends ZusatzproduktKfzType
-{
-
-    @XmlElement(name = "Verkehrsrechtsschutz", required = true)
-    protected VerkehrsrechtsschutzKfzType verkehrsrechtsschutz;
-
-    /**
-     * Ruft den Wert der verkehrsrechtsschutz-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VerkehrsrechtsschutzKfzType }
-     *     
-     */
-    public VerkehrsrechtsschutzKfzType getVerkehrsrechtsschutz() {
-        return verkehrsrechtsschutz;
-    }
-
-    /**
-     * Legt den Wert der verkehrsrechtsschutz-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VerkehrsrechtsschutzKfzType }
-     *     
-     */
-    public void setVerkehrsrechtsschutz(VerkehrsrechtsschutzKfzType value) {
-        this.verkehrsrechtsschutz = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ProduktKfzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ProduktKfzType.java
deleted file mode 100644
index 6ac6b68c..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ProduktKfzType.java
+++ /dev/null
@@ -1,198 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ProduktType;
-
-
-/**
- * Typ für ein Kfz-Produkt, welches einer Vertragssparte entspricht
- * 
- * 
Java-Klasse für ProduktKfz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProduktKfz_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Produkt_Type">
- *       <sequence>
- *         <element name="Haftpflicht" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}HaftpflichtKfz_Type"/>
- *         <choice>
- *           <element name="Teilkasko" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}TeilkaskoKfz_Type" maxOccurs="unbounded" minOccurs="0"/>
- *           <element name="Vollkasko" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}VollkaskoKfz_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         </choice>
- *         <element name="Insassenunfall" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}InsassenUnfallKfz_Type" minOccurs="0"/>
- *         <element name="Assistance" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}AssistanceKfz_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProduktKfz_Type", propOrder = {
-    "haftpflicht",
-    "teilkasko",
-    "vollkasko",
-    "insassenunfall",
-    "assistance"
-})
-public class ProduktKfzType
-    extends ProduktType
-{
-
-    @XmlElement(name = "Haftpflicht", required = true)
-    protected HaftpflichtKfzType haftpflicht;
-    @XmlElement(name = "Teilkasko")
-    protected List teilkasko;
-    @XmlElement(name = "Vollkasko")
-    protected List vollkasko;
-    @XmlElement(name = "Insassenunfall")
-    protected InsassenUnfallKfzType insassenunfall;
-    @XmlElement(name = "Assistance")
-    protected List assistance;
-
-    /**
-     * Ruft den Wert der haftpflicht-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link HaftpflichtKfzType }
-     *     
-     */
-    public HaftpflichtKfzType getHaftpflicht() {
-        return haftpflicht;
-    }
-
-    /**
-     * Legt den Wert der haftpflicht-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link HaftpflichtKfzType }
-     *     
-     */
-    public void setHaftpflicht(HaftpflichtKfzType value) {
-        this.haftpflicht = value;
-    }
-
-    /**
-     * Gets the value of the teilkasko property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the teilkasko property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getTeilkasko().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link TeilkaskoKfzType }
-     * 
-     * 
-     */
-    public List getTeilkasko() {
-        if (teilkasko == null) {
-            teilkasko = new ArrayList();
-        }
-        return this.teilkasko;
-    }
-
-    /**
-     * Gets the value of the vollkasko property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the vollkasko property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVollkasko().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link VollkaskoKfzType }
-     * 
-     * 
-     */
-    public List getVollkasko() {
-        if (vollkasko == null) {
-            vollkasko = new ArrayList();
-        }
-        return this.vollkasko;
-    }
-
-    /**
-     * Ruft den Wert der insassenunfall-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InsassenUnfallKfzType }
-     *     
-     */
-    public InsassenUnfallKfzType getInsassenunfall() {
-        return insassenunfall;
-    }
-
-    /**
-     * Legt den Wert der insassenunfall-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InsassenUnfallKfzType }
-     *     
-     */
-    public void setInsassenunfall(InsassenUnfallKfzType value) {
-        this.insassenunfall = value;
-    }
-
-    /**
-     * Gets the value of the assistance property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the assistance property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getAssistance().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link AssistanceKfzType }
-     * 
-     * 
-     */
-    public List getAssistance() {
-        if (assistance == null) {
-            assistance = new ArrayList();
-        }
-        return this.assistance;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SchaedenAmFahrzeugType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SchaedenAmFahrzeugType.java
deleted file mode 100644
index 458d4f33..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SchaedenAmFahrzeugType.java
+++ /dev/null
@@ -1,51 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
Java-Klasse für SchaedenAmFahrzeug_Type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

- * 
- * <simpleType name="SchaedenAmFahrzeug_Type">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="keine Schäden an der Karosserie"/>
- *     <enumeration value="Schäden an der Karosserie"/>
- *   </restriction>
- * </simpleType>
- * 

- * 
- */
-@XmlType(name = "SchaedenAmFahrzeug_Type")
-@XmlEnum
-public enum SchaedenAmFahrzeugType {
-
-    @XmlEnumValue("keine Sch\u00e4den an der Karosserie")
-    KEINE_SCHÄDEN_AN_DER_KAROSSERIE("keine Sch\u00e4den an der Karosserie"),
-    @XmlEnumValue("Sch\u00e4den an der Karosserie")
-    SCHÄDEN_AN_DER_KAROSSERIE("Sch\u00e4den an der Karosserie");
-    private final String value;
-
-    SchaedenAmFahrzeugType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static SchaedenAmFahrzeugType fromValue(String v) {
-        for (SchaedenAmFahrzeugType c: SchaedenAmFahrzeugType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SchaedenAnScheibenKleinglasType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SchaedenAnScheibenKleinglasType.java
deleted file mode 100644
index 17b4d739..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SchaedenAnScheibenKleinglasType.java
+++ /dev/null
@@ -1,51 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
Java-Klasse für SchaedenAnScheibenKleinglas_Type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

- * 
- * <simpleType name="SchaedenAnScheibenKleinglas_Type">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="keine Schäden an Scheiben / Kleinglas"/>
- *     <enumeration value="Schäden an Scheiben / Kleinglas"/>
- *   </restriction>
- * </simpleType>
- * 

- * 
- */
-@XmlType(name = "SchaedenAnScheibenKleinglas_Type")
-@XmlEnum
-public enum SchaedenAnScheibenKleinglasType {
-
-    @XmlEnumValue("keine Sch\u00e4den an Scheiben / Kleinglas")
-    KEINE_SCHÄDEN_AN_SCHEIBEN_KLEINGLAS("keine Sch\u00e4den an Scheiben / Kleinglas"),
-    @XmlEnumValue("Sch\u00e4den an Scheiben / Kleinglas")
-    SCHÄDEN_AN_SCHEIBEN_KLEINGLAS("Sch\u00e4den an Scheiben / Kleinglas");
-    private final String value;
-
-    SchaedenAnScheibenKleinglasType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static SchaedenAnScheibenKleinglasType fromValue(String v) {
-        for (SchaedenAnScheibenKleinglasType c: SchaedenAnScheibenKleinglasType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SpezAntragKfzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SpezAntragKfzType.java
deleted file mode 100644
index b03b9ef5..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SpezAntragKfzType.java
+++ /dev/null
@@ -1,153 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.BonusMalusSystemType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VinkularglaeubigerType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SpezAntragBasisType;
-
-
-/**
- * Typ der das Produkt beschreibt und in Antragsanfrage und Antragsantwort verwendet wird
- * 
- * 
Java-Klasse für SpezAntragKfz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezAntragKfz_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezAntragBasis_Type">
- *       <sequence>
- *         <element name="Verkaufsprodukt" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}VerkaufsproduktKfz_Type"/>
- *         <element name="BonusMalus" type="{urn:omds3CommonServiceTypes-1-1-0}BonusMalusSystem_Type" minOccurs="0"/>
- *         <element name="Vinkulierung" type="{urn:omds3CommonServiceTypes-1-1-0}Vinkularglaeubiger_Type" minOccurs="0"/>
- *         <element name="ZusaetzlicheKfzDaten" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}ZusaetzlicheKfzdaten_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezAntragKfz_Type", propOrder = {
-    "verkaufsprodukt",
-    "bonusMalus",
-    "vinkulierung",
-    "zusaetzlicheKfzDaten"
-})
-public class SpezAntragKfzType
-    extends SpezAntragBasisType
-{
-
-    @XmlElement(name = "Verkaufsprodukt", required = true)
-    protected VerkaufsproduktKfzType verkaufsprodukt;
-    @XmlElement(name = "BonusMalus")
-    protected BonusMalusSystemType bonusMalus;
-    @XmlElement(name = "Vinkulierung")
-    protected VinkularglaeubigerType vinkulierung;
-    @XmlElement(name = "ZusaetzlicheKfzDaten")
-    protected ZusaetzlicheKfzdatenType zusaetzlicheKfzDaten;
-
-    /**
-     * Ruft den Wert der verkaufsprodukt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VerkaufsproduktKfzType }
-     *     
-     */
-    public VerkaufsproduktKfzType getVerkaufsprodukt() {
-        return verkaufsprodukt;
-    }
-
-    /**
-     * Legt den Wert der verkaufsprodukt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VerkaufsproduktKfzType }
-     *     
-     */
-    public void setVerkaufsprodukt(VerkaufsproduktKfzType value) {
-        this.verkaufsprodukt = value;
-    }
-
-    /**
-     * Ruft den Wert der bonusMalus-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BonusMalusSystemType }
-     *     
-     */
-    public BonusMalusSystemType getBonusMalus() {
-        return bonusMalus;
-    }
-
-    /**
-     * Legt den Wert der bonusMalus-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BonusMalusSystemType }
-     *     
-     */
-    public void setBonusMalus(BonusMalusSystemType value) {
-        this.bonusMalus = value;
-    }
-
-    /**
-     * Ruft den Wert der vinkulierung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VinkularglaeubigerType }
-     *     
-     */
-    public VinkularglaeubigerType getVinkulierung() {
-        return vinkulierung;
-    }
-
-    /**
-     * Legt den Wert der vinkulierung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VinkularglaeubigerType }
-     *     
-     */
-    public void setVinkulierung(VinkularglaeubigerType value) {
-        this.vinkulierung = value;
-    }
-
-    /**
-     * Ruft den Wert der zusaetzlicheKfzDaten-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ZusaetzlicheKfzdatenType }
-     *     
-     */
-    public ZusaetzlicheKfzdatenType getZusaetzlicheKfzDaten() {
-        return zusaetzlicheKfzDaten;
-    }
-
-    /**
-     * Legt den Wert der zusaetzlicheKfzDaten-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ZusaetzlicheKfzdatenType }
-     *     
-     */
-    public void setZusaetzlicheKfzDaten(ZusaetzlicheKfzdatenType value) {
-        this.zusaetzlicheKfzDaten = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SpezBerechnungKfzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SpezBerechnungKfzType.java
deleted file mode 100644
index e51307e9..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SpezBerechnungKfzType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SpezBerechnungType;
-
-
-/**
- * Typ der das Produkt beschreibt und in Berechnungsanfrage und Berechnungsantwort verwendet wird
- * 
- * 
Java-Klasse für SpezBerechnungKfz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezBerechnungKfz_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezBerechnung_Type">
- *       <sequence>
- *         <element name="Verkaufsprodukt" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}VerkaufsproduktKfz_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezBerechnungKfz_Type", propOrder = {
-    "verkaufsprodukt"
-})
-public class SpezBerechnungKfzType
-    extends SpezBerechnungType
-{
-
-    @XmlElement(name = "Verkaufsprodukt", required = true)
-    protected VerkaufsproduktKfzType verkaufsprodukt;
-
-    /**
-     * Ruft den Wert der verkaufsprodukt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VerkaufsproduktKfzType }
-     *     
-     */
-    public VerkaufsproduktKfzType getVerkaufsprodukt() {
-        return verkaufsprodukt;
-    }
-
-    /**
-     * Legt den Wert der verkaufsprodukt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VerkaufsproduktKfzType }
-     *     
-     */
-    public void setVerkaufsprodukt(VerkaufsproduktKfzType value) {
-        this.verkaufsprodukt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SpezOffertKfzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SpezOffertKfzType.java
deleted file mode 100644
index 60520f3a..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SpezOffertKfzType.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SpezOffertType;
-
-
-/**
- * Typ der das Produkt beschreibt und in Offertanfrage und Offertantwort verwendet wird
- * 
- * 
Java-Klasse für SpezOffertKfz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezOffertKfz_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezOffert_Type">
- *       <sequence>
- *         <element name="Verkaufsprodukt" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}VerkaufsproduktKfz_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezOffertKfz_Type", propOrder = {
-    "verkaufsprodukt"
-})
-@XmlSeeAlso({
-    at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CreateOfferKfzResponseType.Offertantwort.class
-})
-public class SpezOffertKfzType
-    extends SpezOffertType
-{
-
-    @XmlElement(name = "Verkaufsprodukt", required = true)
-    protected VerkaufsproduktKfzType verkaufsprodukt;
-
-    /**
-     * Ruft den Wert der verkaufsprodukt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VerkaufsproduktKfzType }
-     *     
-     */
-    public VerkaufsproduktKfzType getVerkaufsprodukt() {
-        return verkaufsprodukt;
-    }
-
-    /**
-     * Legt den Wert der verkaufsprodukt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VerkaufsproduktKfzType }
-     *     
-     */
-    public void setVerkaufsprodukt(VerkaufsproduktKfzType value) {
-        this.verkaufsprodukt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SpezVertragKfzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SpezVertragKfzType.java
deleted file mode 100644
index 79f7c489..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SpezVertragKfzType.java
+++ /dev/null
@@ -1,153 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.BonusMalusSystemType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VinkularglaeubigerType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SpezVertragType;
-
-
-/**
- * Typ der den Vertrag beschreibt
- * 
- * 
Java-Klasse für SpezVertragKfz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezVertragKfz_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezVertrag_Type">
- *       <sequence>
- *         <element name="Verkaufsprodukt" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}VerkaufsproduktKfz_Type"/>
- *         <element name="BonusMalus" type="{urn:omds3CommonServiceTypes-1-1-0}BonusMalusSystem_Type" minOccurs="0"/>
- *         <element name="Vinkulierung" type="{urn:omds3CommonServiceTypes-1-1-0}Vinkularglaeubiger_Type" minOccurs="0"/>
- *         <element name="ZusaetzlicheKfzDaten" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}ZusaetzlicheKfzdaten_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezVertragKfz_Type", propOrder = {
-    "verkaufsprodukt",
-    "bonusMalus",
-    "vinkulierung",
-    "zusaetzlicheKfzDaten"
-})
-public class SpezVertragKfzType
-    extends SpezVertragType
-{
-
-    @XmlElement(name = "Verkaufsprodukt", required = true)
-    protected VerkaufsproduktKfzType verkaufsprodukt;
-    @XmlElement(name = "BonusMalus")
-    protected BonusMalusSystemType bonusMalus;
-    @XmlElement(name = "Vinkulierung")
-    protected VinkularglaeubigerType vinkulierung;
-    @XmlElement(name = "ZusaetzlicheKfzDaten")
-    protected ZusaetzlicheKfzdatenType zusaetzlicheKfzDaten;
-
-    /**
-     * Ruft den Wert der verkaufsprodukt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VerkaufsproduktKfzType }
-     *     
-     */
-    public VerkaufsproduktKfzType getVerkaufsprodukt() {
-        return verkaufsprodukt;
-    }
-
-    /**
-     * Legt den Wert der verkaufsprodukt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VerkaufsproduktKfzType }
-     *     
-     */
-    public void setVerkaufsprodukt(VerkaufsproduktKfzType value) {
-        this.verkaufsprodukt = value;
-    }
-
-    /**
-     * Ruft den Wert der bonusMalus-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BonusMalusSystemType }
-     *     
-     */
-    public BonusMalusSystemType getBonusMalus() {
-        return bonusMalus;
-    }
-
-    /**
-     * Legt den Wert der bonusMalus-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BonusMalusSystemType }
-     *     
-     */
-    public void setBonusMalus(BonusMalusSystemType value) {
-        this.bonusMalus = value;
-    }
-
-    /**
-     * Ruft den Wert der vinkulierung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VinkularglaeubigerType }
-     *     
-     */
-    public VinkularglaeubigerType getVinkulierung() {
-        return vinkulierung;
-    }
-
-    /**
-     * Legt den Wert der vinkulierung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VinkularglaeubigerType }
-     *     
-     */
-    public void setVinkulierung(VinkularglaeubigerType value) {
-        this.vinkulierung = value;
-    }
-
-    /**
-     * Ruft den Wert der zusaetzlicheKfzDaten-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ZusaetzlicheKfzdatenType }
-     *     
-     */
-    public ZusaetzlicheKfzdatenType getZusaetzlicheKfzDaten() {
-        return zusaetzlicheKfzDaten;
-    }
-
-    /**
-     * Legt den Wert der zusaetzlicheKfzDaten-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ZusaetzlicheKfzdatenType }
-     *     
-     */
-    public void setZusaetzlicheKfzDaten(ZusaetzlicheKfzdatenType value) {
-        this.zusaetzlicheKfzDaten = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SubmitApplicationKfzRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SubmitApplicationKfzRequestType.java
deleted file mode 100644
index 95c7f447..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SubmitApplicationKfzRequestType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SubmitApplicationRequestType;
-
-
-/**
- * Typ des Requestobjekts für eine Antragseinreichung Kfz
- * 
- * 
Java-Klasse für SubmitApplicationKfzRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SubmitApplicationKfzRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SubmitApplicationRequest_Type">
- *       <sequence>
- *         <element name="Antraganfrage" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}SpezAntragKfz_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SubmitApplicationKfzRequest_Type", propOrder = {
-    "antraganfrage"
-})
-public class SubmitApplicationKfzRequestType
-    extends SubmitApplicationRequestType
-{
-
-    @XmlElement(name = "Antraganfrage")
-    protected SpezAntragKfzType antraganfrage;
-
-    /**
-     * Ruft den Wert der antraganfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezAntragKfzType }
-     *     
-     */
-    public SpezAntragKfzType getAntraganfrage() {
-        return antraganfrage;
-    }
-
-    /**
-     * Legt den Wert der antraganfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezAntragKfzType }
-     *     
-     */
-    public void setAntraganfrage(SpezAntragKfzType value) {
-        this.antraganfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SubmitApplicationKfzResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SubmitApplicationKfzResponseType.java
deleted file mode 100644
index ad24e4e3..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/SubmitApplicationKfzResponseType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SubmitApplicationResponseType;
-
-
-/**
- * Typ des Responseobjekts für eine Antragseinreichung Kfz
- * 
- * 
Java-Klasse für SubmitApplicationKfzResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SubmitApplicationKfzResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SubmitApplicationResponse_Type">
- *       <sequence>
- *         <element name="Antragantwort" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}SpezAntragKfz_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SubmitApplicationKfzResponse_Type", propOrder = {
-    "antragantwort"
-})
-public class SubmitApplicationKfzResponseType
-    extends SubmitApplicationResponseType
-{
-
-    @XmlElement(name = "Antragantwort")
-    protected SpezAntragKfzType antragantwort;
-
-    /**
-     * Ruft den Wert der antragantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezAntragKfzType }
-     *     
-     */
-    public SpezAntragKfzType getAntragantwort() {
-        return antragantwort;
-    }
-
-    /**
-     * Legt den Wert der antragantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezAntragKfzType }
-     *     
-     */
-    public void setAntragantwort(SpezAntragKfzType value) {
-        this.antragantwort = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/TeilkaskoKfzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/TeilkaskoKfzType.java
deleted file mode 100644
index b162aa87..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/TeilkaskoKfzType.java
+++ /dev/null
@@ -1,58 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Typ für das Elementarprodukt KFZ-Teilkasko
- * 
- * 
Java-Klasse für TeilkaskoKfz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="TeilkaskoKfz_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}KaskoKfz_Type">
- *       <sequence>
- *         <element name="Vandalismusklausel" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TeilkaskoKfz_Type", propOrder = {
-    "vandalismusklausel"
-})
-public class TeilkaskoKfzType
-    extends KaskoKfzType
-{
-
-    @XmlElement(name = "Vandalismusklausel")
-    protected boolean vandalismusklausel;
-
-    /**
-     * Ruft den Wert der vandalismusklausel-Eigenschaft ab.
-     * 
-     */
-    public boolean isVandalismusklausel() {
-        return vandalismusklausel;
-    }
-
-    /**
-     * Legt den Wert der vandalismusklausel-Eigenschaft fest.
-     * 
-     */
-    public void setVandalismusklausel(boolean value) {
-        this.vandalismusklausel = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/UpsellingKfzResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/UpsellingKfzResponseType.java
deleted file mode 100644
index 67206959..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/UpsellingKfzResponseType.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-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;
-
-
-/**
- * Response Upselling Alternativen
- * 
- * 
Java-Klasse für UpsellingKfzResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="UpsellingKfzResponse_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="UpsellingVerkaufsprodukte" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}VerkaufsproduktKfz_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "UpsellingKfzResponse_Type", propOrder = {
-    "upsellingVerkaufsprodukte"
-})
-public abstract class UpsellingKfzResponseType {
-
-    @XmlElement(name = "UpsellingVerkaufsprodukte")
-    protected List upsellingVerkaufsprodukte;
-
-    /**
-     * Gets the value of the upsellingVerkaufsprodukte property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the upsellingVerkaufsprodukte property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getUpsellingVerkaufsprodukte().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link VerkaufsproduktKfzType }
-     * 
-     * 
-     */
-    public List getUpsellingVerkaufsprodukte() {
-        if (upsellingVerkaufsprodukte == null) {
-            upsellingVerkaufsprodukte = new ArrayList();
-        }
-        return this.upsellingVerkaufsprodukte;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VarianteLeihwagenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VarianteLeihwagenType.java
deleted file mode 100644
index 43f3ae0b..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VarianteLeihwagenType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
Java-Klasse für VarianteLeihwagen_Type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

- * 
- * <simpleType name="VarianteLeihwagen_Type">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="VA"/>
- *     <enumeration value="VB"/>
- *   </restriction>
- * </simpleType>
- * 

- * 
- */
-@XmlType(name = "VarianteLeihwagen_Type")
-@XmlEnum
-public enum VarianteLeihwagenType {
-
-
-    /**
-     * ohne Leihwagen
-     * 
-     */
-    VA,
-
-    /**
-     * mit Leihwagen
-     * 
-     */
-    VB;
-
-    public String value() {
-        return name();
-    }
-
-    public static VarianteLeihwagenType fromValue(String v) {
-        return valueOf(v);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VerkaufsproduktKfzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VerkaufsproduktKfzType.java
deleted file mode 100644
index 9ada0c34..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VerkaufsproduktKfzType.java
+++ /dev/null
@@ -1,237 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-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;
-import at.vvo.omds.types.omds2Types.v2_14.PersArtCdType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.FahrzeugType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VerkaufsproduktType;
-
-
-/**
- * Typ für ein Kfz-Produktbündel, welches einem Vertrag entspricht
- * 
- * 
Java-Klasse für VerkaufsproduktKfz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VerkaufsproduktKfz_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Verkaufsprodukt_Type">
- *       <sequence>
- *         <element name="Gebdat" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
- *         <element name="PLZ" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <minLength value="1"/>
- *               <maxLength value="7"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="PersArtCd" type="{urn:omds20}PersArtCd_Type" minOccurs="0"/>
- *         <element name="KfzVersicherung" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}ProduktKfz_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="KfzZusatzVersicherung" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}ZusatzproduktKfz_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="VersicherteFahrzeuge" type="{urn:omds3CommonServiceTypes-1-1-0}Fahrzeug_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VerkaufsproduktKfz_Type", propOrder = {
-    "gebdat",
-    "plz",
-    "persArtCd",
-    "kfzVersicherung",
-    "kfzZusatzVersicherung",
-    "versicherteFahrzeuge"
-})
-public class VerkaufsproduktKfzType
-    extends VerkaufsproduktType
-{
-
-    @XmlElement(name = "Gebdat")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar gebdat;
-    @XmlElement(name = "PLZ")
-    protected String plz;
-    @XmlElement(name = "PersArtCd")
-    @XmlSchemaType(name = "string")
-    protected PersArtCdType persArtCd;
-    @XmlElement(name = "KfzVersicherung")
-    protected List kfzVersicherung;
-    @XmlElement(name = "KfzZusatzVersicherung")
-    protected List kfzZusatzVersicherung;
-    @XmlElement(name = "VersicherteFahrzeuge")
-    protected List versicherteFahrzeuge;
-
-    /**
-     * Ruft den Wert der gebdat-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getGebdat() {
-        return gebdat;
-    }
-
-    /**
-     * Legt den Wert der gebdat-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setGebdat(XMLGregorianCalendar value) {
-        this.gebdat = value;
-    }
-
-    /**
-     * Ruft den Wert der plz-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPLZ() {
-        return plz;
-    }
-
-    /**
-     * Legt den Wert der plz-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPLZ(String value) {
-        this.plz = value;
-    }
-
-    /**
-     * Ruft den Wert der persArtCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PersArtCdType }
-     *     
-     */
-    public PersArtCdType getPersArtCd() {
-        return persArtCd;
-    }
-
-    /**
-     * Legt den Wert der persArtCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PersArtCdType }
-     *     
-     */
-    public void setPersArtCd(PersArtCdType value) {
-        this.persArtCd = value;
-    }
-
-    /**
-     * Gets the value of the kfzVersicherung property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the kfzVersicherung property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getKfzVersicherung().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ProduktKfzType }
-     * 
-     * 
-     */
-    public List getKfzVersicherung() {
-        if (kfzVersicherung == null) {
-            kfzVersicherung = new ArrayList();
-        }
-        return this.kfzVersicherung;
-    }
-
-    /**
-     * Gets the value of the kfzZusatzVersicherung property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the kfzZusatzVersicherung property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getKfzZusatzVersicherung().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ZusatzproduktKfzType }
-     * 
-     * 
-     */
-    public List getKfzZusatzVersicherung() {
-        if (kfzZusatzVersicherung == null) {
-            kfzZusatzVersicherung = new ArrayList();
-        }
-        return this.kfzZusatzVersicherung;
-    }
-
-    /**
-     * Gets the value of the versicherteFahrzeuge property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the versicherteFahrzeuge property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVersicherteFahrzeuge().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link FahrzeugType }
-     * 
-     * 
-     */
-    public List getVersicherteFahrzeuge() {
-        if (versicherteFahrzeuge == null) {
-            versicherteFahrzeuge = new ArrayList();
-        }
-        return this.versicherteFahrzeuge;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VerkehrsrechtsschutzKfzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VerkehrsrechtsschutzKfzType.java
deleted file mode 100644
index c3270405..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VerkehrsrechtsschutzKfzType.java
+++ /dev/null
@@ -1,35 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ElementarproduktType;
-
-
-/**
- * Typ für das Elementarprodukt KFZ-Verkehrsrechtsschutz
- * 
- * 
Java-Klasse für VerkehrsrechtsschutzKfz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VerkehrsrechtsschutzKfz_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Elementarprodukt_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VerkehrsrechtsschutzKfz_Type")
-public class VerkehrsrechtsschutzKfzType
-    extends ElementarproduktType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VollkaskoKfzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VollkaskoKfzType.java
deleted file mode 100644
index d8317480..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VollkaskoKfzType.java
+++ /dev/null
@@ -1,94 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Typ für das Elementarprodukt KFZ-Vollkasko
- * 
- * 
Java-Klasse für VollkaskoKfz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VollkaskoKfz_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}KaskoKfz_Type">
- *       <sequence>
- *         <element name="Neuwertklausel" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="Leasingklausel" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VollkaskoKfz_Type", propOrder = {
-    "neuwertklausel",
-    "leasingklausel"
-})
-public class VollkaskoKfzType
-    extends KaskoKfzType
-{
-
-    @XmlElement(name = "Neuwertklausel")
-    protected Boolean neuwertklausel;
-    @XmlElement(name = "Leasingklausel")
-    protected Boolean leasingklausel;
-
-    /**
-     * Ruft den Wert der neuwertklausel-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isNeuwertklausel() {
-        return neuwertklausel;
-    }
-
-    /**
-     * Legt den Wert der neuwertklausel-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setNeuwertklausel(Boolean value) {
-        this.neuwertklausel = value;
-    }
-
-    /**
-     * Ruft den Wert der leasingklausel-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isLeasingklausel() {
-        return leasingklausel;
-    }
-
-    /**
-     * Legt den Wert der leasingklausel-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setLeasingklausel(Boolean value) {
-        this.leasingklausel = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VorversicherungenKfzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VorversicherungenKfzType.java
deleted file mode 100644
index 119ea9c6..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/VorversicherungenKfzType.java
+++ /dev/null
@@ -1,165 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-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.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VorversicherungenDetailType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VorversicherungenType;
-
-
-/**
- * Vorversicherungen für Kfz (alternativ siehe auch cst:VorversicherungenImpl_Type)
- * 
- * 
Java-Klasse für VorversicherungenKfz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VorversicherungenKfz_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Vorversicherungen_Type">
- *       <sequence>
- *         <element name="VorversicherungKfz" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <extension base="{urn:omds3CommonServiceTypes-1-1-0}VorversicherungenDetail_Type">
- *                 <attribute name="VtgSparteCd" type="{urn:omds20}VtgSparteCd_Type" />
- *               </extension>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="VorversicherungRechtsschutz" type="{urn:omds3CommonServiceTypes-1-1-0}VorversicherungenDetail_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VorversicherungenKfz_Type", propOrder = {
-    "vorversicherungKfz",
-    "vorversicherungRechtsschutz"
-})
-public class VorversicherungenKfzType
-    extends VorversicherungenType
-{
-
-    @XmlElement(name = "VorversicherungKfz")
-    protected List vorversicherungKfz;
-    @XmlElement(name = "VorversicherungRechtsschutz")
-    protected VorversicherungenDetailType vorversicherungRechtsschutz;
-
-    /**
-     * Gets the value of the vorversicherungKfz property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the vorversicherungKfz property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVorversicherungKfz().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link VorversicherungenKfzType.VorversicherungKfz }
-     * 
-     * 
-     */
-    public List getVorversicherungKfz() {
-        if (vorversicherungKfz == null) {
-            vorversicherungKfz = new ArrayList();
-        }
-        return this.vorversicherungKfz;
-    }
-
-    /**
-     * Ruft den Wert der vorversicherungRechtsschutz-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VorversicherungenDetailType }
-     *     
-     */
-    public VorversicherungenDetailType getVorversicherungRechtsschutz() {
-        return vorversicherungRechtsschutz;
-    }
-
-    /**
-     * Legt den Wert der vorversicherungRechtsschutz-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VorversicherungenDetailType }
-     *     
-     */
-    public void setVorversicherungRechtsschutz(VorversicherungenDetailType value) {
-        this.vorversicherungRechtsschutz = value;
-    }
-
-
-    /**
-     * 
Java-Klasse für anonymous complex type.
-     * 
-     * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}VorversicherungenDetail_Type">
-     *       <attribute name="VtgSparteCd" type="{urn:omds20}VtgSparteCd_Type" />
-     *     </extension>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class VorversicherungKfz
-        extends VorversicherungenDetailType
-    {
-
-        @XmlAttribute(name = "VtgSparteCd", namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz")
-        protected String vtgSparteCd;
-
-        /**
-         * Ruft den Wert der vtgSparteCd-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getVtgSparteCd() {
-            return vtgSparteCd;
-        }
-
-        /**
-         * Legt den Wert der vtgSparteCd-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setVtgSparteCd(String value) {
-            this.vtgSparteCd = value;
-        }
-
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/WechselkennzeichenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/WechselkennzeichenType.java
deleted file mode 100644
index ea051c28..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/WechselkennzeichenType.java
+++ /dev/null
@@ -1,127 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Type Wechselkennzeichen
- * 
- * 
Java-Klasse für Wechselkennzeichen_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Wechselkennzeichen_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="WechselkennzeichenArt">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <enumeration value="Neues Fahrzeug als WKZ in bestehenden Vertrag einbündeln"/>
- *               <enumeration value="Fahrzeugwechsel im bestehenden WKZ-Vertrag"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="BestehenderWechselkennzeichenvertrag" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="ErsetztWirdFahrgestellnummer" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}Fahrgestellnummer_Type" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Wechselkennzeichen_Type", propOrder = {
-    "wechselkennzeichenArt",
-    "bestehenderWechselkennzeichenvertrag",
-    "ersetztWirdFahrgestellnummer"
-})
-public class WechselkennzeichenType {
-
-    @XmlElement(name = "WechselkennzeichenArt", required = true)
-    protected String wechselkennzeichenArt;
-    @XmlElement(name = "BestehenderWechselkennzeichenvertrag", required = true)
-    protected String bestehenderWechselkennzeichenvertrag;
-    @XmlElement(name = "ErsetztWirdFahrgestellnummer")
-    protected String ersetztWirdFahrgestellnummer;
-
-    /**
-     * Ruft den Wert der wechselkennzeichenArt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getWechselkennzeichenArt() {
-        return wechselkennzeichenArt;
-    }
-
-    /**
-     * Legt den Wert der wechselkennzeichenArt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setWechselkennzeichenArt(String value) {
-        this.wechselkennzeichenArt = value;
-    }
-
-    /**
-     * Ruft den Wert der bestehenderWechselkennzeichenvertrag-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBestehenderWechselkennzeichenvertrag() {
-        return bestehenderWechselkennzeichenvertrag;
-    }
-
-    /**
-     * Legt den Wert der bestehenderWechselkennzeichenvertrag-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBestehenderWechselkennzeichenvertrag(String value) {
-        this.bestehenderWechselkennzeichenvertrag = value;
-    }
-
-    /**
-     * Ruft den Wert der ersetztWirdFahrgestellnummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getErsetztWirdFahrgestellnummer() {
-        return ersetztWirdFahrgestellnummer;
-    }
-
-    /**
-     * Legt den Wert der ersetztWirdFahrgestellnummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setErsetztWirdFahrgestellnummer(String value) {
-        this.ersetztWirdFahrgestellnummer = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ZusaetzlicheAntragsdatenKfzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ZusaetzlicheAntragsdatenKfzType.java
deleted file mode 100644
index bd574f47..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ZusaetzlicheAntragsdatenKfzType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Typ für VU-Spezifische Erweiterungen bei der Kfz-Beschreibung im Antrag
- * 
- * 
Java-Klasse für ZusaetzlicheAntragsdatenKfz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheAntragsdatenKfz_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheAntragsdatenKfz_Type")
-public class ZusaetzlicheAntragsdatenKfzType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ZusaetzlicheKfzdatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ZusaetzlicheKfzdatenType.java
deleted file mode 100644
index 3db3a2a0..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ZusaetzlicheKfzdatenType.java
+++ /dev/null
@@ -1,270 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-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;
-
-
-/**
- * Type zusätzliche Kfz-Daten
- * 
- * 
Java-Klasse für ZusaetzlicheKfzdaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheKfzdaten_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="KfzKennzeichen">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <minLength value="3"/>
- *               <maxLength value="9"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="Fahrgestellnummer" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}Fahrgestellnummer_Type"/>
- *         <element name="ErfolgtAnmeldungZeitgleichMitAbmeldung" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="AbmeldedatumWechselkennzeichenFahrzeug" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
- *         <element name="Wechselkennzeichen" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}Wechselkennzeichen_Type" minOccurs="0"/>
- *         <element name="Fahrzeugzustand" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="FzZustandBesichtigung" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}FzZustandBesichtigung_Type" minOccurs="0"/>
- *         <element name="ZusaetzlicheAntragsdatenKfz" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz}ZusaetzlicheAntragsdatenKfz_Type" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheKfzdaten_Type", propOrder = {
-    "kfzKennzeichen",
-    "fahrgestellnummer",
-    "erfolgtAnmeldungZeitgleichMitAbmeldung",
-    "abmeldedatumWechselkennzeichenFahrzeug",
-    "wechselkennzeichen",
-    "fahrzeugzustand",
-    "fzZustandBesichtigung",
-    "zusaetzlicheAntragsdatenKfz"
-})
-public class ZusaetzlicheKfzdatenType {
-
-    @XmlElement(name = "KfzKennzeichen", required = true)
-    protected String kfzKennzeichen;
-    @XmlElement(name = "Fahrgestellnummer", required = true)
-    protected String fahrgestellnummer;
-    @XmlElement(name = "ErfolgtAnmeldungZeitgleichMitAbmeldung")
-    protected Boolean erfolgtAnmeldungZeitgleichMitAbmeldung;
-    @XmlElement(name = "AbmeldedatumWechselkennzeichenFahrzeug")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar abmeldedatumWechselkennzeichenFahrzeug;
-    @XmlElement(name = "Wechselkennzeichen")
-    protected WechselkennzeichenType wechselkennzeichen;
-    @XmlElement(name = "Fahrzeugzustand")
-    protected String fahrzeugzustand;
-    @XmlElement(name = "FzZustandBesichtigung")
-    protected FzZustandBesichtigungType fzZustandBesichtigung;
-    @XmlElement(name = "ZusaetzlicheAntragsdatenKfz")
-    protected ZusaetzlicheAntragsdatenKfzType zusaetzlicheAntragsdatenKfz;
-
-    /**
-     * Ruft den Wert der kfzKennzeichen-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getKfzKennzeichen() {
-        return kfzKennzeichen;
-    }
-
-    /**
-     * Legt den Wert der kfzKennzeichen-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setKfzKennzeichen(String value) {
-        this.kfzKennzeichen = value;
-    }
-
-    /**
-     * Ruft den Wert der fahrgestellnummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFahrgestellnummer() {
-        return fahrgestellnummer;
-    }
-
-    /**
-     * Legt den Wert der fahrgestellnummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFahrgestellnummer(String value) {
-        this.fahrgestellnummer = value;
-    }
-
-    /**
-     * Ruft den Wert der erfolgtAnmeldungZeitgleichMitAbmeldung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isErfolgtAnmeldungZeitgleichMitAbmeldung() {
-        return erfolgtAnmeldungZeitgleichMitAbmeldung;
-    }
-
-    /**
-     * Legt den Wert der erfolgtAnmeldungZeitgleichMitAbmeldung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setErfolgtAnmeldungZeitgleichMitAbmeldung(Boolean value) {
-        this.erfolgtAnmeldungZeitgleichMitAbmeldung = value;
-    }
-
-    /**
-     * Ruft den Wert der abmeldedatumWechselkennzeichenFahrzeug-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getAbmeldedatumWechselkennzeichenFahrzeug() {
-        return abmeldedatumWechselkennzeichenFahrzeug;
-    }
-
-    /**
-     * Legt den Wert der abmeldedatumWechselkennzeichenFahrzeug-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setAbmeldedatumWechselkennzeichenFahrzeug(XMLGregorianCalendar value) {
-        this.abmeldedatumWechselkennzeichenFahrzeug = value;
-    }
-
-    /**
-     * Ruft den Wert der wechselkennzeichen-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link WechselkennzeichenType }
-     *     
-     */
-    public WechselkennzeichenType getWechselkennzeichen() {
-        return wechselkennzeichen;
-    }
-
-    /**
-     * Legt den Wert der wechselkennzeichen-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link WechselkennzeichenType }
-     *     
-     */
-    public void setWechselkennzeichen(WechselkennzeichenType value) {
-        this.wechselkennzeichen = value;
-    }
-
-    /**
-     * Ruft den Wert der fahrzeugzustand-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFahrzeugzustand() {
-        return fahrzeugzustand;
-    }
-
-    /**
-     * Legt den Wert der fahrzeugzustand-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFahrzeugzustand(String value) {
-        this.fahrzeugzustand = value;
-    }
-
-    /**
-     * Ruft den Wert der fzZustandBesichtigung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FzZustandBesichtigungType }
-     *     
-     */
-    public FzZustandBesichtigungType getFzZustandBesichtigung() {
-        return fzZustandBesichtigung;
-    }
-
-    /**
-     * Legt den Wert der fzZustandBesichtigung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FzZustandBesichtigungType }
-     *     
-     */
-    public void setFzZustandBesichtigung(FzZustandBesichtigungType value) {
-        this.fzZustandBesichtigung = value;
-    }
-
-    /**
-     * Ruft den Wert der zusaetzlicheAntragsdatenKfz-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ZusaetzlicheAntragsdatenKfzType }
-     *     
-     */
-    public ZusaetzlicheAntragsdatenKfzType getZusaetzlicheAntragsdatenKfz() {
-        return zusaetzlicheAntragsdatenKfz;
-    }
-
-    /**
-     * Legt den Wert der zusaetzlicheAntragsdatenKfz-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ZusaetzlicheAntragsdatenKfzType }
-     *     
-     */
-    public void setZusaetzlicheAntragsdatenKfz(ZusaetzlicheAntragsdatenKfzType value) {
-        this.zusaetzlicheAntragsdatenKfz = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ZusatzproduktKfzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ZusatzproduktKfzType.java
deleted file mode 100644
index 0d0fb22c..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ZusatzproduktKfzType.java
+++ /dev/null
@@ -1,39 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ProduktType;
-
-
-/**
- * Abstrakte Basisklasse für KFZ-Zusatzprodukte, die mit einer KFZ-Versicherung gebündelt werden können.
- * 
- * 
Java-Klasse für ZusatzproduktKfz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusatzproduktKfz_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Produkt_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusatzproduktKfz_Type")
-@XmlSeeAlso({
-    ProduktKfzRechtsschutzType.class
-})
-public abstract class ZusatzproduktKfzType
-    extends ProduktType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/package-info.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/package-info.java
deleted file mode 100644
index 54d956d1..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz;
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/AntragSachPrivatType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/AntragSachPrivatType.java
deleted file mode 100644
index 178f95c2..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/AntragSachPrivatType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SpezAntragType;
-
-
-/**
- * Typ der das Produkt beschreibt und in Antraganfrage und Antragantwort verwendet wird
- * 
- * 
Java-Klasse für AntragSachPrivat_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AntragSachPrivat_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezAntrag_Type">
- *       <sequence>
- *         <element name="Verkaufsprodukt" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}VerkaufsproduktSachPrivat_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AntragSachPrivat_Type", propOrder = {
-    "verkaufsprodukt"
-})
-public class AntragSachPrivatType
-    extends SpezAntragType
-{
-
-    @XmlElement(name = "Verkaufsprodukt", required = true)
-    protected VerkaufsproduktSachPrivatType verkaufsprodukt;
-
-    /**
-     * Ruft den Wert der verkaufsprodukt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VerkaufsproduktSachPrivatType }
-     *     
-     */
-    public VerkaufsproduktSachPrivatType getVerkaufsprodukt() {
-        return verkaufsprodukt;
-    }
-
-    /**
-     * Legt den Wert der verkaufsprodukt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VerkaufsproduktSachPrivatType }
-     *     
-     */
-    public void setVerkaufsprodukt(VerkaufsproduktSachPrivatType value) {
-        this.verkaufsprodukt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/BerechnungSachPrivatType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/BerechnungSachPrivatType.java
deleted file mode 100644
index e0a2b9eb..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/BerechnungSachPrivatType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SpezBerechnungType;
-
-
-/**
- * Typ der das Produkt beschreibt und in Berechnungsanfrage und Berechnungsantwort verwendet wird
- * 
- * 
Java-Klasse für BerechnungSachPrivat_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="BerechnungSachPrivat_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezBerechnung_Type">
- *       <sequence>
- *         <element name="Verkaufsprodukt" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}VerkaufsproduktSachPrivat_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BerechnungSachPrivat_Type", propOrder = {
-    "verkaufsprodukt"
-})
-public class BerechnungSachPrivatType
-    extends SpezBerechnungType
-{
-
-    @XmlElement(name = "Verkaufsprodukt", required = true)
-    protected VerkaufsproduktSachPrivatType verkaufsprodukt;
-
-    /**
-     * Ruft den Wert der verkaufsprodukt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VerkaufsproduktSachPrivatType }
-     *     
-     */
-    public VerkaufsproduktSachPrivatType getVerkaufsprodukt() {
-        return verkaufsprodukt;
-    }
-
-    /**
-     * Legt den Wert der verkaufsprodukt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VerkaufsproduktSachPrivatType }
-     *     
-     */
-    public void setVerkaufsprodukt(VerkaufsproduktSachPrivatType value) {
-        this.verkaufsprodukt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CalculateSachPrivatRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CalculateSachPrivatRequestType.java
deleted file mode 100644
index 263cfac2..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CalculateSachPrivatRequestType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CalculateRequestGenType;
-
-
-/**
- * Typ des Requestobjekts für eine Berechnung Sach-Privat
- * 
- * 
Java-Klasse für CalculateSachPrivatRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CalculateSachPrivatRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CalculateRequestGen_Type">
- *       <sequence>
- *         <element name="Berechnungsanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}BerechnungSachPrivat_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CalculateSachPrivatRequest_Type", propOrder = {
-    "berechnungsanfrage"
-})
-public class CalculateSachPrivatRequestType
-    extends CalculateRequestGenType
-{
-
-    @XmlElement(name = "Berechnungsanfrage", required = true)
-    protected BerechnungSachPrivatType berechnungsanfrage;
-
-    /**
-     * Ruft den Wert der berechnungsanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BerechnungSachPrivatType }
-     *     
-     */
-    public BerechnungSachPrivatType getBerechnungsanfrage() {
-        return berechnungsanfrage;
-    }
-
-    /**
-     * Legt den Wert der berechnungsanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BerechnungSachPrivatType }
-     *     
-     */
-    public void setBerechnungsanfrage(BerechnungSachPrivatType value) {
-        this.berechnungsanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CalculateSachPrivatResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CalculateSachPrivatResponseType.java
deleted file mode 100644
index 66bc3940..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CalculateSachPrivatResponseType.java
+++ /dev/null
@@ -1,95 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CalculateResponseGenType;
-
-
-/**
- * Typ des Responseobjekts für eine Berechnung Sach-Privat
- * 
- * 
Java-Klasse für CalculateSachPrivatResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CalculateSachPrivatResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CalculateResponseGen_Type">
- *       <sequence>
- *         <element name="Berechnungsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}BerechnungSachPrivat_Type"/>
- *         <element name="ResponseUpselling" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}UpsellingSachPrivatResponse_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CalculateSachPrivatResponse_Type", propOrder = {
-    "berechnungsantwort",
-    "responseUpselling"
-})
-public class CalculateSachPrivatResponseType
-    extends CalculateResponseGenType
-{
-
-    @XmlElement(name = "Berechnungsantwort", required = true)
-    protected BerechnungSachPrivatType berechnungsantwort;
-    @XmlElement(name = "ResponseUpselling")
-    protected UpsellingSachPrivatResponseType responseUpselling;
-
-    /**
-     * Ruft den Wert der berechnungsantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BerechnungSachPrivatType }
-     *     
-     */
-    public BerechnungSachPrivatType getBerechnungsantwort() {
-        return berechnungsantwort;
-    }
-
-    /**
-     * Legt den Wert der berechnungsantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BerechnungSachPrivatType }
-     *     
-     */
-    public void setBerechnungsantwort(BerechnungSachPrivatType value) {
-        this.berechnungsantwort = value;
-    }
-
-    /**
-     * Ruft den Wert der responseUpselling-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link UpsellingSachPrivatResponseType }
-     *     
-     */
-    public UpsellingSachPrivatResponseType getResponseUpselling() {
-        return responseUpselling;
-    }
-
-    /**
-     * Legt den Wert der responseUpselling-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link UpsellingSachPrivatResponseType }
-     *     
-     */
-    public void setResponseUpselling(UpsellingSachPrivatResponseType value) {
-        this.responseUpselling = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CreateApplicationSachPrivatRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CreateApplicationSachPrivatRequestType.java
deleted file mode 100644
index 6470b0f2..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CreateApplicationSachPrivatRequestType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateApplicationRequestGenType;
-
-
-/**
- * Typ des Requestobjekts für einen Antrag Besitz
- * 
- * 
Java-Klasse für CreateApplicationSachPrivatRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateApplicationSachPrivatRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateApplicationRequestGen_Type">
- *       <sequence>
- *         <element name="Antragsanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}AntragSachPrivat_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateApplicationSachPrivatRequest_Type", propOrder = {
-    "antragsanfrage"
-})
-public class CreateApplicationSachPrivatRequestType
-    extends CreateApplicationRequestGenType
-{
-
-    @XmlElement(name = "Antragsanfrage", required = true)
-    protected AntragSachPrivatType antragsanfrage;
-
-    /**
-     * Ruft den Wert der antragsanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AntragSachPrivatType }
-     *     
-     */
-    public AntragSachPrivatType getAntragsanfrage() {
-        return antragsanfrage;
-    }
-
-    /**
-     * Legt den Wert der antragsanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AntragSachPrivatType }
-     *     
-     */
-    public void setAntragsanfrage(AntragSachPrivatType value) {
-        this.antragsanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CreateApplicationSachPrivatResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CreateApplicationSachPrivatResponseType.java
deleted file mode 100644
index e70ef271..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CreateApplicationSachPrivatResponseType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateApplicationResponseGenType;
-
-
-/**
- * Typ des Responseobjekts für einen Antrag Besitz
- * 
- * 
Java-Klasse für CreateApplicationSachPrivatResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateApplicationSachPrivatResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateApplicationResponseGen_Type">
- *       <sequence>
- *         <element name="Antragsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}AntragSachPrivat_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateApplicationSachPrivatResponse_Type", propOrder = {
-    "antragsantwort"
-})
-public class CreateApplicationSachPrivatResponseType
-    extends CreateApplicationResponseGenType
-{
-
-    @XmlElement(name = "Antragsantwort", required = true)
-    protected AntragSachPrivatType antragsantwort;
-
-    /**
-     * Ruft den Wert der antragsantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AntragSachPrivatType }
-     *     
-     */
-    public AntragSachPrivatType getAntragsantwort() {
-        return antragsantwort;
-    }
-
-    /**
-     * Legt den Wert der antragsantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AntragSachPrivatType }
-     *     
-     */
-    public void setAntragsantwort(AntragSachPrivatType value) {
-        this.antragsantwort = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CreateOfferSachPrivatRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CreateOfferSachPrivatRequestType.java
deleted file mode 100644
index a083a108..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CreateOfferSachPrivatRequestType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateOfferRequestGenType;
-
-
-/**
- * Typ des Requestobjekts für ein Offert Sach-Privat
- * 
- * 
Java-Klasse für CreateOfferSachPrivatRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateOfferSachPrivatRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateOfferRequestGen_Type">
- *       <sequence>
- *         <element name="Offertanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}OffertSachPrivat_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateOfferSachPrivatRequest_Type", propOrder = {
-    "offertanfrage"
-})
-public class CreateOfferSachPrivatRequestType
-    extends CreateOfferRequestGenType
-{
-
-    @XmlElement(name = "Offertanfrage", required = true)
-    protected OffertSachPrivatType offertanfrage;
-
-    /**
-     * Ruft den Wert der offertanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link OffertSachPrivatType }
-     *     
-     */
-    public OffertSachPrivatType getOffertanfrage() {
-        return offertanfrage;
-    }
-
-    /**
-     * Legt den Wert der offertanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link OffertSachPrivatType }
-     *     
-     */
-    public void setOffertanfrage(OffertSachPrivatType value) {
-        this.offertanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CreateOfferSachPrivatResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CreateOfferSachPrivatResponseType.java
deleted file mode 100644
index 5ba6bbb3..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/CreateOfferSachPrivatResponseType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateOfferResponseGenType;
-
-
-/**
- * Typ des Responseobjekts für ein Offert Besitz
- * 
- * 
Java-Klasse für CreateOfferSachPrivatResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateOfferSachPrivatResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateOfferResponseGen_Type">
- *       <sequence>
- *         <element name="Offertantwort" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}OffertSachPrivat_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateOfferSachPrivatResponse_Type", propOrder = {
-    "offertantwort"
-})
-public class CreateOfferSachPrivatResponseType
-    extends CreateOfferResponseGenType
-{
-
-    @XmlElement(name = "Offertantwort", required = true)
-    protected OffertSachPrivatType offertantwort;
-
-    /**
-     * Ruft den Wert der offertantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link OffertSachPrivatType }
-     *     
-     */
-    public OffertSachPrivatType getOffertantwort() {
-        return offertantwort;
-    }
-
-    /**
-     * Legt den Wert der offertantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link OffertSachPrivatType }
-     *     
-     */
-    public void setOffertantwort(OffertSachPrivatType value) {
-        this.offertantwort = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ElementarproduktGebaeudeType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ElementarproduktGebaeudeType.java
deleted file mode 100644
index 0ab9c487..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ElementarproduktGebaeudeType.java
+++ /dev/null
@@ -1,38 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Spezifischerer Typ für ein Gebäude-Elementarprodukt für einen Ansatz, in dem mit Vererbung für die einzelnen Sparten gearbeitet wird
- * 
- * 
Java-Klasse für ElementarproduktGebaeude_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ElementarproduktGebaeude_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}ElementarproduktSachPrivat_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ElementarproduktGebaeude_Type")
-@XmlSeeAlso({
-    GenElementarproduktGebaeudeType.class
-})
-public class ElementarproduktGebaeudeType
-    extends ElementarproduktSachPrivatType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ElementarproduktHaushaltType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ElementarproduktHaushaltType.java
deleted file mode 100644
index 0a25f52b..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ElementarproduktHaushaltType.java
+++ /dev/null
@@ -1,38 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Spezifischerer Typ für ein Gebäudeinhalts-Elementarprodukt für einen Ansatz, in dem mit Vererbung für die einzelnen Sparten gearbeitet wird
- * 
- * 
Java-Klasse für ElementarproduktHaushalt_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ElementarproduktHaushalt_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}ElementarproduktSachPrivat_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ElementarproduktHaushalt_Type")
-@XmlSeeAlso({
-    GenElementarproduktHaushaltType.class
-})
-public class ElementarproduktHaushaltType
-    extends ElementarproduktSachPrivatType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ElementarproduktSachPrivatType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ElementarproduktSachPrivatType.java
deleted file mode 100644
index a9a80c53..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ElementarproduktSachPrivatType.java
+++ /dev/null
@@ -1,281 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-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.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ElementarproduktGenerischType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.KostenFixOderProzentType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.SelbstbehaltType;
-
-
-/**
- * Wurzelelement für Sach-Privat-Elementarprodukte, auf welchem alle Sach-Privat Elementarprodukte aufbauen sollen
- * 
- * 
Java-Klasse für ElementarproduktSachPrivat_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ElementarproduktSachPrivat_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ElementarproduktGenerisch_Type">
- *       <sequence>
- *         <element name="VersObjekteRefLfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Pauschalbetrag" type="{urn:omds20}decimal" minOccurs="0"/>
- *         <element name="Selbstbehalt" type="{urn:omds3CommonServiceTypes-1-1-0}Selbstbehalt_Type" minOccurs="0"/>
- *         <element name="Unterversicherungsverzicht" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="ProzentVersicherungssumme" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/>
- *         <element name="Nebenkosten" type="{urn:omds3CommonServiceTypes-1-1-0}KostenFixOderProzent_Type" minOccurs="0"/>
- *         <element name="Vorsorge" type="{urn:omds3CommonServiceTypes-1-1-0}KostenFixOderProzent_Type" minOccurs="0"/>
- *         <element name="Hoechsthaftungssumme" type="{urn:omds20}decimal" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ElementarproduktSachPrivat_Type", propOrder = {
-    "versObjekteRefLfnr",
-    "pauschalbetrag",
-    "selbstbehalt",
-    "unterversicherungsverzicht",
-    "prozentVersicherungssumme",
-    "nebenkosten",
-    "vorsorge",
-    "hoechsthaftungssumme"
-})
-@XmlSeeAlso({
-    ElementarproduktGebaeudeType.class,
-    ElementarproduktHaushaltType.class
-})
-public class ElementarproduktSachPrivatType
-    extends ElementarproduktGenerischType
-{
-
-    @XmlElement(name = "VersObjekteRefLfnr", type = Integer.class)
-    @XmlSchemaType(name = "unsignedShort")
-    protected List versObjekteRefLfnr;
-    @XmlElement(name = "Pauschalbetrag")
-    protected BigDecimal pauschalbetrag;
-    @XmlElement(name = "Selbstbehalt")
-    protected SelbstbehaltType selbstbehalt;
-    @XmlElement(name = "Unterversicherungsverzicht")
-    protected Boolean unterversicherungsverzicht;
-    @XmlElement(name = "ProzentVersicherungssumme")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer prozentVersicherungssumme;
-    @XmlElement(name = "Nebenkosten")
-    protected KostenFixOderProzentType nebenkosten;
-    @XmlElement(name = "Vorsorge")
-    protected KostenFixOderProzentType vorsorge;
-    @XmlElement(name = "Hoechsthaftungssumme")
-    protected BigDecimal hoechsthaftungssumme;
-
-    /**
-     * Gets the value of the versObjekteRefLfnr property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the versObjekteRefLfnr property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVersObjekteRefLfnr().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link Integer }
-     * 
-     * 
-     */
-    public List getVersObjekteRefLfnr() {
-        if (versObjekteRefLfnr == null) {
-            versObjekteRefLfnr = new ArrayList();
-        }
-        return this.versObjekteRefLfnr;
-    }
-
-    /**
-     * Ruft den Wert der pauschalbetrag-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getPauschalbetrag() {
-        return pauschalbetrag;
-    }
-
-    /**
-     * Legt den Wert der pauschalbetrag-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setPauschalbetrag(BigDecimal value) {
-        this.pauschalbetrag = value;
-    }
-
-    /**
-     * Ruft den Wert der selbstbehalt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SelbstbehaltType }
-     *     
-     */
-    public SelbstbehaltType getSelbstbehalt() {
-        return selbstbehalt;
-    }
-
-    /**
-     * Legt den Wert der selbstbehalt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SelbstbehaltType }
-     *     
-     */
-    public void setSelbstbehalt(SelbstbehaltType value) {
-        this.selbstbehalt = value;
-    }
-
-    /**
-     * Ruft den Wert der unterversicherungsverzicht-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isUnterversicherungsverzicht() {
-        return unterversicherungsverzicht;
-    }
-
-    /**
-     * Legt den Wert der unterversicherungsverzicht-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setUnterversicherungsverzicht(Boolean value) {
-        this.unterversicherungsverzicht = value;
-    }
-
-    /**
-     * Ruft den Wert der prozentVersicherungssumme-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getProzentVersicherungssumme() {
-        return prozentVersicherungssumme;
-    }
-
-    /**
-     * Legt den Wert der prozentVersicherungssumme-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setProzentVersicherungssumme(Integer value) {
-        this.prozentVersicherungssumme = value;
-    }
-
-    /**
-     * Ruft den Wert der nebenkosten-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link KostenFixOderProzentType }
-     *     
-     */
-    public KostenFixOderProzentType getNebenkosten() {
-        return nebenkosten;
-    }
-
-    /**
-     * Legt den Wert der nebenkosten-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link KostenFixOderProzentType }
-     *     
-     */
-    public void setNebenkosten(KostenFixOderProzentType value) {
-        this.nebenkosten = value;
-    }
-
-    /**
-     * Ruft den Wert der vorsorge-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link KostenFixOderProzentType }
-     *     
-     */
-    public KostenFixOderProzentType getVorsorge() {
-        return vorsorge;
-    }
-
-    /**
-     * Legt den Wert der vorsorge-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link KostenFixOderProzentType }
-     *     
-     */
-    public void setVorsorge(KostenFixOderProzentType value) {
-        this.vorsorge = value;
-    }
-
-    /**
-     * Ruft den Wert der hoechsthaftungssumme-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getHoechsthaftungssumme() {
-        return hoechsthaftungssumme;
-    }
-
-    /**
-     * Legt den Wert der hoechsthaftungssumme-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setHoechsthaftungssumme(BigDecimal value) {
-        this.hoechsthaftungssumme = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/GenElementarproduktGebaeudeType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/GenElementarproduktGebaeudeType.java
deleted file mode 100644
index 8fdffd6f..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/GenElementarproduktGebaeudeType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Elementarprodukt Gebäudeversicherung für einen Ansatz, in dem nicht mit Vererbung gearbeitet wird.
- * 
- * 
Java-Klasse für GenElementarproduktGebaeude_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GenElementarproduktGebaeude_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}ElementarproduktGebaeude_Type">
- *       <sequence>
- *         <element name="Sparte" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}GebaeudeSpartenCd_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GenElementarproduktGebaeude_Type", propOrder = {
-    "sparte"
-})
-public class GenElementarproduktGebaeudeType
-    extends ElementarproduktGebaeudeType
-{
-
-    @XmlElement(name = "Sparte", required = true)
-    protected String sparte;
-
-    /**
-     * Ruft den Wert der sparte-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSparte() {
-        return sparte;
-    }
-
-    /**
-     * Legt den Wert der sparte-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSparte(String value) {
-        this.sparte = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/GenElementarproduktHaushaltType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/GenElementarproduktHaushaltType.java
deleted file mode 100644
index 0d387c01..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/GenElementarproduktHaushaltType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Elementarprodukt Gebäudeinhaltsversicherung für einen Ansatz, in dem nicht mit Vererbung gearbeitet wird.
- * 
- * 
Java-Klasse für GenElementarproduktHaushalt_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GenElementarproduktHaushalt_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}ElementarproduktHaushalt_Type">
- *       <sequence>
- *         <element name="Sparte" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}HaushaltSpartenCd_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GenElementarproduktHaushalt_Type", propOrder = {
-    "sparte"
-})
-public class GenElementarproduktHaushaltType
-    extends ElementarproduktHaushaltType
-{
-
-    @XmlElement(name = "Sparte", required = true)
-    protected String sparte;
-
-    /**
-     * Ruft den Wert der sparte-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSparte() {
-        return sparte;
-    }
-
-    /**
-     * Legt den Wert der sparte-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSparte(String value) {
-        this.sparte = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/NebengebaeudeType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/NebengebaeudeType.java
deleted file mode 100644
index ff0df8b9..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/NebengebaeudeType.java
+++ /dev/null
@@ -1,99 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
Java-Klasse für Nebengebaeude_Type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

- * 
- * <simpleType name="Nebengebaeude_Type">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="Abstellgebaeude"/>
- *     <enumeration value="Badehütte"/>
- *     <enumeration value="Bootshaus"/>
- *     <enumeration value="Carport"/>
- *     <enumeration value="ehemaliges Wirtschaftsgebaeude"/>
- *     <enumeration value="Garage"/>
- *     <enumeration value="Gartenhaus (nicht für Wohnzwecke)"/>
- *     <enumeration value="Holzhütte"/>
- *     <enumeration value="Keller"/>
- *     <enumeration value="Mobilheim (stationaer)"/>
- *     <enumeration value="Nebengebaeude"/>
- *     <enumeration value="Nebengebaeude mit Garage"/>
- *     <enumeration value="Presshaus"/>
- *     <enumeration value="Sauna"/>
- *     <enumeration value="Scheune / Schuppen / Stadel"/>
- *     <enumeration value="Werkstaette"/>
- *     <enumeration value="Werkzeug- und Geraeteschuppen"/>
- *     <enumeration value="Wintergarten, Veranda"/>
- *   </restriction>
- * </simpleType>
- * 

- * 
- */
-@XmlType(name = "Nebengebaeude_Type")
-@XmlEnum
-public enum NebengebaeudeType {
-
-    @XmlEnumValue("Abstellgebaeude")
-    ABSTELLGEBAEUDE("Abstellgebaeude"),
-    @XmlEnumValue("Badeh\u00fctte")
-    BADEHÜTTE("Badeh\u00fctte"),
-    @XmlEnumValue("Bootshaus")
-    BOOTSHAUS("Bootshaus"),
-    @XmlEnumValue("Carport")
-    CARPORT("Carport"),
-    @XmlEnumValue("ehemaliges Wirtschaftsgebaeude")
-    EHEMALIGES_WIRTSCHAFTSGEBAEUDE("ehemaliges Wirtschaftsgebaeude"),
-    @XmlEnumValue("Garage")
-    GARAGE("Garage"),
-    @XmlEnumValue("Gartenhaus (nicht f\u00fcr Wohnzwecke)")
-    GARTENHAUS_NICHT_FÜR_WOHNZWECKE("Gartenhaus (nicht f\u00fcr Wohnzwecke)"),
-    @XmlEnumValue("Holzh\u00fctte")
-    HOLZHÜTTE("Holzh\u00fctte"),
-    @XmlEnumValue("Keller")
-    KELLER("Keller"),
-    @XmlEnumValue("Mobilheim (stationaer)")
-    MOBILHEIM_STATIONAER("Mobilheim (stationaer)"),
-    @XmlEnumValue("Nebengebaeude")
-    NEBENGEBAEUDE("Nebengebaeude"),
-    @XmlEnumValue("Nebengebaeude mit Garage")
-    NEBENGEBAEUDE_MIT_GARAGE("Nebengebaeude mit Garage"),
-    @XmlEnumValue("Presshaus")
-    PRESSHAUS("Presshaus"),
-    @XmlEnumValue("Sauna")
-    SAUNA("Sauna"),
-    @XmlEnumValue("Scheune / Schuppen / Stadel")
-    SCHEUNE_SCHUPPEN_STADEL("Scheune / Schuppen / Stadel"),
-    @XmlEnumValue("Werkstaette")
-    WERKSTAETTE("Werkstaette"),
-    @XmlEnumValue("Werkzeug- und Geraeteschuppen")
-    WERKZEUG_UND_GERAETESCHUPPEN("Werkzeug- und Geraeteschuppen"),
-    @XmlEnumValue("Wintergarten, Veranda")
-    WINTERGARTEN_VERANDA("Wintergarten, Veranda");
-    private final String value;
-
-    NebengebaeudeType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static NebengebaeudeType fromValue(String v) {
-        for (NebengebaeudeType c: NebengebaeudeType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ObjectFactory.java
deleted file mode 100644
index 5755210d..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ObjectFactory.java
+++ /dev/null
@@ -1,367 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-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 at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat package. 
- * 
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 _ProduktGebaeudeversicherung_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", "ProduktGebaeudeversicherung");
-    private final static QName _ProduktHaushaltsversicherung_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", "ProduktHaushaltsversicherung");
-    private final static QName _CalculateSachPrivatRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", "CalculateSachPrivatRequest");
-    private final static QName _CalculateSachPrivatResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", "CalculateSachPrivatResponse");
-    private final static QName _CreateOfferSachPrivatRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", "CreateOfferSachPrivatRequest");
-    private final static QName _CreateOfferSachPrivatResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", "CreateOfferSachPrivatResponse");
-    private final static QName _CreateApplicationSachPrivatRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", "CreateApplicationSachPrivatRequest");
-    private final static QName _CreateApplicationSachPrivatResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", "CreateApplicationSachPrivatResponse");
-    private final static QName _SubmitApplicationSachPrivatRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", "SubmitApplicationSachPrivatRequest");
-    private final static QName _SubmitApplicationSachPrivatResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", "SubmitApplicationSachPrivatResponse");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link ProduktGebaeudeversicherungType }
-     * 
-     */
-    public ProduktGebaeudeversicherungType createProduktGebaeudeversicherungType() {
-        return new ProduktGebaeudeversicherungType();
-    }
-
-    /**
-     * Create an instance of {@link ProduktHaushaltsversicherungType }
-     * 
-     */
-    public ProduktHaushaltsversicherungType createProduktHaushaltsversicherungType() {
-        return new ProduktHaushaltsversicherungType();
-    }
-
-    /**
-     * Create an instance of {@link CalculateSachPrivatRequestType }
-     * 
-     */
-    public CalculateSachPrivatRequestType createCalculateSachPrivatRequestType() {
-        return new CalculateSachPrivatRequestType();
-    }
-
-    /**
-     * Create an instance of {@link CalculateSachPrivatResponseType }
-     * 
-     */
-    public CalculateSachPrivatResponseType createCalculateSachPrivatResponseType() {
-        return new CalculateSachPrivatResponseType();
-    }
-
-    /**
-     * Create an instance of {@link CreateOfferSachPrivatRequestType }
-     * 
-     */
-    public CreateOfferSachPrivatRequestType createCreateOfferSachPrivatRequestType() {
-        return new CreateOfferSachPrivatRequestType();
-    }
-
-    /**
-     * Create an instance of {@link CreateOfferSachPrivatResponseType }
-     * 
-     */
-    public CreateOfferSachPrivatResponseType createCreateOfferSachPrivatResponseType() {
-        return new CreateOfferSachPrivatResponseType();
-    }
-
-    /**
-     * Create an instance of {@link CreateApplicationSachPrivatRequestType }
-     * 
-     */
-    public CreateApplicationSachPrivatRequestType createCreateApplicationSachPrivatRequestType() {
-        return new CreateApplicationSachPrivatRequestType();
-    }
-
-    /**
-     * Create an instance of {@link CreateApplicationSachPrivatResponseType }
-     * 
-     */
-    public CreateApplicationSachPrivatResponseType createCreateApplicationSachPrivatResponseType() {
-        return new CreateApplicationSachPrivatResponseType();
-    }
-
-    /**
-     * Create an instance of {@link SubmitApplicationSachPrivatRequestType }
-     * 
-     */
-    public SubmitApplicationSachPrivatRequestType createSubmitApplicationSachPrivatRequestType() {
-        return new SubmitApplicationSachPrivatRequestType();
-    }
-
-    /**
-     * Create an instance of {@link SubmitApplicationSachPrivatResponseType }
-     * 
-     */
-    public SubmitApplicationSachPrivatResponseType createSubmitApplicationSachPrivatResponseType() {
-        return new SubmitApplicationSachPrivatResponseType();
-    }
-
-    /**
-     * Create an instance of {@link VersichertesObjektSachPrivatType }
-     * 
-     */
-    public VersichertesObjektSachPrivatType createVersichertesObjektSachPrivatType() {
-        return new VersichertesObjektSachPrivatType();
-    }
-
-    /**
-     * Create an instance of {@link RisikoAdresseType }
-     * 
-     */
-    public RisikoAdresseType createRisikoAdresseType() {
-        return new RisikoAdresseType();
-    }
-
-    /**
-     * Create an instance of {@link RisikoHaushaltType }
-     * 
-     */
-    public RisikoHaushaltType createRisikoHaushaltType() {
-        return new RisikoHaushaltType();
-    }
-
-    /**
-     * Create an instance of {@link RisikoGebaeudeType }
-     * 
-     */
-    public RisikoGebaeudeType createRisikoGebaeudeType() {
-        return new RisikoGebaeudeType();
-    }
-
-    /**
-     * Create an instance of {@link ZusaetzlicheGebaeudedatenWintergartenType }
-     * 
-     */
-    public ZusaetzlicheGebaeudedatenWintergartenType createZusaetzlicheGebaeudedatenWintergartenType() {
-        return new ZusaetzlicheGebaeudedatenWintergartenType();
-    }
-
-    /**
-     * Create an instance of {@link ZusaetzlicheGebaeudedatenSolarthermieType }
-     * 
-     */
-    public ZusaetzlicheGebaeudedatenSolarthermieType createZusaetzlicheGebaeudedatenSolarthermieType() {
-        return new ZusaetzlicheGebaeudedatenSolarthermieType();
-    }
-
-    /**
-     * Create an instance of {@link ZusaetzlicheGebaeudedatenSchwimmbadType }
-     * 
-     */
-    public ZusaetzlicheGebaeudedatenSchwimmbadType createZusaetzlicheGebaeudedatenSchwimmbadType() {
-        return new ZusaetzlicheGebaeudedatenSchwimmbadType();
-    }
-
-    /**
-     * Create an instance of {@link ZusaetzlicheGebaeudedatenPhotovoltaikType }
-     * 
-     */
-    public ZusaetzlicheGebaeudedatenPhotovoltaikType createZusaetzlicheGebaeudedatenPhotovoltaikType() {
-        return new ZusaetzlicheGebaeudedatenPhotovoltaikType();
-    }
-
-    /**
-     * Create an instance of {@link VerkaufsproduktSachPrivatType }
-     * 
-     */
-    public VerkaufsproduktSachPrivatType createVerkaufsproduktSachPrivatType() {
-        return new VerkaufsproduktSachPrivatType();
-    }
-
-    /**
-     * Create an instance of {@link ProduktSachPrivatType }
-     * 
-     */
-    public ProduktSachPrivatType createProduktSachPrivatType() {
-        return new ProduktSachPrivatType();
-    }
-
-    /**
-     * Create an instance of {@link ElementarproduktSachPrivatType }
-     * 
-     */
-    public ElementarproduktSachPrivatType createElementarproduktSachPrivatType() {
-        return new ElementarproduktSachPrivatType();
-    }
-
-    /**
-     * Create an instance of {@link ElementarproduktGebaeudeType }
-     * 
-     */
-    public ElementarproduktGebaeudeType createElementarproduktGebaeudeType() {
-        return new ElementarproduktGebaeudeType();
-    }
-
-    /**
-     * Create an instance of {@link ElementarproduktHaushaltType }
-     * 
-     */
-    public ElementarproduktHaushaltType createElementarproduktHaushaltType() {
-        return new ElementarproduktHaushaltType();
-    }
-
-    /**
-     * Create an instance of {@link GenElementarproduktGebaeudeType }
-     * 
-     */
-    public GenElementarproduktGebaeudeType createGenElementarproduktGebaeudeType() {
-        return new GenElementarproduktGebaeudeType();
-    }
-
-    /**
-     * Create an instance of {@link GenElementarproduktHaushaltType }
-     * 
-     */
-    public GenElementarproduktHaushaltType createGenElementarproduktHaushaltType() {
-        return new GenElementarproduktHaushaltType();
-    }
-
-    /**
-     * Create an instance of {@link BerechnungSachPrivatType }
-     * 
-     */
-    public BerechnungSachPrivatType createBerechnungSachPrivatType() {
-        return new BerechnungSachPrivatType();
-    }
-
-    /**
-     * Create an instance of {@link OffertSachPrivatType }
-     * 
-     */
-    public OffertSachPrivatType createOffertSachPrivatType() {
-        return new OffertSachPrivatType();
-    }
-
-    /**
-     * Create an instance of {@link AntragSachPrivatType }
-     * 
-     */
-    public AntragSachPrivatType createAntragSachPrivatType() {
-        return new AntragSachPrivatType();
-    }
-
-    /**
-     * Create an instance of {@link UpsellingSachPrivatResponseType }
-     * 
-     */
-    public UpsellingSachPrivatResponseType createUpsellingSachPrivatResponseType() {
-        return new UpsellingSachPrivatResponseType();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ProduktGebaeudeversicherungType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", name = "ProduktGebaeudeversicherung")
-    public JAXBElement createProduktGebaeudeversicherung(ProduktGebaeudeversicherungType value) {
-        return new JAXBElement(_ProduktGebaeudeversicherung_QNAME, ProduktGebaeudeversicherungType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ProduktHaushaltsversicherungType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", name = "ProduktHaushaltsversicherung")
-    public JAXBElement createProduktHaushaltsversicherung(ProduktHaushaltsversicherungType value) {
-        return new JAXBElement(_ProduktHaushaltsversicherung_QNAME, ProduktHaushaltsversicherungType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CalculateSachPrivatRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", name = "CalculateSachPrivatRequest")
-    public JAXBElement createCalculateSachPrivatRequest(CalculateSachPrivatRequestType value) {
-        return new JAXBElement(_CalculateSachPrivatRequest_QNAME, CalculateSachPrivatRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CalculateSachPrivatResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", name = "CalculateSachPrivatResponse")
-    public JAXBElement createCalculateSachPrivatResponse(CalculateSachPrivatResponseType value) {
-        return new JAXBElement(_CalculateSachPrivatResponse_QNAME, CalculateSachPrivatResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateOfferSachPrivatRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", name = "CreateOfferSachPrivatRequest")
-    public JAXBElement createCreateOfferSachPrivatRequest(CreateOfferSachPrivatRequestType value) {
-        return new JAXBElement(_CreateOfferSachPrivatRequest_QNAME, CreateOfferSachPrivatRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateOfferSachPrivatResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", name = "CreateOfferSachPrivatResponse")
-    public JAXBElement createCreateOfferSachPrivatResponse(CreateOfferSachPrivatResponseType value) {
-        return new JAXBElement(_CreateOfferSachPrivatResponse_QNAME, CreateOfferSachPrivatResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateApplicationSachPrivatRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", name = "CreateApplicationSachPrivatRequest")
-    public JAXBElement createCreateApplicationSachPrivatRequest(CreateApplicationSachPrivatRequestType value) {
-        return new JAXBElement(_CreateApplicationSachPrivatRequest_QNAME, CreateApplicationSachPrivatRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateApplicationSachPrivatResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", name = "CreateApplicationSachPrivatResponse")
-    public JAXBElement createCreateApplicationSachPrivatResponse(CreateApplicationSachPrivatResponseType value) {
-        return new JAXBElement(_CreateApplicationSachPrivatResponse_QNAME, CreateApplicationSachPrivatResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SubmitApplicationSachPrivatRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", name = "SubmitApplicationSachPrivatRequest")
-    public JAXBElement createSubmitApplicationSachPrivatRequest(SubmitApplicationSachPrivatRequestType value) {
-        return new JAXBElement(_SubmitApplicationSachPrivatRequest_QNAME, SubmitApplicationSachPrivatRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SubmitApplicationSachPrivatResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", name = "SubmitApplicationSachPrivatResponse")
-    public JAXBElement createSubmitApplicationSachPrivatResponse(SubmitApplicationSachPrivatResponseType value) {
-        return new JAXBElement(_SubmitApplicationSachPrivatResponse_QNAME, SubmitApplicationSachPrivatResponseType.class, null, value);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/OffertSachPrivatType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/OffertSachPrivatType.java
deleted file mode 100644
index 70c7fbbd..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/OffertSachPrivatType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SpezOffertType;
-
-
-/**
- * Typ der das Produkt beschreibt und in Offertanfrage und Offertantwort verwendet wird
- * 
- * 
Java-Klasse für OffertSachPrivat_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="OffertSachPrivat_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezOffert_Type">
- *       <sequence>
- *         <element name="Verkaufsprodukt" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}VerkaufsproduktSachPrivat_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OffertSachPrivat_Type", propOrder = {
-    "verkaufsprodukt"
-})
-public class OffertSachPrivatType
-    extends SpezOffertType
-{
-
-    @XmlElement(name = "Verkaufsprodukt", required = true)
-    protected VerkaufsproduktSachPrivatType verkaufsprodukt;
-
-    /**
-     * Ruft den Wert der verkaufsprodukt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VerkaufsproduktSachPrivatType }
-     *     
-     */
-    public VerkaufsproduktSachPrivatType getVerkaufsprodukt() {
-        return verkaufsprodukt;
-    }
-
-    /**
-     * Legt den Wert der verkaufsprodukt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VerkaufsproduktSachPrivatType }
-     *     
-     */
-    public void setVerkaufsprodukt(VerkaufsproduktSachPrivatType value) {
-        this.verkaufsprodukt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ProduktGebaeudeversicherungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ProduktGebaeudeversicherungType.java
deleted file mode 100644
index b775dc2e..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ProduktGebaeudeversicherungType.java
+++ /dev/null
@@ -1,73 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-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;
-
-
-/**
- * Spezifischerer Typ für Gebaeudeversicherungs-Produkte
- * 
- * 
Java-Klasse für ProduktGebaeudeversicherung_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProduktGebaeudeversicherung_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}ProduktSachPrivat_Type">
- *       <sequence>
- *         <element name="Deckungen" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}ElementarproduktGebaeude_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProduktGebaeudeversicherung_Type", propOrder = {
-    "deckungen"
-})
-public class ProduktGebaeudeversicherungType
-    extends ProduktSachPrivatType
-{
-
-    @XmlElement(name = "Deckungen")
-    protected List deckungen;
-
-    /**
-     * Gets the value of the deckungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the deckungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDeckungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ElementarproduktGebaeudeType }
-     * 
-     * 
-     */
-    public List getDeckungen() {
-        if (deckungen == null) {
-            deckungen = new ArrayList();
-        }
-        return this.deckungen;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ProduktHaushaltsversicherungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ProduktHaushaltsversicherungType.java
deleted file mode 100644
index 7644b99e..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ProduktHaushaltsversicherungType.java
+++ /dev/null
@@ -1,73 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-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;
-
-
-/**
- * Spezifischerer Typ für Gebäudeinhaltversicherungs-Produkte
- * 
- * 
Java-Klasse für ProduktHaushaltsversicherung_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProduktHaushaltsversicherung_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}ProduktSachPrivat_Type">
- *       <sequence>
- *         <element name="Deckungen" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}ElementarproduktHaushalt_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProduktHaushaltsversicherung_Type", propOrder = {
-    "deckungen"
-})
-public class ProduktHaushaltsversicherungType
-    extends ProduktSachPrivatType
-{
-
-    @XmlElement(name = "Deckungen")
-    protected List deckungen;
-
-    /**
-     * Gets the value of the deckungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the deckungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDeckungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ElementarproduktHaushaltType }
-     * 
-     * 
-     */
-    public List getDeckungen() {
-        if (deckungen == null) {
-            deckungen = new ArrayList();
-        }
-        return this.deckungen;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ProduktSachPrivatType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ProduktSachPrivatType.java
deleted file mode 100644
index e7561003..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ProduktSachPrivatType.java
+++ /dev/null
@@ -1,81 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ProduktGenerischType;
-
-
-/**
- * Wurzelelement für Sach-Privat-Produkte, auf welchem alle Sach-Privat Produkte aufbauen sollen
- * 
- * 
Java-Klasse für ProduktSachPrivat_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProduktSachPrivat_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ProduktGenerisch_Type">
- *       <sequence>
- *         <element name="VersObjekteRefLfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProduktSachPrivat_Type", propOrder = {
-    "versObjekteRefLfnr"
-})
-@XmlSeeAlso({
-    ProduktGebaeudeversicherungType.class,
-    ProduktHaushaltsversicherungType.class
-})
-public class ProduktSachPrivatType
-    extends ProduktGenerischType
-{
-
-    @XmlElement(name = "VersObjekteRefLfnr", type = Integer.class)
-    @XmlSchemaType(name = "unsignedShort")
-    protected List versObjekteRefLfnr;
-
-    /**
-     * Gets the value of the versObjekteRefLfnr property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the versObjekteRefLfnr property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVersObjekteRefLfnr().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link Integer }
-     * 
-     * 
-     */
-    public List getVersObjekteRefLfnr() {
-        if (versObjekteRefLfnr == null) {
-            versObjekteRefLfnr = new ArrayList();
-        }
-        return this.versObjekteRefLfnr;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/RisikoAdresseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/RisikoAdresseType.java
deleted file mode 100644
index def1230b..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/RisikoAdresseType.java
+++ /dev/null
@@ -1,181 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-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 at.vvo.omds.types.omds2Types.v2_14.ADRESSEType;
-
-
-/**
- * Type zur Beschreibung einer Risikoadresse
- * 
- * 
Java-Klasse für RisikoAdresse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="RisikoAdresse_Type">
- *   <complexContent>
- *     <extension base="{urn:omds20}ADRESSE_Type">
- *       <sequence>
- *         <element name="Horazone" type="{http://www.w3.org/2001/XMLSchema}unsignedByte" minOccurs="0"/>
- *         <element name="ImVerbautenOrt" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="AusserhalbDesOrtsgebiets" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="ErreichbarkeitFuerLoeschfahrzeuge" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="Tarifzone" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RisikoAdresse_Type", propOrder = {
-    "horazone",
-    "imVerbautenOrt",
-    "ausserhalbDesOrtsgebiets",
-    "erreichbarkeitFuerLoeschfahrzeuge",
-    "tarifzone"
-})
-public class RisikoAdresseType
-    extends ADRESSEType
-{
-
-    @XmlElement(name = "Horazone")
-    @XmlSchemaType(name = "unsignedByte")
-    protected Short horazone;
-    @XmlElement(name = "ImVerbautenOrt")
-    protected Boolean imVerbautenOrt;
-    @XmlElement(name = "AusserhalbDesOrtsgebiets")
-    protected Boolean ausserhalbDesOrtsgebiets;
-    @XmlElement(name = "ErreichbarkeitFuerLoeschfahrzeuge")
-    protected Boolean erreichbarkeitFuerLoeschfahrzeuge;
-    @XmlElement(name = "Tarifzone")
-    protected String tarifzone;
-
-    /**
-     * Ruft den Wert der horazone-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Short }
-     *     
-     */
-    public Short getHorazone() {
-        return horazone;
-    }
-
-    /**
-     * Legt den Wert der horazone-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Short }
-     *     
-     */
-    public void setHorazone(Short value) {
-        this.horazone = value;
-    }
-
-    /**
-     * Ruft den Wert der imVerbautenOrt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isImVerbautenOrt() {
-        return imVerbautenOrt;
-    }
-
-    /**
-     * Legt den Wert der imVerbautenOrt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setImVerbautenOrt(Boolean value) {
-        this.imVerbautenOrt = value;
-    }
-
-    /**
-     * Ruft den Wert der ausserhalbDesOrtsgebiets-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isAusserhalbDesOrtsgebiets() {
-        return ausserhalbDesOrtsgebiets;
-    }
-
-    /**
-     * Legt den Wert der ausserhalbDesOrtsgebiets-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setAusserhalbDesOrtsgebiets(Boolean value) {
-        this.ausserhalbDesOrtsgebiets = value;
-    }
-
-    /**
-     * Ruft den Wert der erreichbarkeitFuerLoeschfahrzeuge-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isErreichbarkeitFuerLoeschfahrzeuge() {
-        return erreichbarkeitFuerLoeschfahrzeuge;
-    }
-
-    /**
-     * Legt den Wert der erreichbarkeitFuerLoeschfahrzeuge-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setErreichbarkeitFuerLoeschfahrzeuge(Boolean value) {
-        this.erreichbarkeitFuerLoeschfahrzeuge = value;
-    }
-
-    /**
-     * Ruft den Wert der tarifzone-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTarifzone() {
-        return tarifzone;
-    }
-
-    /**
-     * Legt den Wert der tarifzone-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTarifzone(String value) {
-        this.tarifzone = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/RisikoGebaeudeType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/RisikoGebaeudeType.java
deleted file mode 100644
index 95e274f4..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/RisikoGebaeudeType.java
+++ /dev/null
@@ -1,427 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-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.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds2Types.v2_14.ELFlaecheType;
-import at.vvo.omds.types.omds2Types.v2_14.Entsch2Type;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VersichertesInteresseMitAttributMetadatenType;
-
-
-/**
- * Type zur Risikobeschreibung Gebäude
- * 
- * 
Java-Klasse für RisikoGebaeude_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="RisikoGebaeude_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}VersichertesInteresseMitAttributMetadaten_Type">
- *       <sequence>
- *         <element name="GebaeudeArtCd" type="{urn:omds20}GebaeudeArtCd_Type"/>
- *         <element name="GebaeudeBez" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="NutzungCd" type="{urn:omds20}NutzungCd_Type" minOccurs="0"/>
- *         <element name="BauartCd" type="{urn:omds20}BauartCd_Type" minOccurs="0"/>
- *         <element name="DachungCd" type="{urn:omds20}DachungCd_Type" minOccurs="0"/>
- *         <element name="GebaeudeHoeheCd" type="{urn:omds20}GebaeudeHoeheCd_Type" minOccurs="0"/>
- *         <element name="BaujahrGebaeude" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *         <element name="EL-Flaeche" type="{urn:omds20}EL-Flaeche_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Vorschaeden" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}RisikoVorschaeden_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="AusstattungCd" type="{urn:omds20}AusstattungCd_Type" minOccurs="0"/>
- *         <element name="SichergKz" type="{urn:omds20}Entsch2_Type" minOccurs="0"/>
- *         <element name="PreisProQm" type="{urn:omds20}decimal"/>
- *         <element name="ZusaetzlicheGebaeudedaten" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}ZusaetzlicheGebaeudedaten_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RisikoGebaeude_Type", propOrder = {
-    "gebaeudeArtCd",
-    "gebaeudeBez",
-    "nutzungCd",
-    "bauartCd",
-    "dachungCd",
-    "gebaeudeHoeheCd",
-    "baujahrGebaeude",
-    "elFlaeche",
-    "vorschaeden",
-    "ausstattungCd",
-    "sichergKz",
-    "preisProQm",
-    "zusaetzlicheGebaeudedaten"
-})
-public class RisikoGebaeudeType
-    extends VersichertesInteresseMitAttributMetadatenType
-{
-
-    @XmlElement(name = "GebaeudeArtCd", required = true)
-    protected String gebaeudeArtCd;
-    @XmlElement(name = "GebaeudeBez", required = true)
-    protected String gebaeudeBez;
-    @XmlElement(name = "NutzungCd")
-    protected String nutzungCd;
-    @XmlElement(name = "BauartCd")
-    protected String bauartCd;
-    @XmlElement(name = "DachungCd")
-    protected String dachungCd;
-    @XmlElement(name = "GebaeudeHoeheCd")
-    protected String gebaeudeHoeheCd;
-    @XmlElement(name = "BaujahrGebaeude", required = true)
-    protected BigInteger baujahrGebaeude;
-    @XmlElement(name = "EL-Flaeche")
-    protected List elFlaeche;
-    @XmlElement(name = "Vorschaeden")
-    @XmlSchemaType(name = "string")
-    protected List vorschaeden;
-    @XmlElement(name = "AusstattungCd")
-    protected String ausstattungCd;
-    @XmlElement(name = "SichergKz")
-    @XmlSchemaType(name = "string")
-    protected Entsch2Type sichergKz;
-    @XmlElement(name = "PreisProQm", required = true)
-    protected BigDecimal preisProQm;
-    @XmlElement(name = "ZusaetzlicheGebaeudedaten")
-    protected List zusaetzlicheGebaeudedaten;
-
-    /**
-     * Ruft den Wert der gebaeudeArtCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGebaeudeArtCd() {
-        return gebaeudeArtCd;
-    }
-
-    /**
-     * Legt den Wert der gebaeudeArtCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGebaeudeArtCd(String value) {
-        this.gebaeudeArtCd = value;
-    }
-
-    /**
-     * Ruft den Wert der gebaeudeBez-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGebaeudeBez() {
-        return gebaeudeBez;
-    }
-
-    /**
-     * Legt den Wert der gebaeudeBez-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGebaeudeBez(String value) {
-        this.gebaeudeBez = value;
-    }
-
-    /**
-     * Ruft den Wert der nutzungCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNutzungCd() {
-        return nutzungCd;
-    }
-
-    /**
-     * Legt den Wert der nutzungCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNutzungCd(String value) {
-        this.nutzungCd = value;
-    }
-
-    /**
-     * Ruft den Wert der bauartCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBauartCd() {
-        return bauartCd;
-    }
-
-    /**
-     * Legt den Wert der bauartCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBauartCd(String value) {
-        this.bauartCd = value;
-    }
-
-    /**
-     * Ruft den Wert der dachungCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDachungCd() {
-        return dachungCd;
-    }
-
-    /**
-     * Legt den Wert der dachungCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDachungCd(String value) {
-        this.dachungCd = value;
-    }
-
-    /**
-     * Ruft den Wert der gebaeudeHoeheCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGebaeudeHoeheCd() {
-        return gebaeudeHoeheCd;
-    }
-
-    /**
-     * Legt den Wert der gebaeudeHoeheCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGebaeudeHoeheCd(String value) {
-        this.gebaeudeHoeheCd = value;
-    }
-
-    /**
-     * Ruft den Wert der baujahrGebaeude-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getBaujahrGebaeude() {
-        return baujahrGebaeude;
-    }
-
-    /**
-     * Legt den Wert der baujahrGebaeude-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setBaujahrGebaeude(BigInteger value) {
-        this.baujahrGebaeude = value;
-    }
-
-    /**
-     * Gets the value of the elFlaeche property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the elFlaeche property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getELFlaeche().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ELFlaecheType }
-     * 
-     * 
-     */
-    public List getELFlaeche() {
-        if (elFlaeche == null) {
-            elFlaeche = new ArrayList();
-        }
-        return this.elFlaeche;
-    }
-
-    /**
-     * Gets the value of the vorschaeden property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the vorschaeden property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVorschaeden().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link RisikoVorschaedenType }
-     * 
-     * 
-     */
-    public List getVorschaeden() {
-        if (vorschaeden == null) {
-            vorschaeden = new ArrayList();
-        }
-        return this.vorschaeden;
-    }
-
-    /**
-     * Ruft den Wert der ausstattungCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAusstattungCd() {
-        return ausstattungCd;
-    }
-
-    /**
-     * Legt den Wert der ausstattungCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAusstattungCd(String value) {
-        this.ausstattungCd = value;
-    }
-
-    /**
-     * Ruft den Wert der sichergKz-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Entsch2Type }
-     *     
-     */
-    public Entsch2Type getSichergKz() {
-        return sichergKz;
-    }
-
-    /**
-     * Legt den Wert der sichergKz-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Entsch2Type }
-     *     
-     */
-    public void setSichergKz(Entsch2Type value) {
-        this.sichergKz = value;
-    }
-
-    /**
-     * Ruft den Wert der preisProQm-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getPreisProQm() {
-        return preisProQm;
-    }
-
-    /**
-     * Legt den Wert der preisProQm-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setPreisProQm(BigDecimal value) {
-        this.preisProQm = value;
-    }
-
-    /**
-     * Gets the value of the zusaetzlicheGebaeudedaten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zusaetzlicheGebaeudedaten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZusaetzlicheGebaeudedaten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ZusaetzlicheGebaeudedatenType }
-     * 
-     * 
-     */
-    public List getZusaetzlicheGebaeudedaten() {
-        if (zusaetzlicheGebaeudedaten == null) {
-            zusaetzlicheGebaeudedaten = new ArrayList();
-        }
-        return this.zusaetzlicheGebaeudedaten;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/RisikoHaushaltType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/RisikoHaushaltType.java
deleted file mode 100644
index f89eeb53..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/RisikoHaushaltType.java
+++ /dev/null
@@ -1,152 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-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 at.vvo.omds.types.omds3Types.r1_7_0.common.VersichertesInteresseMitAttributMetadatenType;
-
-
-/**
- * Type zur Risikobeschreibung Haushalt
- * 
- * 
Java-Klasse für RisikoHaushalt_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="RisikoHaushalt_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}VersichertesInteresseMitAttributMetadaten_Type">
- *       <sequence>
- *         <element name="Wohnflaeche" type="{http://www.w3.org/2001/XMLSchema}unsignedShort"/>
- *         <element name="AusstattungCd" type="{urn:omds20}AusstattungCd_Type"/>
- *         <element name="NutzungCd" type="{urn:omds20}NutzungCd_Type" minOccurs="0"/>
- *         <element name="ZusaetzlicheHaushaltDaten" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}ZusaetzlicheHaushaltsdaten_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RisikoHaushalt_Type", propOrder = {
-    "wohnflaeche",
-    "ausstattungCd",
-    "nutzungCd",
-    "zusaetzlicheHaushaltDaten"
-})
-public class RisikoHaushaltType
-    extends VersichertesInteresseMitAttributMetadatenType
-{
-
-    @XmlElement(name = "Wohnflaeche")
-    @XmlSchemaType(name = "unsignedShort")
-    protected int wohnflaeche;
-    @XmlElement(name = "AusstattungCd", required = true)
-    protected String ausstattungCd;
-    @XmlElement(name = "NutzungCd")
-    protected String nutzungCd;
-    @XmlElement(name = "ZusaetzlicheHaushaltDaten")
-    protected List zusaetzlicheHaushaltDaten;
-
-    /**
-     * Ruft den Wert der wohnflaeche-Eigenschaft ab.
-     * 
-     */
-    public int getWohnflaeche() {
-        return wohnflaeche;
-    }
-
-    /**
-     * Legt den Wert der wohnflaeche-Eigenschaft fest.
-     * 
-     */
-    public void setWohnflaeche(int value) {
-        this.wohnflaeche = value;
-    }
-
-    /**
-     * Ruft den Wert der ausstattungCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAusstattungCd() {
-        return ausstattungCd;
-    }
-
-    /**
-     * Legt den Wert der ausstattungCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAusstattungCd(String value) {
-        this.ausstattungCd = value;
-    }
-
-    /**
-     * Ruft den Wert der nutzungCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNutzungCd() {
-        return nutzungCd;
-    }
-
-    /**
-     * Legt den Wert der nutzungCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNutzungCd(String value) {
-        this.nutzungCd = value;
-    }
-
-    /**
-     * Gets the value of the zusaetzlicheHaushaltDaten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zusaetzlicheHaushaltDaten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZusaetzlicheHaushaltDaten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ZusaetzlicheHaushaltsdatenType }
-     * 
-     * 
-     */
-    public List getZusaetzlicheHaushaltDaten() {
-        if (zusaetzlicheHaushaltDaten == null) {
-            zusaetzlicheHaushaltDaten = new ArrayList();
-        }
-        return this.zusaetzlicheHaushaltDaten;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/RisikoVorschaedenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/RisikoVorschaedenType.java
deleted file mode 100644
index 4956c6df..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/RisikoVorschaedenType.java
+++ /dev/null
@@ -1,54 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
Java-Klasse für RisikoVorschaeden_Type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 

- * 
- * <simpleType name="RisikoVorschaeden_Type">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="keine Vorschaeden"/>
- *     <enumeration value="ein Vorschaden"/>
- *     <enumeration value="mehr als ein Vorschaden"/>
- *   </restriction>
- * </simpleType>
- * 

- * 
- */
-@XmlType(name = "RisikoVorschaeden_Type")
-@XmlEnum
-public enum RisikoVorschaedenType {
-
-    @XmlEnumValue("keine Vorschaeden")
-    KEINE_VORSCHAEDEN("keine Vorschaeden"),
-    @XmlEnumValue("ein Vorschaden")
-    EIN_VORSCHADEN("ein Vorschaden"),
-    @XmlEnumValue("mehr als ein Vorschaden")
-    MEHR_ALS_EIN_VORSCHADEN("mehr als ein Vorschaden");
-    private final String value;
-
-    RisikoVorschaedenType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static RisikoVorschaedenType fromValue(String v) {
-        for (RisikoVorschaedenType c: RisikoVorschaedenType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/SubmitApplicationSachPrivatRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/SubmitApplicationSachPrivatRequestType.java
deleted file mode 100644
index 1840550a..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/SubmitApplicationSachPrivatRequestType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SubmitApplicationRequestGenType;
-
-
-/**
- * Type des Requests, um den Antrag einzureichen
- * 
- * 
Java-Klasse für SubmitApplicationSachPrivatRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SubmitApplicationSachPrivatRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SubmitApplicationRequestGen_Type">
- *       <sequence>
- *         <element name="Antragsanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}AntragSachPrivat_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SubmitApplicationSachPrivatRequest_Type", propOrder = {
-    "antragsanfrage"
-})
-public class SubmitApplicationSachPrivatRequestType
-    extends SubmitApplicationRequestGenType
-{
-
-    @XmlElement(name = "Antragsanfrage")
-    protected AntragSachPrivatType antragsanfrage;
-
-    /**
-     * Ruft den Wert der antragsanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AntragSachPrivatType }
-     *     
-     */
-    public AntragSachPrivatType getAntragsanfrage() {
-        return antragsanfrage;
-    }
-
-    /**
-     * Legt den Wert der antragsanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AntragSachPrivatType }
-     *     
-     */
-    public void setAntragsanfrage(AntragSachPrivatType value) {
-        this.antragsanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/SubmitApplicationSachPrivatResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/SubmitApplicationSachPrivatResponseType.java
deleted file mode 100644
index ceffc201..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/SubmitApplicationSachPrivatResponseType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SubmitApplicationResponseGenType;
-
-
-/**
- * Type des Response, um den Antrag einzureichen
- * 
- * 
Java-Klasse für SubmitApplicationSachPrivatResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SubmitApplicationSachPrivatResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SubmitApplicationResponseGen_Type">
- *       <sequence>
- *         <element name="Antragsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}AntragSachPrivat_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SubmitApplicationSachPrivatResponse_Type", propOrder = {
-    "antragsantwort"
-})
-public class SubmitApplicationSachPrivatResponseType
-    extends SubmitApplicationResponseGenType
-{
-
-    @XmlElement(name = "Antragsantwort", required = true)
-    protected AntragSachPrivatType antragsantwort;
-
-    /**
-     * Ruft den Wert der antragsantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AntragSachPrivatType }
-     *     
-     */
-    public AntragSachPrivatType getAntragsantwort() {
-        return antragsantwort;
-    }
-
-    /**
-     * Legt den Wert der antragsantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AntragSachPrivatType }
-     *     
-     */
-    public void setAntragsantwort(AntragSachPrivatType value) {
-        this.antragsantwort = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/UpsellingSachPrivatResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/UpsellingSachPrivatResponseType.java
deleted file mode 100644
index 21b37dc9..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/UpsellingSachPrivatResponseType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Response Upselling Sach-Privat
- * 
- * 
Java-Klasse für UpsellingSachPrivatResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="UpsellingSachPrivatResponse_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "UpsellingSachPrivatResponse_Type")
-public class UpsellingSachPrivatResponseType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/VerkaufsproduktSachPrivatType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/VerkaufsproduktSachPrivatType.java
deleted file mode 100644
index abd5aac0..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/VerkaufsproduktSachPrivatType.java
+++ /dev/null
@@ -1,172 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-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 at.vvo.omds.types.omds3Types.r1_7_0.common.ProduktGenerischType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VerkaufsproduktGenerischType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VersichertesInteresseType;
-
-
-/**
- * Typ für ein Besitz-Produktbündel, welches einem Vertrag entspricht
- * 
- * 
Java-Klasse für VerkaufsproduktSachPrivat_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VerkaufsproduktSachPrivat_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}VerkaufsproduktGenerisch_Type">
- *       <sequence>
- *         <element name="Produkte" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}ProduktSachPrivat_Type" maxOccurs="unbounded"/>
- *         <element name="Zusatzprodukte" type="{urn:omds3CommonServiceTypes-1-1-0}ProduktGenerisch_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="VersicherteObjekte" type="{urn:omds3CommonServiceTypes-1-1-0}VersichertesInteresse_Type" maxOccurs="unbounded"/>
- *         <element name="RefSicherstellungLfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VerkaufsproduktSachPrivat_Type", propOrder = {
-    "produkte",
-    "zusatzprodukte",
-    "versicherteObjekte",
-    "refSicherstellungLfnr"
-})
-public class VerkaufsproduktSachPrivatType
-    extends VerkaufsproduktGenerischType
-{
-
-    @XmlElement(name = "Produkte", required = true)
-    protected List produkte;
-    @XmlElement(name = "Zusatzprodukte")
-    protected List zusatzprodukte;
-    @XmlElement(name = "VersicherteObjekte", required = true)
-    protected List versicherteObjekte;
-    @XmlElement(name = "RefSicherstellungLfnr")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer refSicherstellungLfnr;
-
-    /**
-     * Gets the value of the produkte property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the produkte property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getProdukte().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ProduktSachPrivatType }
-     * 
-     * 
-     */
-    public List getProdukte() {
-        if (produkte == null) {
-            produkte = new ArrayList();
-        }
-        return this.produkte;
-    }
-
-    /**
-     * Gets the value of the zusatzprodukte property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zusatzprodukte property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZusatzprodukte().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ProduktGenerischType }
-     * 
-     * 
-     */
-    public List getZusatzprodukte() {
-        if (zusatzprodukte == null) {
-            zusatzprodukte = new ArrayList();
-        }
-        return this.zusatzprodukte;
-    }
-
-    /**
-     * Gets the value of the versicherteObjekte property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the versicherteObjekte property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVersicherteObjekte().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link VersichertesInteresseType }
-     * 
-     * 
-     */
-    public List getVersicherteObjekte() {
-        if (versicherteObjekte == null) {
-            versicherteObjekte = new ArrayList();
-        }
-        return this.versicherteObjekte;
-    }
-
-    /**
-     * Ruft den Wert der refSicherstellungLfnr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getRefSicherstellungLfnr() {
-        return refSicherstellungLfnr;
-    }
-
-    /**
-     * Legt den Wert der refSicherstellungLfnr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setRefSicherstellungLfnr(Integer value) {
-        this.refSicherstellungLfnr = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/VersichertesObjektSachPrivatType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/VersichertesObjektSachPrivatType.java
deleted file mode 100644
index e5f29f8c..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/VersichertesObjektSachPrivatType.java
+++ /dev/null
@@ -1,159 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VersichertesInteresseMitAttributMetadatenType;
-
-
-/**
- * Type für ein versichertes Objekt in der Sach-Privat-Versicherung
- * 
- * 
Java-Klasse für VersichertesObjektSachPrivat_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VersichertesObjektSachPrivat_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}VersichertesInteresseMitAttributMetadaten_Type">
- *       <sequence>
- *         <element name="ObjektId" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type" minOccurs="0"/>
- *         <element name="RisikoAdresse" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}RisikoAdresse_Type"/>
- *         <element name="RisikoGebaeude" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}RisikoGebaeude_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="RisikoHaushalt" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}RisikoHaushalt_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VersichertesObjektSachPrivat_Type", propOrder = {
-    "objektId",
-    "risikoAdresse",
-    "risikoGebaeude",
-    "risikoHaushalt"
-})
-public class VersichertesObjektSachPrivatType
-    extends VersichertesInteresseMitAttributMetadatenType
-{
-
-    @XmlElement(name = "ObjektId")
-    protected ObjektIdType objektId;
-    @XmlElement(name = "RisikoAdresse", required = true)
-    protected RisikoAdresseType risikoAdresse;
-    @XmlElement(name = "RisikoGebaeude")
-    protected List risikoGebaeude;
-    @XmlElement(name = "RisikoHaushalt")
-    protected RisikoHaushaltType risikoHaushalt;
-
-    /**
-     * Ruft den Wert der objektId-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getObjektId() {
-        return objektId;
-    }
-
-    /**
-     * Legt den Wert der objektId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setObjektId(ObjektIdType value) {
-        this.objektId = value;
-    }
-
-    /**
-     * Ruft den Wert der risikoAdresse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RisikoAdresseType }
-     *     
-     */
-    public RisikoAdresseType getRisikoAdresse() {
-        return risikoAdresse;
-    }
-
-    /**
-     * Legt den Wert der risikoAdresse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RisikoAdresseType }
-     *     
-     */
-    public void setRisikoAdresse(RisikoAdresseType value) {
-        this.risikoAdresse = value;
-    }
-
-    /**
-     * Gets the value of the risikoGebaeude property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the risikoGebaeude property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getRisikoGebaeude().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link RisikoGebaeudeType }
-     * 
-     * 
-     */
-    public List getRisikoGebaeude() {
-        if (risikoGebaeude == null) {
-            risikoGebaeude = new ArrayList();
-        }
-        return this.risikoGebaeude;
-    }
-
-    /**
-     * Ruft den Wert der risikoHaushalt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RisikoHaushaltType }
-     *     
-     */
-    public RisikoHaushaltType getRisikoHaushalt() {
-        return risikoHaushalt;
-    }
-
-    /**
-     * Legt den Wert der risikoHaushalt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RisikoHaushaltType }
-     *     
-     */
-    public void setRisikoHaushalt(RisikoHaushaltType value) {
-        this.risikoHaushalt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheGebaeudedatenPhotovoltaikType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheGebaeudedatenPhotovoltaikType.java
deleted file mode 100644
index 41fbbf15..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheGebaeudedatenPhotovoltaikType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Standardbaustein Photovoltaik als Erweiterung von ZusaetzlicheGebaeudeDaten_Type
- * 
- * 
Java-Klasse für ZusaetzlicheGebaeudedatenPhotovoltaik_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheGebaeudedatenPhotovoltaik_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}ZusaetzlicheGebaeudedaten_Type">
- *       <sequence>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheGebaeudedatenPhotovoltaik_Type")
-public class ZusaetzlicheGebaeudedatenPhotovoltaikType
-    extends ZusaetzlicheGebaeudedatenType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheGebaeudedatenSchwimmbadType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheGebaeudedatenSchwimmbadType.java
deleted file mode 100644
index 13b0f88f..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheGebaeudedatenSchwimmbadType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Standardbaustein Schwimmbad
- * 
- * 
Java-Klasse für ZusaetzlicheGebaeudedatenSchwimmbad_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheGebaeudedatenSchwimmbad_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}ZusaetzlicheGebaeudedaten_Type">
- *       <sequence>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheGebaeudedatenSchwimmbad_Type")
-public class ZusaetzlicheGebaeudedatenSchwimmbadType
-    extends ZusaetzlicheGebaeudedatenType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheGebaeudedatenSolarthermieType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheGebaeudedatenSolarthermieType.java
deleted file mode 100644
index c6e9da54..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheGebaeudedatenSolarthermieType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Strandardbaustein Solarthermie
- * 
- * 
Java-Klasse für ZusaetzlicheGebaeudedatenSolarthermie_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheGebaeudedatenSolarthermie_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}ZusaetzlicheGebaeudedaten_Type">
- *       <sequence>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheGebaeudedatenSolarthermie_Type")
-public class ZusaetzlicheGebaeudedatenSolarthermieType
-    extends ZusaetzlicheGebaeudedatenType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheGebaeudedatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheGebaeudedatenType.java
deleted file mode 100644
index 6bccc766..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheGebaeudedatenType.java
+++ /dev/null
@@ -1,39 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Basistyp zur Definition zusätzlicher Gebäudedaten
- * 
- * 
Java-Klasse für ZusaetzlicheGebaeudedaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheGebaeudedaten_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheGebaeudedaten_Type")
-@XmlSeeAlso({
-    ZusaetzlicheGebaeudedatenWintergartenType.class,
-    ZusaetzlicheGebaeudedatenSolarthermieType.class,
-    ZusaetzlicheGebaeudedatenSchwimmbadType.class,
-    ZusaetzlicheGebaeudedatenPhotovoltaikType.class
-})
-public abstract class ZusaetzlicheGebaeudedatenType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheGebaeudedatenWintergartenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheGebaeudedatenWintergartenType.java
deleted file mode 100644
index 8810428d..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheGebaeudedatenWintergartenType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Standardbaustein Wintergarten
- * 
- * 
Java-Klasse für ZusaetzlicheGebaeudedatenWintergarten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheGebaeudedatenWintergarten_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}ZusaetzlicheGebaeudedaten_Type">
- *       <sequence>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheGebaeudedatenWintergarten_Type")
-public class ZusaetzlicheGebaeudedatenWintergartenType
-    extends ZusaetzlicheGebaeudedatenType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheHaushaltsdatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheHaushaltsdatenType.java
deleted file mode 100644
index 7fd1dd17..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/ZusaetzlicheHaushaltsdatenType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Basistyp zur Definition zusätzlicher Haushaltsdaten
- * 
- * 
Java-Klasse für ZusaetzlicheHaushaltsdaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheHaushaltsdaten_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheHaushaltsdaten_Type")
-public abstract class ZusaetzlicheHaushaltsdatenType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/package-info.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/package-info.java
deleted file mode 100644
index 7e995139..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/sachPrivat/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat;
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/BasisSchadenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/BasisSchadenType.java
deleted file mode 100644
index 61408167..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/BasisSchadenType.java
+++ /dev/null
@@ -1,395 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ServiceFault;
-
-
-/**
- * Abstrakter Typ mit gemeinsamen Rumpfdaten fuer Schaden und Schaden-Light 
- * 
- * 
Java-Klasse für BasisSchaden_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="BasisSchaden_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}GeschaeftsfallSchadenanlage" minOccurs="0"/>
- *         <element name="Schadennr" type="{urn:omds20}Schadennr" minOccurs="0"/>
- *         <element name="BearbStandSeit" type="{urn:omds20}Datum" minOccurs="0"/>
- *         <element name="VormaligeSchadennr" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="NachfolgendeSchadennr" type="{urn:omds20}Schadennr" minOccurs="0"/>
- *         <element name="SachbearbVU" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}SachbearbVUType" minOccurs="0"/>
- *         <element name="Polizzennr" type="{urn:omds20}Polizzennr"/>
- *         <element name="VertragsID" type="{urn:omds20}VertragsID" minOccurs="0"/>
- *         <element name="ErledDat" type="{urn:omds20}Datum" minOccurs="0"/>
- *         <element name="DeepLink" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="ZusaetzlicheSchadensdaten" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}ZusaetzlicheSchadensdaten_Type" minOccurs="0"/>
- *         <element name="Meldungen" type="{urn:omds3CommonServiceTypes-1-1-0}ServiceFault" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BasisSchaden_Type", propOrder = {
-    "geschaeftsfallSchadenanlage",
-    "schadennr",
-    "bearbStandSeit",
-    "vormaligeSchadennr",
-    "nachfolgendeSchadennr",
-    "sachbearbVU",
-    "polizzennr",
-    "vertragsID",
-    "erledDat",
-    "deepLink",
-    "zusaetzlicheSchadensdaten",
-    "meldungen"
-})
-@XmlSeeAlso({
-    SchadenType.class,
-    SchadenLightType.class
-})
-public class BasisSchadenType {
-
-    @XmlElement(name = "GeschaeftsfallSchadenanlage")
-    protected ObjektIdType geschaeftsfallSchadenanlage;
-    @XmlElement(name = "Schadennr")
-    protected String schadennr;
-    @XmlElement(name = "BearbStandSeit")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar bearbStandSeit;
-    @XmlElement(name = "VormaligeSchadennr")
-    protected List vormaligeSchadennr;
-    @XmlElement(name = "NachfolgendeSchadennr")
-    protected String nachfolgendeSchadennr;
-    @XmlElement(name = "SachbearbVU")
-    protected SachbearbVUType sachbearbVU;
-    @XmlElement(name = "Polizzennr", required = true)
-    protected String polizzennr;
-    @XmlElement(name = "VertragsID")
-    protected String vertragsID;
-    @XmlElement(name = "ErledDat")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar erledDat;
-    @XmlElement(name = "DeepLink")
-    protected String deepLink;
-    @XmlElement(name = "ZusaetzlicheSchadensdaten")
-    protected ZusaetzlicheSchadensdatenType zusaetzlicheSchadensdaten;
-    @XmlElement(name = "Meldungen")
-    protected List meldungen;
-
-    /**
-     * Ruft den Wert der geschaeftsfallSchadenanlage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getGeschaeftsfallSchadenanlage() {
-        return geschaeftsfallSchadenanlage;
-    }
-
-    /**
-     * Legt den Wert der geschaeftsfallSchadenanlage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setGeschaeftsfallSchadenanlage(ObjektIdType value) {
-        this.geschaeftsfallSchadenanlage = value;
-    }
-
-    /**
-     * Ruft den Wert der schadennr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSchadennr() {
-        return schadennr;
-    }
-
-    /**
-     * Legt den Wert der schadennr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSchadennr(String value) {
-        this.schadennr = value;
-    }
-
-    /**
-     * Ruft den Wert der bearbStandSeit-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getBearbStandSeit() {
-        return bearbStandSeit;
-    }
-
-    /**
-     * Legt den Wert der bearbStandSeit-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setBearbStandSeit(XMLGregorianCalendar value) {
-        this.bearbStandSeit = value;
-    }
-
-    /**
-     * Gets the value of the vormaligeSchadennr property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the vormaligeSchadennr property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVormaligeSchadennr().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List getVormaligeSchadennr() {
-        if (vormaligeSchadennr == null) {
-            vormaligeSchadennr = new ArrayList();
-        }
-        return this.vormaligeSchadennr;
-    }
-
-    /**
-     * Ruft den Wert der nachfolgendeSchadennr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNachfolgendeSchadennr() {
-        return nachfolgendeSchadennr;
-    }
-
-    /**
-     * Legt den Wert der nachfolgendeSchadennr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNachfolgendeSchadennr(String value) {
-        this.nachfolgendeSchadennr = value;
-    }
-
-    /**
-     * Ruft den Wert der sachbearbVU-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SachbearbVUType }
-     *     
-     */
-    public SachbearbVUType getSachbearbVU() {
-        return sachbearbVU;
-    }
-
-    /**
-     * Legt den Wert der sachbearbVU-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SachbearbVUType }
-     *     
-     */
-    public void setSachbearbVU(SachbearbVUType value) {
-        this.sachbearbVU = value;
-    }
-
-    /**
-     * Ruft den Wert der polizzennr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolizzennr() {
-        return polizzennr;
-    }
-
-    /**
-     * Legt den Wert der polizzennr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolizzennr(String value) {
-        this.polizzennr = value;
-    }
-
-    /**
-     * Ruft den Wert der vertragsID-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVertragsID() {
-        return vertragsID;
-    }
-
-    /**
-     * Legt den Wert der vertragsID-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVertragsID(String value) {
-        this.vertragsID = value;
-    }
-
-    /**
-     * Ruft den Wert der erledDat-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getErledDat() {
-        return erledDat;
-    }
-
-    /**
-     * Legt den Wert der erledDat-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setErledDat(XMLGregorianCalendar value) {
-        this.erledDat = value;
-    }
-
-    /**
-     * Ruft den Wert der deepLink-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDeepLink() {
-        return deepLink;
-    }
-
-    /**
-     * Legt den Wert der deepLink-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDeepLink(String value) {
-        this.deepLink = value;
-    }
-
-    /**
-     * Ruft den Wert der zusaetzlicheSchadensdaten-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ZusaetzlicheSchadensdatenType }
-     *     
-     */
-    public ZusaetzlicheSchadensdatenType getZusaetzlicheSchadensdaten() {
-        return zusaetzlicheSchadensdaten;
-    }
-
-    /**
-     * Legt den Wert der zusaetzlicheSchadensdaten-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ZusaetzlicheSchadensdatenType }
-     *     
-     */
-    public void setZusaetzlicheSchadensdaten(ZusaetzlicheSchadensdatenType value) {
-        this.zusaetzlicheSchadensdaten = value;
-    }
-
-    /**
-     * Gets the value of the meldungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the meldungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getMeldungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ServiceFault }
-     * 
-     * 
-     */
-    public List getMeldungen() {
-        if (meldungen == null) {
-            meldungen = new ArrayList();
-        }
-        return this.meldungen;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/BasisSchadenereignisType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/BasisSchadenereignisType.java
deleted file mode 100644
index e0c7ac33..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/BasisSchadenereignisType.java
+++ /dev/null
@@ -1,339 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ServiceFault;
-
-
-/**
- * Abstrakter Typ mit gemeinsamen Rumpfdaten fuer Schadenereignis und Schadenereignis-Light
- * 
- * 
Java-Klasse für BasisSchadenereignis_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="BasisSchadenereignis_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="VUNr" type="{urn:omds20}VUNr"/>
- *         <element ref="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}GeschaeftsfallSchadenereignis" minOccurs="0"/>
- *         <element name="NachfolgendeSchadenmeldung" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type" minOccurs="0"/>
- *         <element name="VorherigeSchadenmeldungen" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Ereigniszpkt" type="{urn:omds20}Datum-Zeit"/>
- *         <element name="EreignisbeschrTxt" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Meldedat" type="{urn:omds20}Datum-Zeit"/>
- *         <element name="DeepLink" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="ZusaetzlicheSchadensereignisdaten" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}ZusaetzlicheSchadensereignisdaten_Type" minOccurs="0"/>
- *         <element name="Meldungen" type="{urn:omds3CommonServiceTypes-1-1-0}ServiceFault" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BasisSchadenereignis_Type", propOrder = {
-    "vuNr",
-    "geschaeftsfallSchadenereignis",
-    "nachfolgendeSchadenmeldung",
-    "vorherigeSchadenmeldungen",
-    "ereigniszpkt",
-    "ereignisbeschrTxt",
-    "meldedat",
-    "deepLink",
-    "zusaetzlicheSchadensereignisdaten",
-    "meldungen"
-})
-@XmlSeeAlso({
-    SchadenereignisType.class,
-    SchadenereignisLightType.class
-})
-public abstract class BasisSchadenereignisType {
-
-    @XmlElement(name = "VUNr", required = true)
-    protected String vuNr;
-    @XmlElement(name = "GeschaeftsfallSchadenereignis")
-    protected ObjektIdType geschaeftsfallSchadenereignis;
-    @XmlElement(name = "NachfolgendeSchadenmeldung")
-    protected ObjektIdType nachfolgendeSchadenmeldung;
-    @XmlElement(name = "VorherigeSchadenmeldungen")
-    protected List vorherigeSchadenmeldungen;
-    @XmlElement(name = "Ereigniszpkt", required = true)
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar ereigniszpkt;
-    @XmlElement(name = "EreignisbeschrTxt", required = true)
-    protected String ereignisbeschrTxt;
-    @XmlElement(name = "Meldedat", required = true)
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar meldedat;
-    @XmlElement(name = "DeepLink")
-    protected String deepLink;
-    @XmlElement(name = "ZusaetzlicheSchadensereignisdaten")
-    protected ZusaetzlicheSchadensereignisdatenType zusaetzlicheSchadensereignisdaten;
-    @XmlElement(name = "Meldungen")
-    protected List meldungen;
-
-    /**
-     * Ruft den Wert der vuNr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVUNr() {
-        return vuNr;
-    }
-
-    /**
-     * Legt den Wert der vuNr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVUNr(String value) {
-        this.vuNr = value;
-    }
-
-    /**
-     * Ruft den Wert der geschaeftsfallSchadenereignis-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getGeschaeftsfallSchadenereignis() {
-        return geschaeftsfallSchadenereignis;
-    }
-
-    /**
-     * Legt den Wert der geschaeftsfallSchadenereignis-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setGeschaeftsfallSchadenereignis(ObjektIdType value) {
-        this.geschaeftsfallSchadenereignis = value;
-    }
-
-    /**
-     * Ruft den Wert der nachfolgendeSchadenmeldung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getNachfolgendeSchadenmeldung() {
-        return nachfolgendeSchadenmeldung;
-    }
-
-    /**
-     * Legt den Wert der nachfolgendeSchadenmeldung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setNachfolgendeSchadenmeldung(ObjektIdType value) {
-        this.nachfolgendeSchadenmeldung = value;
-    }
-
-    /**
-     * Gets the value of the vorherigeSchadenmeldungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the vorherigeSchadenmeldungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVorherigeSchadenmeldungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ObjektIdType }
-     * 
-     * 
-     */
-    public List getVorherigeSchadenmeldungen() {
-        if (vorherigeSchadenmeldungen == null) {
-            vorherigeSchadenmeldungen = new ArrayList();
-        }
-        return this.vorherigeSchadenmeldungen;
-    }
-
-    /**
-     * Ruft den Wert der ereigniszpkt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getEreigniszpkt() {
-        return ereigniszpkt;
-    }
-
-    /**
-     * Legt den Wert der ereigniszpkt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setEreigniszpkt(XMLGregorianCalendar value) {
-        this.ereigniszpkt = value;
-    }
-
-    /**
-     * Ruft den Wert der ereignisbeschrTxt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getEreignisbeschrTxt() {
-        return ereignisbeschrTxt;
-    }
-
-    /**
-     * Legt den Wert der ereignisbeschrTxt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setEreignisbeschrTxt(String value) {
-        this.ereignisbeschrTxt = value;
-    }
-
-    /**
-     * Ruft den Wert der meldedat-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getMeldedat() {
-        return meldedat;
-    }
-
-    /**
-     * Legt den Wert der meldedat-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setMeldedat(XMLGregorianCalendar value) {
-        this.meldedat = value;
-    }
-
-    /**
-     * Ruft den Wert der deepLink-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDeepLink() {
-        return deepLink;
-    }
-
-    /**
-     * Legt den Wert der deepLink-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDeepLink(String value) {
-        this.deepLink = value;
-    }
-
-    /**
-     * Ruft den Wert der zusaetzlicheSchadensereignisdaten-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ZusaetzlicheSchadensereignisdatenType }
-     *     
-     */
-    public ZusaetzlicheSchadensereignisdatenType getZusaetzlicheSchadensereignisdaten() {
-        return zusaetzlicheSchadensereignisdaten;
-    }
-
-    /**
-     * Legt den Wert der zusaetzlicheSchadensereignisdaten-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ZusaetzlicheSchadensereignisdatenType }
-     *     
-     */
-    public void setZusaetzlicheSchadensereignisdaten(ZusaetzlicheSchadensereignisdatenType value) {
-        this.zusaetzlicheSchadensereignisdaten = value;
-    }
-
-    /**
-     * Gets the value of the meldungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the meldungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getMeldungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ServiceFault }
-     * 
-     * 
-     */
-    public List getMeldungen() {
-        if (meldungen == null) {
-            meldungen = new ArrayList();
-        }
-        return this.meldungen;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/BelegeinreichungRequest.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/BelegeinreichungRequest.java
deleted file mode 100644
index 4e823483..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/BelegeinreichungRequest.java
+++ /dev/null
@@ -1,189 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ProzessDokumentType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ZahlwegType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element name="Polizzennr" type="{urn:omds20}Polizzennr"/>
- *         <element name="Betrag" type="{urn:omds20}decimal"/>
- *         <element name="Grund" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Zahlweg" type="{urn:omds3CommonServiceTypes-1-1-0}Zahlweg_Type"/>
- *         <element name="Beleg" type="{urn:omds3CommonServiceTypes-1-1-0}ProzessDokument_Type" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "polizzennr",
-    "betrag",
-    "grund",
-    "zahlweg",
-    "beleg"
-})
-@XmlRootElement(name = "BelegeinreichungRequest")
-public class BelegeinreichungRequest
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "Polizzennr", required = true)
-    protected String polizzennr;
-    @XmlElement(name = "Betrag", required = true)
-    protected BigDecimal betrag;
-    @XmlElement(name = "Grund")
-    protected String grund;
-    @XmlElement(name = "Zahlweg", required = true)
-    protected ZahlwegType zahlweg;
-    @XmlElement(name = "Beleg", required = true)
-    protected List beleg;
-
-    /**
-     * Ruft den Wert der polizzennr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolizzennr() {
-        return polizzennr;
-    }
-
-    /**
-     * Legt den Wert der polizzennr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolizzennr(String value) {
-        this.polizzennr = value;
-    }
-
-    /**
-     * Ruft den Wert der betrag-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getBetrag() {
-        return betrag;
-    }
-
-    /**
-     * Legt den Wert der betrag-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setBetrag(BigDecimal value) {
-        this.betrag = value;
-    }
-
-    /**
-     * Ruft den Wert der grund-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGrund() {
-        return grund;
-    }
-
-    /**
-     * Legt den Wert der grund-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGrund(String value) {
-        this.grund = value;
-    }
-
-    /**
-     * Ruft den Wert der zahlweg-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ZahlwegType }
-     *     
-     */
-    public ZahlwegType getZahlweg() {
-        return zahlweg;
-    }
-
-    /**
-     * Legt den Wert der zahlweg-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ZahlwegType }
-     *     
-     */
-    public void setZahlweg(ZahlwegType value) {
-        this.zahlweg = value;
-    }
-
-    /**
-     * Gets the value of the beleg property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the beleg property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getBeleg().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ProzessDokumentType }
-     * 
-     * 
-     */
-    public List getBeleg() {
-        if (beleg == null) {
-            beleg = new ArrayList();
-        }
-        return this.beleg;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/BelegeinreichungResponse.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/BelegeinreichungResponse.java
deleted file mode 100644
index 39d7a4a0..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/BelegeinreichungResponse.java
+++ /dev/null
@@ -1,35 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "")
-@XmlRootElement(name = "BelegeinreichungResponse")
-public class BelegeinreichungResponse
-    extends CommonResponseType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/BeteiligtePersonType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/BeteiligtePersonType.java
deleted file mode 100644
index 241c6667..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/BeteiligtePersonType.java
+++ /dev/null
@@ -1,87 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.PersonType;
-
-
-/**
- * Typ für die Meldung von Personen, die an einem Schaden beteiligt sind
- * 
- * 
Java-Klasse für BeteiligtePerson_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="BeteiligtePerson_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}Person"/>
- *       </sequence>
- *       <attribute name="Lfnr" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BeteiligtePerson_Type", propOrder = {
-    "person"
-})
-public class BeteiligtePersonType {
-
-    @XmlElement(name = "Person", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-    protected PersonType person;
-    @XmlAttribute(name = "Lfnr", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", required = true)
-    @XmlSchemaType(name = "unsignedShort")
-    protected int lfnr;
-
-    /**
-     * Objekt ähnlich zu omds:PERSON, aber Personennr ist nicht Pflichtfeld
-     * 
-     * @return
-     *     possible object is
-     *     {@link PersonType }
-     *     
-     */
-    public PersonType getPerson() {
-        return person;
-    }
-
-    /**
-     * Legt den Wert der person-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PersonType }
-     *     
-     */
-    public void setPerson(PersonType value) {
-        this.person = value;
-    }
-
-    /**
-     * Ruft den Wert der lfnr-Eigenschaft ab.
-     * 
-     */
-    public int getLfnr() {
-        return lfnr;
-    }
-
-    /**
-     * Legt den Wert der lfnr-Eigenschaft fest.
-     * 
-     */
-    public void setLfnr(int value) {
-        this.lfnr = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/CheckClaimRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/CheckClaimRequestType.java
deleted file mode 100644
index 0eed7586..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/CheckClaimRequestType.java
+++ /dev/null
@@ -1,103 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.UploadDokumentType;
-
-
-/**
- * Typ für die probeweise Anlage einer Schadenmeldung
- * 
- * 
Java-Klasse für CheckClaimRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CheckClaimRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element name="Schadenereignis" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}Schadenereignis_Type"/>
- *         <element name="Dokumente" type="{urn:omds3CommonServiceTypes-1-1-0}Upload_Dokument_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CheckClaimRequest_Type", propOrder = {
-    "schadenereignis",
-    "dokumente"
-})
-public class CheckClaimRequestType
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "Schadenereignis", required = true)
-    protected SchadenereignisType schadenereignis;
-    @XmlElement(name = "Dokumente")
-    protected List dokumente;
-
-    /**
-     * Ruft den Wert der schadenereignis-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SchadenereignisType }
-     *     
-     */
-    public SchadenereignisType getSchadenereignis() {
-        return schadenereignis;
-    }
-
-    /**
-     * Legt den Wert der schadenereignis-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SchadenereignisType }
-     *     
-     */
-    public void setSchadenereignis(SchadenereignisType value) {
-        this.schadenereignis = value;
-    }
-
-    /**
-     * Gets the value of the dokumente property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the dokumente property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDokumente().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link UploadDokumentType }
-     * 
-     * 
-     */
-    public List getDokumente() {
-        if (dokumente == null) {
-            dokumente = new ArrayList();
-        }
-        return this.dokumente;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/CheckClaimResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/CheckClaimResponseType.java
deleted file mode 100644
index 733b6131..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/CheckClaimResponseType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-
-
-/**
- * Anworttyp beim Erzeugen einer Schadenmeldung
- * 
- * 
Java-Klasse für CheckClaimResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CheckClaimResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence>
- *         <element name="Schadenereignis" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}Schadenereignis_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CheckClaimResponse_Type", propOrder = {
-    "schadenereignis"
-})
-public class CheckClaimResponseType
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "Schadenereignis")
-    protected SchadenereignisType schadenereignis;
-
-    /**
-     * Ruft den Wert der schadenereignis-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SchadenereignisType }
-     *     
-     */
-    public SchadenereignisType getSchadenereignis() {
-        return schadenereignis;
-    }
-
-    /**
-     * Legt den Wert der schadenereignis-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SchadenereignisType }
-     *     
-     */
-    public void setSchadenereignis(SchadenereignisType value) {
-        this.schadenereignis = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/CheckCoverageRequest.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/CheckCoverageRequest.java
deleted file mode 100644
index e0a5515d..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/CheckCoverageRequest.java
+++ /dev/null
@@ -1,226 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.PersonType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VersichertesInteresseType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element name="Versicherungsnehmer" type="{urn:omds3CommonServiceTypes-1-1-0}Person_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Polizzennr" type="{urn:omds20}Polizzennr" minOccurs="0"/>
- *         <element name="VertragsID" type="{urn:omds20}VertragsID" minOccurs="0"/>
- *         <element name="VersInteresse" type="{urn:omds3CommonServiceTypes-1-1-0}VersichertesInteresse_Type" minOccurs="0"/>
- *         <element name="EigenschaftCd" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="ZusaetzlicheDeckungsauskunftsdaten" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}ZusaetzlicheDeckungsauskunftsdaten_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "versicherungsnehmer",
-    "polizzennr",
-    "vertragsID",
-    "versInteresse",
-    "eigenschaftCd",
-    "zusaetzlicheDeckungsauskunftsdaten"
-})
-@XmlRootElement(name = "CheckCoverageRequest")
-public class CheckCoverageRequest
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "Versicherungsnehmer")
-    protected List versicherungsnehmer;
-    @XmlElement(name = "Polizzennr")
-    protected String polizzennr;
-    @XmlElement(name = "VertragsID")
-    protected String vertragsID;
-    @XmlElement(name = "VersInteresse")
-    protected VersichertesInteresseType versInteresse;
-    @XmlElement(name = "EigenschaftCd")
-    protected List eigenschaftCd;
-    @XmlElement(name = "ZusaetzlicheDeckungsauskunftsdaten")
-    protected List zusaetzlicheDeckungsauskunftsdaten;
-
-    /**
-     * Gets the value of the versicherungsnehmer property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the versicherungsnehmer property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVersicherungsnehmer().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link PersonType }
-     * 
-     * 
-     */
-    public List getVersicherungsnehmer() {
-        if (versicherungsnehmer == null) {
-            versicherungsnehmer = new ArrayList();
-        }
-        return this.versicherungsnehmer;
-    }
-
-    /**
-     * Ruft den Wert der polizzennr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolizzennr() {
-        return polizzennr;
-    }
-
-    /**
-     * Legt den Wert der polizzennr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolizzennr(String value) {
-        this.polizzennr = value;
-    }
-
-    /**
-     * Ruft den Wert der vertragsID-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVertragsID() {
-        return vertragsID;
-    }
-
-    /**
-     * Legt den Wert der vertragsID-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVertragsID(String value) {
-        this.vertragsID = value;
-    }
-
-    /**
-     * Ruft den Wert der versInteresse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VersichertesInteresseType }
-     *     
-     */
-    public VersichertesInteresseType getVersInteresse() {
-        return versInteresse;
-    }
-
-    /**
-     * Legt den Wert der versInteresse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VersichertesInteresseType }
-     *     
-     */
-    public void setVersInteresse(VersichertesInteresseType value) {
-        this.versInteresse = value;
-    }
-
-    /**
-     * Gets the value of the eigenschaftCd property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the eigenschaftCd property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getEigenschaftCd().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List getEigenschaftCd() {
-        if (eigenschaftCd == null) {
-            eigenschaftCd = new ArrayList();
-        }
-        return this.eigenschaftCd;
-    }
-
-    /**
-     * Gets the value of the zusaetzlicheDeckungsauskunftsdaten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zusaetzlicheDeckungsauskunftsdaten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZusaetzlicheDeckungsauskunftsdaten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ZusaetzlicheDeckungsauskunftsdatenType }
-     * 
-     * 
-     */
-    public List getZusaetzlicheDeckungsauskunftsdaten() {
-        if (zusaetzlicheDeckungsauskunftsdaten == null) {
-            zusaetzlicheDeckungsauskunftsdaten = new ArrayList();
-        }
-        return this.zusaetzlicheDeckungsauskunftsdaten;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/CheckCoverageResponse.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/CheckCoverageResponse.java
deleted file mode 100644
index 6c480085..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/CheckCoverageResponse.java
+++ /dev/null
@@ -1,320 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.PersonType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VersichertesInteresseType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence>
- *         <element name="Versicherungsnehmer" type="{urn:omds3CommonServiceTypes-1-1-0}Person_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Polizzennr" type="{urn:omds20}Polizzennr" minOccurs="0"/>
- *         <element name="VertragsID" type="{urn:omds20}VertragsID" minOccurs="0"/>
- *         <element name="VersInteresse" type="{urn:omds3CommonServiceTypes-1-1-0}VersichertesInteresse_Type" minOccurs="0"/>
- *         <element name="ZusaetzlicheDeckungsauskunftsdaten" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}ZusaetzlicheDeckungsauskunftsdaten_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Auskuenfte" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="EigenschaftCd" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *                   <element name="Antwort" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "versicherungsnehmer",
-    "polizzennr",
-    "vertragsID",
-    "versInteresse",
-    "zusaetzlicheDeckungsauskunftsdaten",
-    "auskuenfte"
-})
-@XmlRootElement(name = "CheckCoverageResponse")
-public class CheckCoverageResponse
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "Versicherungsnehmer")
-    protected List versicherungsnehmer;
-    @XmlElement(name = "Polizzennr")
-    protected String polizzennr;
-    @XmlElement(name = "VertragsID")
-    protected String vertragsID;
-    @XmlElement(name = "VersInteresse")
-    protected VersichertesInteresseType versInteresse;
-    @XmlElement(name = "ZusaetzlicheDeckungsauskunftsdaten")
-    protected List zusaetzlicheDeckungsauskunftsdaten;
-    @XmlElement(name = "Auskuenfte")
-    protected List auskuenfte;
-
-    /**
-     * Gets the value of the versicherungsnehmer property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the versicherungsnehmer property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVersicherungsnehmer().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link PersonType }
-     * 
-     * 
-     */
-    public List getVersicherungsnehmer() {
-        if (versicherungsnehmer == null) {
-            versicherungsnehmer = new ArrayList();
-        }
-        return this.versicherungsnehmer;
-    }
-
-    /**
-     * Ruft den Wert der polizzennr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolizzennr() {
-        return polizzennr;
-    }
-
-    /**
-     * Legt den Wert der polizzennr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolizzennr(String value) {
-        this.polizzennr = value;
-    }
-
-    /**
-     * Ruft den Wert der vertragsID-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVertragsID() {
-        return vertragsID;
-    }
-
-    /**
-     * Legt den Wert der vertragsID-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVertragsID(String value) {
-        this.vertragsID = value;
-    }
-
-    /**
-     * Ruft den Wert der versInteresse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VersichertesInteresseType }
-     *     
-     */
-    public VersichertesInteresseType getVersInteresse() {
-        return versInteresse;
-    }
-
-    /**
-     * Legt den Wert der versInteresse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VersichertesInteresseType }
-     *     
-     */
-    public void setVersInteresse(VersichertesInteresseType value) {
-        this.versInteresse = value;
-    }
-
-    /**
-     * Gets the value of the zusaetzlicheDeckungsauskunftsdaten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zusaetzlicheDeckungsauskunftsdaten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZusaetzlicheDeckungsauskunftsdaten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ZusaetzlicheDeckungsauskunftsdatenType }
-     * 
-     * 
-     */
-    public List getZusaetzlicheDeckungsauskunftsdaten() {
-        if (zusaetzlicheDeckungsauskunftsdaten == null) {
-            zusaetzlicheDeckungsauskunftsdaten = new ArrayList();
-        }
-        return this.zusaetzlicheDeckungsauskunftsdaten;
-    }
-
-    /**
-     * Gets the value of the auskuenfte property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the auskuenfte property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getAuskuenfte().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link CheckCoverageResponse.Auskuenfte }
-     * 
-     * 
-     */
-    public List getAuskuenfte() {
-        if (auskuenfte == null) {
-            auskuenfte = new ArrayList();
-        }
-        return this.auskuenfte;
-    }
-
-
-    /**
-     * 
Java-Klasse für anonymous complex type.
-     * 
-     * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="EigenschaftCd" type="{http://www.w3.org/2001/XMLSchema}string"/>
-     *         <element name="Antwort" type="{http://www.w3.org/2001/XMLSchema}string"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "eigenschaftCd",
-        "antwort"
-    })
-    public static class Auskuenfte {
-
-        @XmlElement(name = "EigenschaftCd", required = true)
-        protected String eigenschaftCd;
-        @XmlElement(name = "Antwort", required = true)
-        protected String antwort;
-
-        /**
-         * Ruft den Wert der eigenschaftCd-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getEigenschaftCd() {
-            return eigenschaftCd;
-        }
-
-        /**
-         * Legt den Wert der eigenschaftCd-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setEigenschaftCd(String value) {
-            this.eigenschaftCd = value;
-        }
-
-        /**
-         * Ruft den Wert der antwort-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getAntwort() {
-            return antwort;
-        }
-
-        /**
-         * Legt den Wert der antwort-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setAntwort(String value) {
-            this.antwort = value;
-        }
-
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/DeckungsauskunftRequest.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/DeckungsauskunftRequest.java
deleted file mode 100644
index ce6e50ac..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/DeckungsauskunftRequest.java
+++ /dev/null
@@ -1,165 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.PersonType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VersichertesInteresseType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element name="Versicherungsnehmer" type="{urn:omds3CommonServiceTypes-1-1-0}Person_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Polizzennr" type="{urn:omds20}Polizzennr" minOccurs="0"/>
- *         <element name="VersInteresse" type="{urn:omds3CommonServiceTypes-1-1-0}VersichertesInteresse_Type" minOccurs="0"/>
- *         <element name="EigenschaftCd" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "versicherungsnehmer",
-    "polizzennr",
-    "versInteresse",
-    "eigenschaftCd"
-})
-@XmlRootElement(name = "DeckungsauskunftRequest")
-public class DeckungsauskunftRequest
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "Versicherungsnehmer")
-    protected List versicherungsnehmer;
-    @XmlElement(name = "Polizzennr")
-    protected String polizzennr;
-    @XmlElement(name = "VersInteresse")
-    protected VersichertesInteresseType versInteresse;
-    @XmlElement(name = "EigenschaftCd")
-    protected List eigenschaftCd;
-
-    /**
-     * Gets the value of the versicherungsnehmer property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the versicherungsnehmer property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVersicherungsnehmer().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link PersonType }
-     * 
-     * 
-     */
-    public List getVersicherungsnehmer() {
-        if (versicherungsnehmer == null) {
-            versicherungsnehmer = new ArrayList();
-        }
-        return this.versicherungsnehmer;
-    }
-
-    /**
-     * Ruft den Wert der polizzennr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolizzennr() {
-        return polizzennr;
-    }
-
-    /**
-     * Legt den Wert der polizzennr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolizzennr(String value) {
-        this.polizzennr = value;
-    }
-
-    /**
-     * Ruft den Wert der versInteresse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VersichertesInteresseType }
-     *     
-     */
-    public VersichertesInteresseType getVersInteresse() {
-        return versInteresse;
-    }
-
-    /**
-     * Legt den Wert der versInteresse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VersichertesInteresseType }
-     *     
-     */
-    public void setVersInteresse(VersichertesInteresseType value) {
-        this.versInteresse = value;
-    }
-
-    /**
-     * Gets the value of the eigenschaftCd property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the eigenschaftCd property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getEigenschaftCd().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List getEigenschaftCd() {
-        if (eigenschaftCd == null) {
-            eigenschaftCd = new ArrayList();
-        }
-        return this.eigenschaftCd;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/DeckungsauskunftResponse.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/DeckungsauskunftResponse.java
deleted file mode 100644
index 50e8b668..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/DeckungsauskunftResponse.java
+++ /dev/null
@@ -1,259 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.PersonType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VersichertesInteresseType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence>
- *         <element name="Versicherungsnehmer" type="{urn:omds3CommonServiceTypes-1-1-0}Person_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Polizzennr" type="{urn:omds20}Polizzennr" minOccurs="0"/>
- *         <element name="VersInteresse" type="{urn:omds3CommonServiceTypes-1-1-0}VersichertesInteresse_Type" minOccurs="0"/>
- *         <element name="Auskuenfte" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="EigenschaftCd" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *                   <element name="Antwort" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "versicherungsnehmer",
-    "polizzennr",
-    "versInteresse",
-    "auskuenfte"
-})
-@XmlRootElement(name = "DeckungsauskunftResponse")
-public class DeckungsauskunftResponse
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "Versicherungsnehmer")
-    protected List versicherungsnehmer;
-    @XmlElement(name = "Polizzennr")
-    protected String polizzennr;
-    @XmlElement(name = "VersInteresse")
-    protected VersichertesInteresseType versInteresse;
-    @XmlElement(name = "Auskuenfte")
-    protected List auskuenfte;
-
-    /**
-     * Gets the value of the versicherungsnehmer property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the versicherungsnehmer property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVersicherungsnehmer().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link PersonType }
-     * 
-     * 
-     */
-    public List getVersicherungsnehmer() {
-        if (versicherungsnehmer == null) {
-            versicherungsnehmer = new ArrayList();
-        }
-        return this.versicherungsnehmer;
-    }
-
-    /**
-     * Ruft den Wert der polizzennr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolizzennr() {
-        return polizzennr;
-    }
-
-    /**
-     * Legt den Wert der polizzennr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolizzennr(String value) {
-        this.polizzennr = value;
-    }
-
-    /**
-     * Ruft den Wert der versInteresse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VersichertesInteresseType }
-     *     
-     */
-    public VersichertesInteresseType getVersInteresse() {
-        return versInteresse;
-    }
-
-    /**
-     * Legt den Wert der versInteresse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VersichertesInteresseType }
-     *     
-     */
-    public void setVersInteresse(VersichertesInteresseType value) {
-        this.versInteresse = value;
-    }
-
-    /**
-     * Gets the value of the auskuenfte property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the auskuenfte property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getAuskuenfte().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link DeckungsauskunftResponse.Auskuenfte }
-     * 
-     * 
-     */
-    public List getAuskuenfte() {
-        if (auskuenfte == null) {
-            auskuenfte = new ArrayList();
-        }
-        return this.auskuenfte;
-    }
-
-
-    /**
-     * 
Java-Klasse für anonymous complex type.
-     * 
-     * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="EigenschaftCd" type="{http://www.w3.org/2001/XMLSchema}string"/>
-     *         <element name="Antwort" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "eigenschaftCd",
-        "antwort"
-    })
-    public static class Auskuenfte {
-
-        @XmlElement(name = "EigenschaftCd", required = true)
-        protected String eigenschaftCd;
-        @XmlElement(name = "Antwort", required = true)
-        protected Object antwort;
-
-        /**
-         * Ruft den Wert der eigenschaftCd-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getEigenschaftCd() {
-            return eigenschaftCd;
-        }
-
-        /**
-         * Legt den Wert der eigenschaftCd-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setEigenschaftCd(String value) {
-            this.eigenschaftCd = value;
-        }
-
-        /**
-         * Ruft den Wert der antwort-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Object }
-         *     
-         */
-        public Object getAntwort() {
-            return antwort;
-        }
-
-        /**
-         * Legt den Wert der antwort-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Object }
-         *     
-         */
-        public void setAntwort(Object value) {
-            this.antwort = value;
-        }
-
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GeokoordinatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GeokoordinatenType.java
deleted file mode 100644
index 3dd712ce..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GeokoordinatenType.java
+++ /dev/null
@@ -1,87 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Geokoordinaten im Dezimalsystem
- * 
- * 
Java-Klasse für Geokoordinaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Geokoordinaten_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="Breite" type="{http://www.w3.org/2001/XMLSchema}double" />
- *       <attribute name="Laenge" type="{http://www.w3.org/2001/XMLSchema}double" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Geokoordinaten_Type")
-public class GeokoordinatenType {
-
-    @XmlAttribute(name = "Breite", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden")
-    protected Double breite;
-    @XmlAttribute(name = "Laenge", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden")
-    protected Double laenge;
-
-    /**
-     * Ruft den Wert der breite-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Double }
-     *     
-     */
-    public Double getBreite() {
-        return breite;
-    }
-
-    /**
-     * Legt den Wert der breite-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Double }
-     *     
-     */
-    public void setBreite(Double value) {
-        this.breite = value;
-    }
-
-    /**
-     * Ruft den Wert der laenge-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Double }
-     *     
-     */
-    public Double getLaenge() {
-        return laenge;
-    }
-
-    /**
-     * Legt den Wert der laenge-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Double }
-     *     
-     */
-    public void setLaenge(Double value) {
-        this.laenge = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GeschaedigtesInteresseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GeschaedigtesInteresseType.java
deleted file mode 100644
index eda04f0c..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GeschaedigtesInteresseType.java
+++ /dev/null
@@ -1,97 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Das geschädigte Interesse ist der Basistyp für den es Erweiterungen geben kann, z.B. das geschädigte Kfz
- * 
- * 
Java-Klasse für GeschaedigtesInteresse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GeschaedigtesInteresse_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Lfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort"/>
- *         <element name="SchadenBeschreibung">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <maxLength value="100"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GeschaedigtesInteresse_Type", propOrder = {
-    "lfnr",
-    "schadenBeschreibung"
-})
-@XmlSeeAlso({
-    GeschaedigtesObjektKfzType.class,
-    GeschaedigtesObjektImmobilieType.class
-})
-public class GeschaedigtesInteresseType {
-
-    @XmlElement(name = "Lfnr")
-    @XmlSchemaType(name = "unsignedShort")
-    protected int lfnr;
-    @XmlElement(name = "SchadenBeschreibung", required = true)
-    protected String schadenBeschreibung;
-
-    /**
-     * Ruft den Wert der lfnr-Eigenschaft ab.
-     * 
-     */
-    public int getLfnr() {
-        return lfnr;
-    }
-
-    /**
-     * Legt den Wert der lfnr-Eigenschaft fest.
-     * 
-     */
-    public void setLfnr(int value) {
-        this.lfnr = value;
-    }
-
-    /**
-     * Ruft den Wert der schadenBeschreibung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSchadenBeschreibung() {
-        return schadenBeschreibung;
-    }
-
-    /**
-     * Legt den Wert der schadenBeschreibung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSchadenBeschreibung(String value) {
-        this.schadenBeschreibung = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GeschaedigtesObjektImmobilieType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GeschaedigtesObjektImmobilieType.java
deleted file mode 100644
index 453332a1..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GeschaedigtesObjektImmobilieType.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Erweiterung des geschädigten Interesses zu einer geschädigten Immobilie
- * 
- * 
Java-Klasse für GeschaedigtesObjektImmobilie_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GeschaedigtesObjektImmobilie_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}GeschaedigtesInteresse_Type">
- *       <sequence>
- *         <element name="GebaeudeArtCd" type="{urn:omds20}GebaeudeArtCd_Type" minOccurs="0"/>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}OrdnungsbegriffZuordFremd" minOccurs="0"/>
- *         <element name="GebauedeBez" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <maxLength value="60"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GeschaedigtesObjektImmobilie_Type", propOrder = {
-    "gebaeudeArtCd",
-    "ordnungsbegriffZuordFremd",
-    "gebauedeBez"
-})
-public class GeschaedigtesObjektImmobilieType
-    extends GeschaedigtesInteresseType
-{
-
-    @XmlElement(name = "GebaeudeArtCd")
-    protected String gebaeudeArtCd;
-    @XmlElement(name = "OrdnungsbegriffZuordFremd", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected String ordnungsbegriffZuordFremd;
-    @XmlElement(name = "GebauedeBez")
-    protected String gebauedeBez;
-
-    /**
-     * Ruft den Wert der gebaeudeArtCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGebaeudeArtCd() {
-        return gebaeudeArtCd;
-    }
-
-    /**
-     * Legt den Wert der gebaeudeArtCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGebaeudeArtCd(String value) {
-        this.gebaeudeArtCd = value;
-    }
-
-    /**
-     * Ruft den Wert der ordnungsbegriffZuordFremd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrdnungsbegriffZuordFremd() {
-        return ordnungsbegriffZuordFremd;
-    }
-
-    /**
-     * Legt den Wert der ordnungsbegriffZuordFremd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrdnungsbegriffZuordFremd(String value) {
-        this.ordnungsbegriffZuordFremd = value;
-    }
-
-    /**
-     * Ruft den Wert der gebauedeBez-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGebauedeBez() {
-        return gebauedeBez;
-    }
-
-    /**
-     * Legt den Wert der gebauedeBez-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGebauedeBez(String value) {
-        this.gebauedeBez = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GeschaedigtesObjektKfzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GeschaedigtesObjektKfzType.java
deleted file mode 100644
index 404e08af..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GeschaedigtesObjektKfzType.java
+++ /dev/null
@@ -1,351 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Erweiterung des geschädigten Interesses zu einem geschädigten Kfz
- * 
- * 
Java-Klasse für GeschaedigtesObjektKfz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GeschaedigtesObjektKfz_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}GeschaedigtesInteresse_Type">
- *       <sequence>
- *         <element name="VUNrGesch" type="{urn:omds20}VUNr" minOccurs="0"/>
- *         <element name="VUNameGesch" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="PolNrGesch" type="{urn:omds20}Polizzennr"/>
- *         <element name="SchadennrGesch" type="{urn:omds20}Schadennr" minOccurs="0"/>
- *         <element name="LandesCd_GeschKfz" type="{urn:omds20}LandesCd_Type" minOccurs="0"/>
- *         <element name="Kennz_GeschKfz">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <minLength value="1"/>
- *               <maxLength value="12"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="Marke" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <maxLength value="40"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="Handelsbez" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <minLength value="1"/>
- *               <maxLength value="30"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="Fahrgestnr" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <maxLength value="20"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="TypVarVer" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <minLength value="1"/>
- *               <maxLength value="20"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GeschaedigtesObjektKfz_Type", propOrder = {
-    "vuNrGesch",
-    "vuNameGesch",
-    "polNrGesch",
-    "schadennrGesch",
-    "landesCdGeschKfz",
-    "kennzGeschKfz",
-    "marke",
-    "handelsbez",
-    "fahrgestnr",
-    "typVarVer"
-})
-public class GeschaedigtesObjektKfzType
-    extends GeschaedigtesInteresseType
-{
-
-    @XmlElement(name = "VUNrGesch")
-    protected String vuNrGesch;
-    @XmlElement(name = "VUNameGesch", required = true)
-    protected String vuNameGesch;
-    @XmlElement(name = "PolNrGesch", required = true)
-    protected String polNrGesch;
-    @XmlElement(name = "SchadennrGesch")
-    protected String schadennrGesch;
-    @XmlElement(name = "LandesCd_GeschKfz")
-    protected String landesCdGeschKfz;
-    @XmlElement(name = "Kennz_GeschKfz", required = true)
-    protected String kennzGeschKfz;
-    @XmlElement(name = "Marke")
-    protected String marke;
-    @XmlElement(name = "Handelsbez")
-    protected String handelsbez;
-    @XmlElement(name = "Fahrgestnr")
-    protected String fahrgestnr;
-    @XmlElement(name = "TypVarVer")
-    protected String typVarVer;
-
-    /**
-     * Ruft den Wert der vuNrGesch-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVUNrGesch() {
-        return vuNrGesch;
-    }
-
-    /**
-     * Legt den Wert der vuNrGesch-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVUNrGesch(String value) {
-        this.vuNrGesch = value;
-    }
-
-    /**
-     * Ruft den Wert der vuNameGesch-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVUNameGesch() {
-        return vuNameGesch;
-    }
-
-    /**
-     * Legt den Wert der vuNameGesch-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVUNameGesch(String value) {
-        this.vuNameGesch = value;
-    }
-
-    /**
-     * Ruft den Wert der polNrGesch-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolNrGesch() {
-        return polNrGesch;
-    }
-
-    /**
-     * Legt den Wert der polNrGesch-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolNrGesch(String value) {
-        this.polNrGesch = value;
-    }
-
-    /**
-     * Ruft den Wert der schadennrGesch-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSchadennrGesch() {
-        return schadennrGesch;
-    }
-
-    /**
-     * Legt den Wert der schadennrGesch-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSchadennrGesch(String value) {
-        this.schadennrGesch = value;
-    }
-
-    /**
-     * Ruft den Wert der landesCdGeschKfz-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getLandesCdGeschKfz() {
-        return landesCdGeschKfz;
-    }
-
-    /**
-     * Legt den Wert der landesCdGeschKfz-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setLandesCdGeschKfz(String value) {
-        this.landesCdGeschKfz = value;
-    }
-
-    /**
-     * Ruft den Wert der kennzGeschKfz-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getKennzGeschKfz() {
-        return kennzGeschKfz;
-    }
-
-    /**
-     * Legt den Wert der kennzGeschKfz-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setKennzGeschKfz(String value) {
-        this.kennzGeschKfz = value;
-    }
-
-    /**
-     * Ruft den Wert der marke-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMarke() {
-        return marke;
-    }
-
-    /**
-     * Legt den Wert der marke-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMarke(String value) {
-        this.marke = value;
-    }
-
-    /**
-     * Ruft den Wert der handelsbez-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getHandelsbez() {
-        return handelsbez;
-    }
-
-    /**
-     * Legt den Wert der handelsbez-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setHandelsbez(String value) {
-        this.handelsbez = value;
-    }
-
-    /**
-     * Ruft den Wert der fahrgestnr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFahrgestnr() {
-        return fahrgestnr;
-    }
-
-    /**
-     * Legt den Wert der fahrgestnr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFahrgestnr(String value) {
-        this.fahrgestnr = value;
-    }
-
-    /**
-     * Ruft den Wert der typVarVer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTypVarVer() {
-        return typVarVer;
-    }
-
-    /**
-     * Legt den Wert der typVarVer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTypVarVer(String value) {
-        this.typVarVer = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GetClaimRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GetClaimRequestType.java
deleted file mode 100644
index 212acab8..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GetClaimRequestType.java
+++ /dev/null
@@ -1,155 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AuthorizationFilter;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-
-
-/**
- * Dieser Typ enthält eine Schadennr oder eine GeschaeftsfallId
- * 
- * 
Java-Klasse für GetClaimRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GetClaimRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element name="AuthFilter" type="{urn:omds3CommonServiceTypes-1-1-0}AuthorizationFilter" minOccurs="0"/>
- *         <choice>
- *           <element ref="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}GeschaeftsfallSchadenereignis"/>
- *           <element ref="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}GeschaeftsfallSchadenanlage"/>
- *           <element name="Schadennr" type="{urn:omds20}Schadennr"/>
- *         </choice>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GetClaimRequest_Type", propOrder = {
-    "authFilter",
-    "geschaeftsfallSchadenereignis",
-    "geschaeftsfallSchadenanlage",
-    "schadennr"
-})
-public class GetClaimRequestType
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "AuthFilter")
-    protected AuthorizationFilter authFilter;
-    @XmlElement(name = "GeschaeftsfallSchadenereignis")
-    protected ObjektIdType geschaeftsfallSchadenereignis;
-    @XmlElement(name = "GeschaeftsfallSchadenanlage")
-    protected ObjektIdType geschaeftsfallSchadenanlage;
-    @XmlElement(name = "Schadennr")
-    protected String schadennr;
-
-    /**
-     * Ruft den Wert der authFilter-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public AuthorizationFilter getAuthFilter() {
-        return authFilter;
-    }
-
-    /**
-     * Legt den Wert der authFilter-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public void setAuthFilter(AuthorizationFilter value) {
-        this.authFilter = value;
-    }
-
-    /**
-     * Ruft den Wert der geschaeftsfallSchadenereignis-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getGeschaeftsfallSchadenereignis() {
-        return geschaeftsfallSchadenereignis;
-    }
-
-    /**
-     * Legt den Wert der geschaeftsfallSchadenereignis-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setGeschaeftsfallSchadenereignis(ObjektIdType value) {
-        this.geschaeftsfallSchadenereignis = value;
-    }
-
-    /**
-     * Ruft den Wert der geschaeftsfallSchadenanlage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getGeschaeftsfallSchadenanlage() {
-        return geschaeftsfallSchadenanlage;
-    }
-
-    /**
-     * Legt den Wert der geschaeftsfallSchadenanlage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setGeschaeftsfallSchadenanlage(ObjektIdType value) {
-        this.geschaeftsfallSchadenanlage = value;
-    }
-
-    /**
-     * Ruft den Wert der schadennr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSchadennr() {
-        return schadennr;
-    }
-
-    /**
-     * Legt den Wert der schadennr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSchadennr(String value) {
-        this.schadennr = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GetClaimResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GetClaimResponseType.java
deleted file mode 100644
index f0623882..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/GetClaimResponseType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-
-
-/**
- * Response-Objekt für Schadenereignisse
- * 
- * 
Java-Klasse für GetClaimResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GetClaimResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence>
- *         <element name="Schadenereignis" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}Schadenereignis_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GetClaimResponse_Type", propOrder = {
-    "schadenereignis"
-})
-public class GetClaimResponseType
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "Schadenereignis")
-    protected SchadenereignisType schadenereignis;
-
-    /**
-     * Ruft den Wert der schadenereignis-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SchadenereignisType }
-     *     
-     */
-    public SchadenereignisType getSchadenereignis() {
-        return schadenereignis;
-    }
-
-    /**
-     * Legt den Wert der schadenereignis-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SchadenereignisType }
-     *     
-     */
-    public void setSchadenereignis(SchadenereignisType value) {
-        this.schadenereignis = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/NatPersonType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/NatPersonType.java
deleted file mode 100644
index 12098b03..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/NatPersonType.java
+++ /dev/null
@@ -1,117 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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;
-
-
-/**
- * Natuerliche Person
- * 
- * 
Java-Klasse für NatPerson_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="NatPerson_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="Familienname" use="required" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
- *       <attribute name="Vorname" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
- *       <attribute name="GeschlechtCd" use="required" type="{urn:omds20}GeschlechtCd_Type" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "NatPerson_Type")
-public class NatPersonType {
-
-    @XmlAttribute(name = "Familienname", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", required = true)
-    @XmlSchemaType(name = "anySimpleType")
-    protected String familienname;
-    @XmlAttribute(name = "Vorname", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden")
-    @XmlSchemaType(name = "anySimpleType")
-    protected String vorname;
-    @XmlAttribute(name = "GeschlechtCd", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", required = true)
-    protected String geschlechtCd;
-
-    /**
-     * Ruft den Wert der familienname-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFamilienname() {
-        return familienname;
-    }
-
-    /**
-     * Legt den Wert der familienname-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFamilienname(String value) {
-        this.familienname = value;
-    }
-
-    /**
-     * Ruft den Wert der vorname-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVorname() {
-        return vorname;
-    }
-
-    /**
-     * Legt den Wert der vorname-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVorname(String value) {
-        this.vorname = value;
-    }
-
-    /**
-     * Ruft den Wert der geschlechtCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGeschlechtCd() {
-        return geschlechtCd;
-    }
-
-    /**
-     * Legt den Wert der geschlechtCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGeschlechtCd(String value) {
-        this.geschlechtCd = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ObjectFactory.java
deleted file mode 100644
index 40e30fb4..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ObjectFactory.java
+++ /dev/null
@@ -1,426 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the at.vvo.omds.types.omds3Types.r1_7_0.on7schaden package. 
- * 
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 _CheckClaimRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", "CheckClaimRequest");
-    private final static QName _CheckClaimResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", "CheckClaimResponse");
-    private final static QName _SubmitClaimRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", "SubmitClaimRequest");
-    private final static QName _SubmitClaimResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", "SubmitClaimResponse");
-    private final static QName _GetClaimRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", "GetClaimRequest");
-    private final static QName _GetClaimResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", "GetClaimResponse");
-    private final static QName _SearchClaimRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", "SearchClaimRequest");
-    private final static QName _SearchClaimResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", "SearchClaimResponse");
-    private final static QName _GeschaeftsfallSchadenereignis_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", "GeschaeftsfallSchadenereignis");
-    private final static QName _GeschaeftsfallSchadenanlage_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", "GeschaeftsfallSchadenanlage");
-    private final static QName _Schadenzuordnung_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", "Schadenzuordnung");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.vvo.omds.types.omds3Types.r1_7_0.on7schaden
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link CheckCoverageResponse }
-     * 
-     */
-    public CheckCoverageResponse createCheckCoverageResponse() {
-        return new CheckCoverageResponse();
-    }
-
-    /**
-     * Create an instance of {@link SpartendetailSchadenKrankenType }
-     * 
-     */
-    public SpartendetailSchadenKrankenType createSpartendetailSchadenKrankenType() {
-        return new SpartendetailSchadenKrankenType();
-    }
-
-    /**
-     * Create an instance of {@link SchadenType }
-     * 
-     */
-    public SchadenType createSchadenType() {
-        return new SchadenType();
-    }
-
-    /**
-     * Create an instance of {@link CheckClaimRequestType }
-     * 
-     */
-    public CheckClaimRequestType createCheckClaimRequestType() {
-        return new CheckClaimRequestType();
-    }
-
-    /**
-     * Create an instance of {@link CheckClaimResponseType }
-     * 
-     */
-    public CheckClaimResponseType createCheckClaimResponseType() {
-        return new CheckClaimResponseType();
-    }
-
-    /**
-     * Create an instance of {@link SubmitClaimRequestType }
-     * 
-     */
-    public SubmitClaimRequestType createSubmitClaimRequestType() {
-        return new SubmitClaimRequestType();
-    }
-
-    /**
-     * Create an instance of {@link SubmitClaimResponseType }
-     * 
-     */
-    public SubmitClaimResponseType createSubmitClaimResponseType() {
-        return new SubmitClaimResponseType();
-    }
-
-    /**
-     * Create an instance of {@link GetClaimRequestType }
-     * 
-     */
-    public GetClaimRequestType createGetClaimRequestType() {
-        return new GetClaimRequestType();
-    }
-
-    /**
-     * Create an instance of {@link GetClaimResponseType }
-     * 
-     */
-    public GetClaimResponseType createGetClaimResponseType() {
-        return new GetClaimResponseType();
-    }
-
-    /**
-     * Create an instance of {@link SearchClaimRequestType }
-     * 
-     */
-    public SearchClaimRequestType createSearchClaimRequestType() {
-        return new SearchClaimRequestType();
-    }
-
-    /**
-     * Create an instance of {@link SearchClaimResponseType }
-     * 
-     */
-    public SearchClaimResponseType createSearchClaimResponseType() {
-        return new SearchClaimResponseType();
-    }
-
-    /**
-     * Create an instance of {@link SchadenzuordnungType }
-     * 
-     */
-    public SchadenzuordnungType createSchadenzuordnungType() {
-        return new SchadenzuordnungType();
-    }
-
-    /**
-     * Create an instance of {@link CheckCoverageRequest }
-     * 
-     */
-    public CheckCoverageRequest createCheckCoverageRequest() {
-        return new CheckCoverageRequest();
-    }
-
-    /**
-     * Create an instance of {@link CheckCoverageResponse.Auskuenfte }
-     * 
-     */
-    public CheckCoverageResponse.Auskuenfte createCheckCoverageResponseAuskuenfte() {
-        return new CheckCoverageResponse.Auskuenfte();
-    }
-
-    /**
-     * Create an instance of {@link SubmitReceiptRequest }
-     * 
-     */
-    public SubmitReceiptRequest createSubmitReceiptRequest() {
-        return new SubmitReceiptRequest();
-    }
-
-    /**
-     * Create an instance of {@link SubmitReceiptResponse }
-     * 
-     */
-    public SubmitReceiptResponse createSubmitReceiptResponse() {
-        return new SubmitReceiptResponse();
-    }
-
-    /**
-     * Create an instance of {@link SearchClaimResponseResultType }
-     * 
-     */
-    public SearchClaimResponseResultType createSearchClaimResponseResultType() {
-        return new SearchClaimResponseResultType();
-    }
-
-    /**
-     * Create an instance of {@link SchadenereignisType }
-     * 
-     */
-    public SchadenereignisType createSchadenereignisType() {
-        return new SchadenereignisType();
-    }
-
-    /**
-     * Create an instance of {@link SchadenereignisLightType }
-     * 
-     */
-    public SchadenereignisLightType createSchadenereignisLightType() {
-        return new SchadenereignisLightType();
-    }
-
-    /**
-     * Create an instance of {@link SchadenLightType }
-     * 
-     */
-    public SchadenLightType createSchadenLightType() {
-        return new SchadenLightType();
-    }
-
-    /**
-     * Create an instance of {@link BasisSchadenType }
-     * 
-     */
-    public BasisSchadenType createBasisSchadenType() {
-        return new BasisSchadenType();
-    }
-
-    /**
-     * Create an instance of {@link BeteiligtePersonType }
-     * 
-     */
-    public BeteiligtePersonType createBeteiligtePersonType() {
-        return new BeteiligtePersonType();
-    }
-
-    /**
-     * Create an instance of {@link SpartendetailSchadenKfzType }
-     * 
-     */
-    public SpartendetailSchadenKfzType createSpartendetailSchadenKfzType() {
-        return new SpartendetailSchadenKfzType();
-    }
-
-    /**
-     * Create an instance of {@link SpartendetailSchadenUnfallType }
-     * 
-     */
-    public SpartendetailSchadenUnfallType createSpartendetailSchadenUnfallType() {
-        return new SpartendetailSchadenUnfallType();
-    }
-
-    /**
-     * Create an instance of {@link OrtType }
-     * 
-     */
-    public OrtType createOrtType() {
-        return new OrtType();
-    }
-
-    /**
-     * Create an instance of {@link GeokoordinatenType }
-     * 
-     */
-    public GeokoordinatenType createGeokoordinatenType() {
-        return new GeokoordinatenType();
-    }
-
-    /**
-     * Create an instance of {@link GeschaedigtesInteresseType }
-     * 
-     */
-    public GeschaedigtesInteresseType createGeschaedigtesInteresseType() {
-        return new GeschaedigtesInteresseType();
-    }
-
-    /**
-     * Create an instance of {@link GeschaedigtesObjektKfzType }
-     * 
-     */
-    public GeschaedigtesObjektKfzType createGeschaedigtesObjektKfzType() {
-        return new GeschaedigtesObjektKfzType();
-    }
-
-    /**
-     * Create an instance of {@link GeschaedigtesObjektImmobilieType }
-     * 
-     */
-    public GeschaedigtesObjektImmobilieType createGeschaedigtesObjektImmobilieType() {
-        return new GeschaedigtesObjektImmobilieType();
-    }
-
-    /**
-     * Create an instance of {@link SchadenmelderVermittlerType }
-     * 
-     */
-    public SchadenmelderVermittlerType createSchadenmelderVermittlerType() {
-        return new SchadenmelderVermittlerType();
-    }
-
-    /**
-     * Create an instance of {@link ReferenzAufBeteiligtePersonSchadenType }
-     * 
-     */
-    public ReferenzAufBeteiligtePersonSchadenType createReferenzAufBeteiligtePersonSchadenType() {
-        return new ReferenzAufBeteiligtePersonSchadenType();
-    }
-
-    /**
-     * Create an instance of {@link SachbearbVUType }
-     * 
-     */
-    public SachbearbVUType createSachbearbVUType() {
-        return new SachbearbVUType();
-    }
-
-    /**
-     * Create an instance of {@link NatPersonType }
-     * 
-     */
-    public NatPersonType createNatPersonType() {
-        return new NatPersonType();
-    }
-
-    /**
-     * Create an instance of {@link SpartendetailSchadenKrankenType.Behandlungen }
-     * 
-     */
-    public SpartendetailSchadenKrankenType.Behandlungen createSpartendetailSchadenKrankenTypeBehandlungen() {
-        return new SpartendetailSchadenKrankenType.Behandlungen();
-    }
-
-    /**
-     * Create an instance of {@link SchadenType.BeteiligtePersonen }
-     * 
-     */
-    public SchadenType.BeteiligtePersonen createSchadenTypeBeteiligtePersonen() {
-        return new SchadenType.BeteiligtePersonen();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CheckClaimRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", name = "CheckClaimRequest")
-    public JAXBElement createCheckClaimRequest(CheckClaimRequestType value) {
-        return new JAXBElement(_CheckClaimRequest_QNAME, CheckClaimRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CheckClaimResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", name = "CheckClaimResponse")
-    public JAXBElement createCheckClaimResponse(CheckClaimResponseType value) {
-        return new JAXBElement(_CheckClaimResponse_QNAME, CheckClaimResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SubmitClaimRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", name = "SubmitClaimRequest")
-    public JAXBElement createSubmitClaimRequest(SubmitClaimRequestType value) {
-        return new JAXBElement(_SubmitClaimRequest_QNAME, SubmitClaimRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SubmitClaimResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", name = "SubmitClaimResponse")
-    public JAXBElement createSubmitClaimResponse(SubmitClaimResponseType value) {
-        return new JAXBElement(_SubmitClaimResponse_QNAME, SubmitClaimResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetClaimRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", name = "GetClaimRequest")
-    public JAXBElement createGetClaimRequest(GetClaimRequestType value) {
-        return new JAXBElement(_GetClaimRequest_QNAME, GetClaimRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetClaimResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", name = "GetClaimResponse")
-    public JAXBElement createGetClaimResponse(GetClaimResponseType value) {
-        return new JAXBElement(_GetClaimResponse_QNAME, GetClaimResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SearchClaimRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", name = "SearchClaimRequest")
-    public JAXBElement createSearchClaimRequest(SearchClaimRequestType value) {
-        return new JAXBElement(_SearchClaimRequest_QNAME, SearchClaimRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SearchClaimResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", name = "SearchClaimResponse")
-    public JAXBElement createSearchClaimResponse(SearchClaimResponseType value) {
-        return new JAXBElement(_SearchClaimResponse_QNAME, SearchClaimResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ObjektIdType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", name = "GeschaeftsfallSchadenereignis")
-    public JAXBElement createGeschaeftsfallSchadenereignis(ObjektIdType value) {
-        return new JAXBElement(_GeschaeftsfallSchadenereignis_QNAME, ObjektIdType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ObjektIdType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", name = "GeschaeftsfallSchadenanlage")
-    public JAXBElement createGeschaeftsfallSchadenanlage(ObjektIdType value) {
-        return new JAXBElement(_GeschaeftsfallSchadenanlage_QNAME, ObjektIdType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SchadenzuordnungType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", name = "Schadenzuordnung")
-    public JAXBElement createSchadenzuordnung(SchadenzuordnungType value) {
-        return new JAXBElement(_Schadenzuordnung_QNAME, SchadenzuordnungType.class, null, value);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/OrtType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/OrtType.java
deleted file mode 100644
index 7d00da2b..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/OrtType.java
+++ /dev/null
@@ -1,121 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds2Types.v2_14.ADRESSEType;
-
-
-/**
- * Typ für den Schadenort
- * 
- * 
Java-Klasse für Ort_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Ort_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Adresse" type="{urn:omds20}ADRESSE_Type" minOccurs="0"/>
- *         <element name="Beschreibung" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Geokoordinaten" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}Geokoordinaten_Type" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Ort_Type", propOrder = {
-    "adresse",
-    "beschreibung",
-    "geokoordinaten"
-})
-public class OrtType {
-
-    @XmlElement(name = "Adresse")
-    protected ADRESSEType adresse;
-    @XmlElement(name = "Beschreibung")
-    protected String beschreibung;
-    @XmlElement(name = "Geokoordinaten")
-    protected GeokoordinatenType geokoordinaten;
-
-    /**
-     * Ruft den Wert der adresse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ADRESSEType }
-     *     
-     */
-    public ADRESSEType getAdresse() {
-        return adresse;
-    }
-
-    /**
-     * Legt den Wert der adresse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ADRESSEType }
-     *     
-     */
-    public void setAdresse(ADRESSEType value) {
-        this.adresse = value;
-    }
-
-    /**
-     * Ruft den Wert der beschreibung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBeschreibung() {
-        return beschreibung;
-    }
-
-    /**
-     * Legt den Wert der beschreibung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBeschreibung(String value) {
-        this.beschreibung = value;
-    }
-
-    /**
-     * Ruft den Wert der geokoordinaten-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GeokoordinatenType }
-     *     
-     */
-    public GeokoordinatenType getGeokoordinaten() {
-        return geokoordinaten;
-    }
-
-    /**
-     * Legt den Wert der geokoordinaten-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GeokoordinatenType }
-     *     
-     */
-    public void setGeokoordinaten(GeokoordinatenType value) {
-        this.geokoordinaten = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ReferenzAufBeteiligtePersonSchadenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ReferenzAufBeteiligtePersonSchadenType.java
deleted file mode 100644
index 462b3fd0..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ReferenzAufBeteiligtePersonSchadenType.java
+++ /dev/null
@@ -1,91 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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;
-
-
-/**
- * Das Zuordnungsobjekt, welches die fachliche Zuordnung eines Schadens ermöglicht
- * 
- * 
Java-Klasse für ReferenzAufBeteiligtePersonSchaden_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ReferenzAufBeteiligtePersonSchaden_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="BetLfnr" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *       <attribute name="BetTxt">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *             <maxLength value="100"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ReferenzAufBeteiligtePersonSchaden_Type")
-@XmlSeeAlso({
-    at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SchadenType.BeteiligtePersonen.class
-})
-public class ReferenzAufBeteiligtePersonSchadenType {
-
-    @XmlAttribute(name = "BetLfnr", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", required = true)
-    @XmlSchemaType(name = "unsignedShort")
-    protected int betLfnr;
-    @XmlAttribute(name = "BetTxt", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden")
-    protected String betTxt;
-
-    /**
-     * Ruft den Wert der betLfnr-Eigenschaft ab.
-     * 
-     */
-    public int getBetLfnr() {
-        return betLfnr;
-    }
-
-    /**
-     * Legt den Wert der betLfnr-Eigenschaft fest.
-     * 
-     */
-    public void setBetLfnr(int value) {
-        this.betLfnr = value;
-    }
-
-    /**
-     * Ruft den Wert der betTxt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBetTxt() {
-        return betTxt;
-    }
-
-    /**
-     * Legt den Wert der betTxt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBetTxt(String value) {
-        this.betTxt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SachbearbVUType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SachbearbVUType.java
deleted file mode 100644
index b8106cac..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SachbearbVUType.java
+++ /dev/null
@@ -1,100 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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;
-import at.vvo.omds.types.omds2Types.v2_14.ELKommunikationType;
-
-
-/**
- * Typ für die Übermittlung von Kontaktdaten eines Sachbearbeiters
- * 
- * 
Java-Klasse für SachbearbVUType complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SachbearbVUType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Person" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}NatPerson_Type"/>
- *         <element ref="{urn:omds20}EL-Kommunikation" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SachbearbVUType", propOrder = {
-    "person",
-    "elKommunikation"
-})
-public class SachbearbVUType {
-
-    @XmlElement(name = "Person", required = true)
-    protected NatPersonType person;
-    @XmlElement(name = "EL-Kommunikation", namespace = "urn:omds20", required = true)
-    protected List elKommunikation;
-
-    /**
-     * Ruft den Wert der person-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link NatPersonType }
-     *     
-     */
-    public NatPersonType getPerson() {
-        return person;
-    }
-
-    /**
-     * Legt den Wert der person-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link NatPersonType }
-     *     
-     */
-    public void setPerson(NatPersonType value) {
-        this.person = value;
-    }
-
-    /**
-     * Gets the value of the elKommunikation property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the elKommunikation property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getELKommunikation().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ELKommunikationType }
-     * 
-     * 
-     */
-    public List getELKommunikation() {
-        if (elKommunikation == null) {
-            elKommunikation = new ArrayList();
-        }
-        return this.elKommunikation;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenLightType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenLightType.java
deleted file mode 100644
index 1ddf46e9..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenLightType.java
+++ /dev/null
@@ -1,94 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Typ zur leichtgewichtigen Abbildung von Schadenobjekten 
- * 
- * 
Java-Klasse für SchadenLight_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SchadenLight_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}BasisSchaden_Type">
- *       <sequence>
- *         <element name="BearbStandCd" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}BearbStandCd_Type"/>
- *         <element ref="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}Schadenzuordnung" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SchadenLight_Type", propOrder = {
-    "bearbStandCd",
-    "schadenzuordnung"
-})
-public class SchadenLightType
-    extends BasisSchadenType
-{
-
-    @XmlElement(name = "BearbStandCd", required = true)
-    protected String bearbStandCd;
-    @XmlElement(name = "Schadenzuordnung")
-    protected SchadenzuordnungType schadenzuordnung;
-
-    /**
-     * Ruft den Wert der bearbStandCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBearbStandCd() {
-        return bearbStandCd;
-    }
-
-    /**
-     * Legt den Wert der bearbStandCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBearbStandCd(String value) {
-        this.bearbStandCd = value;
-    }
-
-    /**
-     * Ruft den Wert der schadenzuordnung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SchadenzuordnungType }
-     *     
-     */
-    public SchadenzuordnungType getSchadenzuordnung() {
-        return schadenzuordnung;
-    }
-
-    /**
-     * Legt den Wert der schadenzuordnung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SchadenzuordnungType }
-     *     
-     */
-    public void setSchadenzuordnung(SchadenzuordnungType value) {
-        this.schadenzuordnung = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenType.java
deleted file mode 100644
index cbd6dfbb..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenType.java
+++ /dev/null
@@ -1,415 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds2Types.v2_14.VtgRolleCdType;
-import at.vvo.omds.types.omds2Types.v2_14.WaehrungsCdType;
-
-
-/**
- * Die Darstellung eines Schadens (spartenbezogenes Unterobjekt eines Schadenereignisses)
- * 
- * 
Java-Klasse für Schaden_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Schaden_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}BasisSchaden_Type">
- *       <sequence>
- *         <element name="BearbStandCd" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}BearbStandCd_Type" minOccurs="0"/>
- *         <element ref="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}Schadenzuordnung"/>
- *         <element name="SchadenTxt" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="BeteiligtePersonen" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}ReferenzAufBeteiligtePersonSchaden_Type">
- *                 <sequence>
- *                   <choice>
- *                     <element name="Vertragsrolle" type="{urn:omds20}VtgRolleCd_Type"/>
- *                     <sequence>
- *                       <element name="Schadensrolle" type="{urn:omds20}BetRolleCd_Type"/>
- *                       <element name="GeschInteresseLfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/>
- *                     </sequence>
- *                   </choice>
- *                   <element name="ZusaetzlicheRollendaten" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}ZusaetzlicheRollendaten_Type" maxOccurs="unbounded" minOccurs="0"/>
- *                 </sequence>
- *               </extension>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="LeistungGeschaetzt" type="{urn:omds20}decimal" minOccurs="0"/>
- *         <element name="WaehrungsCd" type="{urn:omds20}WaehrungsCd_Type" minOccurs="0"/>
- *         <element name="Spartendetails" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}SpartendetailSchaden_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Schaden_Type", propOrder = {
-    "bearbStandCd",
-    "schadenzuordnung",
-    "schadenTxt",
-    "beteiligtePersonen",
-    "leistungGeschaetzt",
-    "waehrungsCd",
-    "spartendetails"
-})
-public class SchadenType
-    extends BasisSchadenType
-{
-
-    @XmlElement(name = "BearbStandCd")
-    protected String bearbStandCd;
-    @XmlElement(name = "Schadenzuordnung", required = true)
-    protected SchadenzuordnungType schadenzuordnung;
-    @XmlElement(name = "SchadenTxt")
-    protected String schadenTxt;
-    @XmlElement(name = "BeteiligtePersonen")
-    protected List beteiligtePersonen;
-    @XmlElement(name = "LeistungGeschaetzt")
-    protected BigDecimal leistungGeschaetzt;
-    @XmlElement(name = "WaehrungsCd")
-    @XmlSchemaType(name = "string")
-    protected WaehrungsCdType waehrungsCd;
-    @XmlElement(name = "Spartendetails")
-    protected SpartendetailSchadenType spartendetails;
-
-    /**
-     * Ruft den Wert der bearbStandCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBearbStandCd() {
-        return bearbStandCd;
-    }
-
-    /**
-     * Legt den Wert der bearbStandCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBearbStandCd(String value) {
-        this.bearbStandCd = value;
-    }
-
-    /**
-     * Ruft den Wert der schadenzuordnung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SchadenzuordnungType }
-     *     
-     */
-    public SchadenzuordnungType getSchadenzuordnung() {
-        return schadenzuordnung;
-    }
-
-    /**
-     * Legt den Wert der schadenzuordnung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SchadenzuordnungType }
-     *     
-     */
-    public void setSchadenzuordnung(SchadenzuordnungType value) {
-        this.schadenzuordnung = value;
-    }
-
-    /**
-     * Ruft den Wert der schadenTxt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSchadenTxt() {
-        return schadenTxt;
-    }
-
-    /**
-     * Legt den Wert der schadenTxt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSchadenTxt(String value) {
-        this.schadenTxt = value;
-    }
-
-    /**
-     * Gets the value of the beteiligtePersonen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the beteiligtePersonen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getBeteiligtePersonen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link SchadenType.BeteiligtePersonen }
-     * 
-     * 
-     */
-    public List getBeteiligtePersonen() {
-        if (beteiligtePersonen == null) {
-            beteiligtePersonen = new ArrayList();
-        }
-        return this.beteiligtePersonen;
-    }
-
-    /**
-     * Ruft den Wert der leistungGeschaetzt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getLeistungGeschaetzt() {
-        return leistungGeschaetzt;
-    }
-
-    /**
-     * Legt den Wert der leistungGeschaetzt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setLeistungGeschaetzt(BigDecimal value) {
-        this.leistungGeschaetzt = value;
-    }
-
-    /**
-     * Ruft den Wert der waehrungsCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link WaehrungsCdType }
-     *     
-     */
-    public WaehrungsCdType getWaehrungsCd() {
-        return waehrungsCd;
-    }
-
-    /**
-     * Legt den Wert der waehrungsCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link WaehrungsCdType }
-     *     
-     */
-    public void setWaehrungsCd(WaehrungsCdType value) {
-        this.waehrungsCd = value;
-    }
-
-    /**
-     * Ruft den Wert der spartendetails-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpartendetailSchadenType }
-     *     
-     */
-    public SpartendetailSchadenType getSpartendetails() {
-        return spartendetails;
-    }
-
-    /**
-     * Legt den Wert der spartendetails-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpartendetailSchadenType }
-     *     
-     */
-    public void setSpartendetails(SpartendetailSchadenType value) {
-        this.spartendetails = value;
-    }
-
-
-    /**
-     * 
Java-Klasse für anonymous complex type.
-     * 
-     * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}ReferenzAufBeteiligtePersonSchaden_Type">
-     *       <sequence>
-     *         <choice>
-     *           <element name="Vertragsrolle" type="{urn:omds20}VtgRolleCd_Type"/>
-     *           <sequence>
-     *             <element name="Schadensrolle" type="{urn:omds20}BetRolleCd_Type"/>
-     *             <element name="GeschInteresseLfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/>
-     *           </sequence>
-     *         </choice>
-     *         <element name="ZusaetzlicheRollendaten" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}ZusaetzlicheRollendaten_Type" maxOccurs="unbounded" minOccurs="0"/>
-     *       </sequence>
-     *     </extension>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "vertragsrolle",
-        "schadensrolle",
-        "geschInteresseLfnr",
-        "zusaetzlicheRollendaten"
-    })
-    public static class BeteiligtePersonen
-        extends ReferenzAufBeteiligtePersonSchadenType
-    {
-
-        @XmlElement(name = "Vertragsrolle")
-        @XmlSchemaType(name = "string")
-        protected VtgRolleCdType vertragsrolle;
-        @XmlElement(name = "Schadensrolle")
-        protected String schadensrolle;
-        @XmlElement(name = "GeschInteresseLfnr")
-        @XmlSchemaType(name = "unsignedShort")
-        protected Integer geschInteresseLfnr;
-        @XmlElement(name = "ZusaetzlicheRollendaten")
-        protected List zusaetzlicheRollendaten;
-
-        /**
-         * Ruft den Wert der vertragsrolle-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link VtgRolleCdType }
-         *     
-         */
-        public VtgRolleCdType getVertragsrolle() {
-            return vertragsrolle;
-        }
-
-        /**
-         * Legt den Wert der vertragsrolle-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link VtgRolleCdType }
-         *     
-         */
-        public void setVertragsrolle(VtgRolleCdType value) {
-            this.vertragsrolle = value;
-        }
-
-        /**
-         * Ruft den Wert der schadensrolle-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getSchadensrolle() {
-            return schadensrolle;
-        }
-
-        /**
-         * Legt den Wert der schadensrolle-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setSchadensrolle(String value) {
-            this.schadensrolle = value;
-        }
-
-        /**
-         * Ruft den Wert der geschInteresseLfnr-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getGeschInteresseLfnr() {
-            return geschInteresseLfnr;
-        }
-
-        /**
-         * Legt den Wert der geschInteresseLfnr-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setGeschInteresseLfnr(Integer value) {
-            this.geschInteresseLfnr = value;
-        }
-
-        /**
-         * Gets the value of the zusaetzlicheRollendaten property.
-         * 
-         * 

-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a set method for the zusaetzlicheRollendaten property.
-         * 
-         * 

-         * For example, to add a new item, do as follows:
-         * 
-         *    getZusaetzlicheRollendaten().add(newItem);
-         * 

-         * 
-         * 
-         * 

-         * Objects of the following type(s) are allowed in the list
-         * {@link ZusaetzlicheRollendatenType }
-         * 
-         * 
-         */
-        public List getZusaetzlicheRollendaten() {
-            if (zusaetzlicheRollendaten == null) {
-                zusaetzlicheRollendaten = new ArrayList();
-            }
-            return this.zusaetzlicheRollendaten;
-        }
-
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenereignisLightType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenereignisLightType.java
deleted file mode 100644
index 6ecafae1..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenereignisLightType.java
+++ /dev/null
@@ -1,73 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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;
-
-
-/**
- * Typ zur leichtgewichtigen Abbildung von Schadenereignis-Objekten
- * 
- * 
Java-Klasse für SchadenereignisLight_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SchadenereignisLight_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}BasisSchadenereignis_Type">
- *       <sequence>
- *         <element name="Schaeden" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}SchadenLight_Type" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SchadenereignisLight_Type", propOrder = {
-    "schaeden"
-})
-public class SchadenereignisLightType
-    extends BasisSchadenereignisType
-{
-
-    @XmlElement(name = "Schaeden", required = true)
-    protected List schaeden;
-
-    /**
-     * Gets the value of the schaeden property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the schaeden property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getSchaeden().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link SchadenLightType }
-     * 
-     * 
-     */
-    public List getSchaeden() {
-        if (schaeden == null) {
-            schaeden = new ArrayList();
-        }
-        return this.schaeden;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenereignisType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenereignisType.java
deleted file mode 100644
index b02806be..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenereignisType.java
+++ /dev/null
@@ -1,263 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.DokumentenReferenzType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.PersBankverbindungType;
-
-
-/**
- * Eine Beschreibung eines Schadenereignisses ohne Ids. Von diesem Type erben die Meldung und die Darstellung eines Schadenereignisses.
- * 
- * 
Java-Klasse für Schadenereignis_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Schadenereignis_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}BasisSchadenereignis_Type">
- *       <sequence>
- *         <element name="SchadOrt" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}Ort_Type"/>
- *         <element name="BeteiligtePersonen" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}BeteiligtePerson_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="GeschaedigteInteressen" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}GeschaedigtesInteresse_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Dokumente" type="{urn:omds3CommonServiceTypes-1-1-0}DokumentenReferenz_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Schadenmelder" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}Schadenmelder_Type" minOccurs="0"/>
- *         <element name="Bankverbindung" type="{urn:omds3CommonServiceTypes-1-1-0}PersBankverbindung_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Schaeden" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}Schaden_Type" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Schadenereignis_Type", propOrder = {
-    "schadOrt",
-    "beteiligtePersonen",
-    "geschaedigteInteressen",
-    "dokumente",
-    "schadenmelder",
-    "bankverbindung",
-    "schaeden"
-})
-public class SchadenereignisType
-    extends BasisSchadenereignisType
-{
-
-    @XmlElement(name = "SchadOrt", required = true)
-    protected OrtType schadOrt;
-    @XmlElement(name = "BeteiligtePersonen")
-    protected List beteiligtePersonen;
-    @XmlElement(name = "GeschaedigteInteressen")
-    protected List geschaedigteInteressen;
-    @XmlElement(name = "Dokumente")
-    protected List dokumente;
-    @XmlElement(name = "Schadenmelder")
-    protected SchadenmelderType schadenmelder;
-    @XmlElement(name = "Bankverbindung")
-    protected List bankverbindung;
-    @XmlElement(name = "Schaeden", required = true)
-    protected List schaeden;
-
-    /**
-     * Ruft den Wert der schadOrt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link OrtType }
-     *     
-     */
-    public OrtType getSchadOrt() {
-        return schadOrt;
-    }
-
-    /**
-     * Legt den Wert der schadOrt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link OrtType }
-     *     
-     */
-    public void setSchadOrt(OrtType value) {
-        this.schadOrt = value;
-    }
-
-    /**
-     * Gets the value of the beteiligtePersonen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the beteiligtePersonen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getBeteiligtePersonen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link BeteiligtePersonType }
-     * 
-     * 
-     */
-    public List getBeteiligtePersonen() {
-        if (beteiligtePersonen == null) {
-            beteiligtePersonen = new ArrayList();
-        }
-        return this.beteiligtePersonen;
-    }
-
-    /**
-     * Gets the value of the geschaedigteInteressen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the geschaedigteInteressen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getGeschaedigteInteressen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link GeschaedigtesInteresseType }
-     * 
-     * 
-     */
-    public List getGeschaedigteInteressen() {
-        if (geschaedigteInteressen == null) {
-            geschaedigteInteressen = new ArrayList();
-        }
-        return this.geschaedigteInteressen;
-    }
-
-    /**
-     * Gets the value of the dokumente property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the dokumente property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDokumente().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link DokumentenReferenzType }
-     * 
-     * 
-     */
-    public List getDokumente() {
-        if (dokumente == null) {
-            dokumente = new ArrayList();
-        }
-        return this.dokumente;
-    }
-
-    /**
-     * Ruft den Wert der schadenmelder-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SchadenmelderType }
-     *     
-     */
-    public SchadenmelderType getSchadenmelder() {
-        return schadenmelder;
-    }
-
-    /**
-     * Legt den Wert der schadenmelder-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SchadenmelderType }
-     *     
-     */
-    public void setSchadenmelder(SchadenmelderType value) {
-        this.schadenmelder = value;
-    }
-
-    /**
-     * Gets the value of the bankverbindung property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the bankverbindung property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getBankverbindung().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link PersBankverbindungType }
-     * 
-     * 
-     */
-    public List getBankverbindung() {
-        if (bankverbindung == null) {
-            bankverbindung = new ArrayList();
-        }
-        return this.bankverbindung;
-    }
-
-    /**
-     * Gets the value of the schaeden property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the schaeden property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getSchaeden().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link SchadenType }
-     * 
-     * 
-     */
-    public List getSchaeden() {
-        if (schaeden == null) {
-            schaeden = new ArrayList();
-        }
-        return this.schaeden;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenmelderType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenmelderType.java
deleted file mode 100644
index c25ad1f3..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenmelderType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Typ um Informationen über den Melder eines Schadens zu übermitteln
- * 
- * 
Java-Klasse für Schadenmelder_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Schadenmelder_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Schadenmelder_Type")
-public abstract class SchadenmelderType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenmelderVermittlerType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenmelderVermittlerType.java
deleted file mode 100644
index 7e19adf6..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenmelderVermittlerType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektSpezifikationType;
-
-
-/**
- * Typ zur Angabe eines Vermittlers als Schadenmelder
- * 
- * 
Java-Klasse für SchadenmelderVermittler_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SchadenmelderVermittler_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ObjektSpezifikation_Type">
- *       <sequence>
- *         <element name="Vermnr" type="{urn:omds20}Vermnr"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SchadenmelderVermittler_Type", propOrder = {
-    "vermnr"
-})
-public class SchadenmelderVermittlerType
-    extends ObjektSpezifikationType
-{
-
-    @XmlElement(name = "Vermnr", required = true)
-    protected String vermnr;
-
-    /**
-     * Ruft den Wert der vermnr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVermnr() {
-        return vermnr;
-    }
-
-    /**
-     * Legt den Wert der vermnr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVermnr(String value) {
-        this.vermnr = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenzuordnungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenzuordnungType.java
deleted file mode 100644
index b7b5bc6e..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SchadenzuordnungType.java
+++ /dev/null
@@ -1,148 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Typ für die Schadenzuordnung, welche eine vierstufige Systematik enthält, wobei die Schlüssel VU-spezifisch sind
- * 
- * 
Java-Klasse für SchadenzuordnungType complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SchadenzuordnungType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="SchadenSparteCd" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="UrsacheCd" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="SpezifikationCd" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="ArtGeschaedigtesObjCd" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SchadenzuordnungType", propOrder = {
-    "schadenSparteCd",
-    "ursacheCd",
-    "spezifikationCd",
-    "artGeschaedigtesObjCd"
-})
-public class SchadenzuordnungType {
-
-    @XmlElement(name = "SchadenSparteCd", required = true)
-    protected String schadenSparteCd;
-    @XmlElement(name = "UrsacheCd")
-    protected String ursacheCd;
-    @XmlElement(name = "SpezifikationCd")
-    protected String spezifikationCd;
-    @XmlElement(name = "ArtGeschaedigtesObjCd")
-    protected String artGeschaedigtesObjCd;
-
-    /**
-     * Ruft den Wert der schadenSparteCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSchadenSparteCd() {
-        return schadenSparteCd;
-    }
-
-    /**
-     * Legt den Wert der schadenSparteCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSchadenSparteCd(String value) {
-        this.schadenSparteCd = value;
-    }
-
-    /**
-     * Ruft den Wert der ursacheCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUrsacheCd() {
-        return ursacheCd;
-    }
-
-    /**
-     * Legt den Wert der ursacheCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUrsacheCd(String value) {
-        this.ursacheCd = value;
-    }
-
-    /**
-     * Ruft den Wert der spezifikationCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSpezifikationCd() {
-        return spezifikationCd;
-    }
-
-    /**
-     * Legt den Wert der spezifikationCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSpezifikationCd(String value) {
-        this.spezifikationCd = value;
-    }
-
-    /**
-     * Ruft den Wert der artGeschaedigtesObjCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getArtGeschaedigtesObjCd() {
-        return artGeschaedigtesObjCd;
-    }
-
-    /**
-     * Legt den Wert der artGeschaedigtesObjCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setArtGeschaedigtesObjCd(String value) {
-        this.artGeschaedigtesObjCd = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SearchClaimRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SearchClaimRequestType.java
deleted file mode 100644
index 8f656baf..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SearchClaimRequestType.java
+++ /dev/null
@@ -1,311 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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 at.vvo.omds.types.omds3Types.r1_7_0.common.AuthorizationFilter;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ZeitraumType;
-
-
-/**
- * Request-Type für die Suche nach einem Schaden
- * 
- * 
Java-Klasse für SearchClaimRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SearchClaimRequest_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="VUNr" type="{urn:omds20}VUNr"/>
- *         <element name="AuthFilter" type="{urn:omds3CommonServiceTypes-1-1-0}AuthorizationFilter" minOccurs="0"/>
- *         <element name="Suchbegriff" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Polizzennr" type="{urn:omds20}Polizzennr" minOccurs="0"/>
- *         <element name="Personennr" type="{urn:omds20}Personennr" minOccurs="0"/>
- *         <element name="Zeitraum" type="{urn:omds3CommonServiceTypes-1-1-0}Zeitraum_Type" minOccurs="0"/>
- *         <element name="BearbStandCd" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}BearbStandCd_Type" minOccurs="0"/>
- *         <element name="MaxResults" type="{http://www.w3.org/2001/XMLSchema}unsignedInt"/>
- *         <element name="Offset" type="{http://www.w3.org/2001/XMLSchema}unsignedInt"/>
- *         <element name="OrderBy" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <enumeration value="Meldedatum aufsteigend"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SearchClaimRequest_Type", propOrder = {
-    "vuNr",
-    "authFilter",
-    "suchbegriff",
-    "polizzennr",
-    "personennr",
-    "zeitraum",
-    "bearbStandCd",
-    "maxResults",
-    "offset",
-    "orderBy"
-})
-public class SearchClaimRequestType {
-
-    @XmlElement(name = "VUNr", required = true)
-    protected String vuNr;
-    @XmlElement(name = "AuthFilter")
-    protected AuthorizationFilter authFilter;
-    @XmlElement(name = "Suchbegriff")
-    protected String suchbegriff;
-    @XmlElement(name = "Polizzennr")
-    protected String polizzennr;
-    @XmlElement(name = "Personennr")
-    protected String personennr;
-    @XmlElement(name = "Zeitraum")
-    protected ZeitraumType zeitraum;
-    @XmlElement(name = "BearbStandCd")
-    protected String bearbStandCd;
-    @XmlElement(name = "MaxResults")
-    @XmlSchemaType(name = "unsignedInt")
-    protected long maxResults;
-    @XmlElement(name = "Offset")
-    @XmlSchemaType(name = "unsignedInt")
-    protected long offset;
-    @XmlElement(name = "OrderBy")
-    protected String orderBy;
-
-    /**
-     * Ruft den Wert der vuNr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVUNr() {
-        return vuNr;
-    }
-
-    /**
-     * Legt den Wert der vuNr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVUNr(String value) {
-        this.vuNr = value;
-    }
-
-    /**
-     * Ruft den Wert der authFilter-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public AuthorizationFilter getAuthFilter() {
-        return authFilter;
-    }
-
-    /**
-     * Legt den Wert der authFilter-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public void setAuthFilter(AuthorizationFilter value) {
-        this.authFilter = value;
-    }
-
-    /**
-     * Ruft den Wert der suchbegriff-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSuchbegriff() {
-        return suchbegriff;
-    }
-
-    /**
-     * Legt den Wert der suchbegriff-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSuchbegriff(String value) {
-        this.suchbegriff = value;
-    }
-
-    /**
-     * Ruft den Wert der polizzennr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolizzennr() {
-        return polizzennr;
-    }
-
-    /**
-     * Legt den Wert der polizzennr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolizzennr(String value) {
-        this.polizzennr = value;
-    }
-
-    /**
-     * Ruft den Wert der personennr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPersonennr() {
-        return personennr;
-    }
-
-    /**
-     * Legt den Wert der personennr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPersonennr(String value) {
-        this.personennr = value;
-    }
-
-    /**
-     * Ruft den Wert der zeitraum-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ZeitraumType }
-     *     
-     */
-    public ZeitraumType getZeitraum() {
-        return zeitraum;
-    }
-
-    /**
-     * Legt den Wert der zeitraum-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ZeitraumType }
-     *     
-     */
-    public void setZeitraum(ZeitraumType value) {
-        this.zeitraum = value;
-    }
-
-    /**
-     * Ruft den Wert der bearbStandCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBearbStandCd() {
-        return bearbStandCd;
-    }
-
-    /**
-     * Legt den Wert der bearbStandCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBearbStandCd(String value) {
-        this.bearbStandCd = value;
-    }
-
-    /**
-     * Ruft den Wert der maxResults-Eigenschaft ab.
-     * 
-     */
-    public long getMaxResults() {
-        return maxResults;
-    }
-
-    /**
-     * Legt den Wert der maxResults-Eigenschaft fest.
-     * 
-     */
-    public void setMaxResults(long value) {
-        this.maxResults = value;
-    }
-
-    /**
-     * Ruft den Wert der offset-Eigenschaft ab.
-     * 
-     */
-    public long getOffset() {
-        return offset;
-    }
-
-    /**
-     * Legt den Wert der offset-Eigenschaft fest.
-     * 
-     */
-    public void setOffset(long value) {
-        this.offset = value;
-    }
-
-    /**
-     * Ruft den Wert der orderBy-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOrderBy() {
-        return orderBy;
-    }
-
-    /**
-     * Legt den Wert der orderBy-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOrderBy(String value) {
-        this.orderBy = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SearchClaimResponseResultType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SearchClaimResponseResultType.java
deleted file mode 100644
index 025d468d..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SearchClaimResponseResultType.java
+++ /dev/null
@@ -1,135 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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;
-
-
-/**
- * Das Ergebnisobjekt der Schadensuche
- * 
- * 
Java-Klasse für SearchClaimResponseResult_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SearchClaimResponseResult_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ActualOffset" type="{http://www.w3.org/2001/XMLSchema}unsignedInt"/>
- *         <element name="ActualMaxResults" type="{http://www.w3.org/2001/XMLSchema}unsignedInt"/>
- *         <element name="TotalResults" type="{http://www.w3.org/2001/XMLSchema}unsignedInt"/>
- *         <element name="Schadenereignisse" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}SchadenereignisLight_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SearchClaimResponseResult_Type", propOrder = {
-    "actualOffset",
-    "actualMaxResults",
-    "totalResults",
-    "schadenereignisse"
-})
-public class SearchClaimResponseResultType {
-
-    @XmlElement(name = "ActualOffset")
-    @XmlSchemaType(name = "unsignedInt")
-    protected long actualOffset;
-    @XmlElement(name = "ActualMaxResults")
-    @XmlSchemaType(name = "unsignedInt")
-    protected long actualMaxResults;
-    @XmlElement(name = "TotalResults")
-    @XmlSchemaType(name = "unsignedInt")
-    protected long totalResults;
-    @XmlElement(name = "Schadenereignisse")
-    protected List schadenereignisse;
-
-    /**
-     * Ruft den Wert der actualOffset-Eigenschaft ab.
-     * 
-     */
-    public long getActualOffset() {
-        return actualOffset;
-    }
-
-    /**
-     * Legt den Wert der actualOffset-Eigenschaft fest.
-     * 
-     */
-    public void setActualOffset(long value) {
-        this.actualOffset = value;
-    }
-
-    /**
-     * Ruft den Wert der actualMaxResults-Eigenschaft ab.
-     * 
-     */
-    public long getActualMaxResults() {
-        return actualMaxResults;
-    }
-
-    /**
-     * Legt den Wert der actualMaxResults-Eigenschaft fest.
-     * 
-     */
-    public void setActualMaxResults(long value) {
-        this.actualMaxResults = value;
-    }
-
-    /**
-     * Ruft den Wert der totalResults-Eigenschaft ab.
-     * 
-     */
-    public long getTotalResults() {
-        return totalResults;
-    }
-
-    /**
-     * Legt den Wert der totalResults-Eigenschaft fest.
-     * 
-     */
-    public void setTotalResults(long value) {
-        this.totalResults = value;
-    }
-
-    /**
-     * Gets the value of the schadenereignisse property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the schadenereignisse property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getSchadenereignisse().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link SchadenereignisLightType }
-     * 
-     * 
-     */
-    public List getSchadenereignisse() {
-        if (schadenereignisse == null) {
-            schadenereignisse = new ArrayList();
-        }
-        return this.schadenereignisse;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SearchClaimResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SearchClaimResponseType.java
deleted file mode 100644
index 13c7f16b..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SearchClaimResponseType.java
+++ /dev/null
@@ -1,100 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ServiceFault;
-
-
-/**
- * Response-Type der Suche nach einem Schaden
- * 
- * 
Java-Klasse für SearchClaimResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SearchClaimResponse_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="Result" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}SearchClaimResponseResult_Type"/>
- *         <element name="ServiceFault" type="{urn:omds3CommonServiceTypes-1-1-0}ServiceFault" maxOccurs="unbounded" minOccurs="0"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SearchClaimResponse_Type", propOrder = {
-    "result",
-    "serviceFault"
-})
-public class SearchClaimResponseType {
-
-    @XmlElement(name = "Result")
-    protected SearchClaimResponseResultType result;
-    @XmlElement(name = "ServiceFault")
-    protected List serviceFault;
-
-    /**
-     * Ruft den Wert der result-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SearchClaimResponseResultType }
-     *     
-     */
-    public SearchClaimResponseResultType getResult() {
-        return result;
-    }
-
-    /**
-     * Legt den Wert der result-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SearchClaimResponseResultType }
-     *     
-     */
-    public void setResult(SearchClaimResponseResultType value) {
-        this.result = value;
-    }
-
-    /**
-     * Gets the value of the serviceFault property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the serviceFault property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getServiceFault().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ServiceFault }
-     * 
-     * 
-     */
-    public List getServiceFault() {
-        if (serviceFault == null) {
-            serviceFault = new ArrayList();
-        }
-        return this.serviceFault;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SpartendetailSchadenKfzType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SpartendetailSchadenKfzType.java
deleted file mode 100644
index d5953be4..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SpartendetailSchadenKfzType.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Spartenerweiterung der Schadenmeldung für Kfz
- * 
- * 
Java-Klasse für SpartendetailSchadenKfz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpartendetailSchadenKfz_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}SpartendetailSchaden_Type">
- *       <sequence>
- *         <element name="BehoerdlichAufgenommen" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="Kennzeichen" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="VerschuldenCd" type="{urn:omds20}VerschuldenCd_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpartendetailSchadenKfz_Type", propOrder = {
-    "behoerdlichAufgenommen",
-    "kennzeichen",
-    "verschuldenCd"
-})
-public class SpartendetailSchadenKfzType
-    extends SpartendetailSchadenType
-{
-
-    @XmlElement(name = "BehoerdlichAufgenommen")
-    protected Boolean behoerdlichAufgenommen;
-    @XmlElement(name = "Kennzeichen", required = true)
-    protected String kennzeichen;
-    @XmlElement(name = "VerschuldenCd")
-    protected String verschuldenCd;
-
-    /**
-     * Ruft den Wert der behoerdlichAufgenommen-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isBehoerdlichAufgenommen() {
-        return behoerdlichAufgenommen;
-    }
-
-    /**
-     * Legt den Wert der behoerdlichAufgenommen-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setBehoerdlichAufgenommen(Boolean value) {
-        this.behoerdlichAufgenommen = value;
-    }
-
-    /**
-     * Ruft den Wert der kennzeichen-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getKennzeichen() {
-        return kennzeichen;
-    }
-
-    /**
-     * Legt den Wert der kennzeichen-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setKennzeichen(String value) {
-        this.kennzeichen = value;
-    }
-
-    /**
-     * Ruft den Wert der verschuldenCd-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVerschuldenCd() {
-        return verschuldenCd;
-    }
-
-    /**
-     * Legt den Wert der verschuldenCd-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVerschuldenCd(String value) {
-        this.verschuldenCd = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SpartendetailSchadenKrankenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SpartendetailSchadenKrankenType.java
deleted file mode 100644
index 7881bdfa..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SpartendetailSchadenKrankenType.java
+++ /dev/null
@@ -1,199 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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;
-
-
-/**
- * Spartenerweiterung der Schadenmeldung für Kranken
- * 
- * 
Java-Klasse für SpartendetailSchadenKranken_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpartendetailSchadenKranken_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}SpartendetailSchaden_Type">
- *       <sequence>
- *         <element name="BehandlerName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Behandlungen" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="BehandlungVon" type="{urn:omds20}Datum"/>
- *                   <element name="BehandlungBis" type="{urn:omds20}Datum" minOccurs="0"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpartendetailSchadenKranken_Type", propOrder = {
-    "behandlerName",
-    "behandlungen"
-})
-public class SpartendetailSchadenKrankenType
-    extends SpartendetailSchadenType
-{
-
-    @XmlElement(name = "BehandlerName", required = true)
-    protected String behandlerName;
-    @XmlElement(name = "Behandlungen")
-    protected List behandlungen;
-
-    /**
-     * Ruft den Wert der behandlerName-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBehandlerName() {
-        return behandlerName;
-    }
-
-    /**
-     * Legt den Wert der behandlerName-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBehandlerName(String value) {
-        this.behandlerName = value;
-    }
-
-    /**
-     * Gets the value of the behandlungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the behandlungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getBehandlungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link SpartendetailSchadenKrankenType.Behandlungen }
-     * 
-     * 
-     */
-    public List getBehandlungen() {
-        if (behandlungen == null) {
-            behandlungen = new ArrayList();
-        }
-        return this.behandlungen;
-    }
-
-
-    /**
-     * 
Java-Klasse für anonymous complex type.
-     * 
-     * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="BehandlungVon" type="{urn:omds20}Datum"/>
-     *         <element name="BehandlungBis" type="{urn:omds20}Datum" minOccurs="0"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "behandlungVon",
-        "behandlungBis"
-    })
-    public static class Behandlungen {
-
-        @XmlElement(name = "BehandlungVon", required = true)
-        @XmlSchemaType(name = "date")
-        protected XMLGregorianCalendar behandlungVon;
-        @XmlElement(name = "BehandlungBis")
-        @XmlSchemaType(name = "date")
-        protected XMLGregorianCalendar behandlungBis;
-
-        /**
-         * Ruft den Wert der behandlungVon-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public XMLGregorianCalendar getBehandlungVon() {
-            return behandlungVon;
-        }
-
-        /**
-         * Legt den Wert der behandlungVon-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public void setBehandlungVon(XMLGregorianCalendar value) {
-            this.behandlungVon = value;
-        }
-
-        /**
-         * Ruft den Wert der behandlungBis-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public XMLGregorianCalendar getBehandlungBis() {
-            return behandlungBis;
-        }
-
-        /**
-         * Legt den Wert der behandlungBis-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public void setBehandlungBis(XMLGregorianCalendar value) {
-            this.behandlungBis = value;
-        }
-
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SpartendetailSchadenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SpartendetailSchadenType.java
deleted file mode 100644
index cf3b4c94..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SpartendetailSchadenType.java
+++ /dev/null
@@ -1,38 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Eine Erweiterung der Schadenmeldung fuer spezielle Sparten
- * 
- * 
Java-Klasse für SpartendetailSchaden_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpartendetailSchaden_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpartendetailSchaden_Type")
-@XmlSeeAlso({
-    SpartendetailSchadenKfzType.class,
-    SpartendetailSchadenUnfallType.class,
-    SpartendetailSchadenKrankenType.class
-})
-public abstract class SpartendetailSchadenType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SpartendetailSchadenUnfallType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SpartendetailSchadenUnfallType.java
deleted file mode 100644
index 372b992c..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SpartendetailSchadenUnfallType.java
+++ /dev/null
@@ -1,154 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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;
-
-
-/**
- * Spartenerweiterung der Schadenmeldung für Unfall
- * 
- * 
Java-Klasse für SpartendetailSchadenUnfall_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpartendetailSchadenUnfall_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}SpartendetailSchaden_Type">
- *       <sequence>
- *         <element name="ArbeitsunfaehigVon" type="{urn:omds20}Datum" minOccurs="0"/>
- *         <element name="ArbeitsunfaehigBis" type="{urn:omds20}Datum" minOccurs="0"/>
- *         <element name="Diagnose" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="BehandlerName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpartendetailSchadenUnfall_Type", propOrder = {
-    "arbeitsunfaehigVon",
-    "arbeitsunfaehigBis",
-    "diagnose",
-    "behandlerName"
-})
-public class SpartendetailSchadenUnfallType
-    extends SpartendetailSchadenType
-{
-
-    @XmlElement(name = "ArbeitsunfaehigVon")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar arbeitsunfaehigVon;
-    @XmlElement(name = "ArbeitsunfaehigBis")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar arbeitsunfaehigBis;
-    @XmlElement(name = "Diagnose", required = true)
-    protected String diagnose;
-    @XmlElement(name = "BehandlerName")
-    protected String behandlerName;
-
-    /**
-     * Ruft den Wert der arbeitsunfaehigVon-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getArbeitsunfaehigVon() {
-        return arbeitsunfaehigVon;
-    }
-
-    /**
-     * Legt den Wert der arbeitsunfaehigVon-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setArbeitsunfaehigVon(XMLGregorianCalendar value) {
-        this.arbeitsunfaehigVon = value;
-    }
-
-    /**
-     * Ruft den Wert der arbeitsunfaehigBis-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getArbeitsunfaehigBis() {
-        return arbeitsunfaehigBis;
-    }
-
-    /**
-     * Legt den Wert der arbeitsunfaehigBis-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setArbeitsunfaehigBis(XMLGregorianCalendar value) {
-        this.arbeitsunfaehigBis = value;
-    }
-
-    /**
-     * Ruft den Wert der diagnose-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDiagnose() {
-        return diagnose;
-    }
-
-    /**
-     * Legt den Wert der diagnose-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDiagnose(String value) {
-        this.diagnose = value;
-    }
-
-    /**
-     * Ruft den Wert der behandlerName-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBehandlerName() {
-        return behandlerName;
-    }
-
-    /**
-     * Legt den Wert der behandlerName-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBehandlerName(String value) {
-        this.behandlerName = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SubmitClaimRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SubmitClaimRequestType.java
deleted file mode 100644
index 4b19d292..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SubmitClaimRequestType.java
+++ /dev/null
@@ -1,103 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.UploadDokumentType;
-
-
-/**
- * Typ für die Durchführung einer Schadenmeldung
- * 
- * 
Java-Klasse für SubmitClaimRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SubmitClaimRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element name="Schadenereignis" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}Schadenereignis_Type" minOccurs="0"/>
- *         <element name="Dokumente" type="{urn:omds3CommonServiceTypes-1-1-0}Upload_Dokument_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SubmitClaimRequest_Type", propOrder = {
-    "schadenereignis",
-    "dokumente"
-})
-public class SubmitClaimRequestType
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "Schadenereignis")
-    protected SchadenereignisType schadenereignis;
-    @XmlElement(name = "Dokumente")
-    protected List dokumente;
-
-    /**
-     * Ruft den Wert der schadenereignis-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SchadenereignisType }
-     *     
-     */
-    public SchadenereignisType getSchadenereignis() {
-        return schadenereignis;
-    }
-
-    /**
-     * Legt den Wert der schadenereignis-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SchadenereignisType }
-     *     
-     */
-    public void setSchadenereignis(SchadenereignisType value) {
-        this.schadenereignis = value;
-    }
-
-    /**
-     * Gets the value of the dokumente property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the dokumente property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDokumente().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link UploadDokumentType }
-     * 
-     * 
-     */
-    public List getDokumente() {
-        if (dokumente == null) {
-            dokumente = new ArrayList();
-        }
-        return this.dokumente;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SubmitClaimResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SubmitClaimResponseType.java
deleted file mode 100644
index 32b80805..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SubmitClaimResponseType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-
-
-/**
- * Anworttyp beim Erzeugen einer Schadenmeldung
- * 
- * 
Java-Klasse für SubmitClaimResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SubmitClaimResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence>
- *         <element name="Schadenereignis" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}Schadenereignis_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SubmitClaimResponse_Type", propOrder = {
-    "schadenereignis"
-})
-public class SubmitClaimResponseType
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "Schadenereignis")
-    protected SchadenereignisType schadenereignis;
-
-    /**
-     * Ruft den Wert der schadenereignis-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SchadenereignisType }
-     *     
-     */
-    public SchadenereignisType getSchadenereignis() {
-        return schadenereignis;
-    }
-
-    /**
-     * Legt den Wert der schadenereignis-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SchadenereignisType }
-     *     
-     */
-    public void setSchadenereignis(SchadenereignisType value) {
-        this.schadenereignis = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SubmitReceiptRequest.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SubmitReceiptRequest.java
deleted file mode 100644
index 6adc021d..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SubmitReceiptRequest.java
+++ /dev/null
@@ -1,250 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-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.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.DokumentDataType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ZahlwegType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element name="Polizzennr" type="{urn:omds20}Polizzennr"/>
- *         <element name="VertragsID" type="{urn:omds20}VertragsID" minOccurs="0"/>
- *         <element name="Betrag" type="{urn:omds20}decimal"/>
- *         <element name="Grund" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Zahlweg" type="{urn:omds3CommonServiceTypes-1-1-0}Zahlweg_Type"/>
- *         <element name="Belege" type="{urn:omds3CommonServiceTypes-1-1-0}DokumentData_Type" maxOccurs="unbounded"/>
- *         <element name="ZusaetzlicheBelegeinreichungsdaten" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}ZusaetzlicheBelegeinreichungsdaten_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "polizzennr",
-    "vertragsID",
-    "betrag",
-    "grund",
-    "zahlweg",
-    "belege",
-    "zusaetzlicheBelegeinreichungsdaten"
-})
-@XmlRootElement(name = "SubmitReceiptRequest")
-public class SubmitReceiptRequest
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "Polizzennr", required = true)
-    protected String polizzennr;
-    @XmlElement(name = "VertragsID")
-    protected String vertragsID;
-    @XmlElement(name = "Betrag", required = true)
-    protected BigDecimal betrag;
-    @XmlElement(name = "Grund")
-    protected String grund;
-    @XmlElement(name = "Zahlweg", required = true)
-    protected ZahlwegType zahlweg;
-    @XmlElement(name = "Belege", required = true)
-    protected List belege;
-    @XmlElement(name = "ZusaetzlicheBelegeinreichungsdaten")
-    protected List zusaetzlicheBelegeinreichungsdaten;
-
-    /**
-     * Ruft den Wert der polizzennr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolizzennr() {
-        return polizzennr;
-    }
-
-    /**
-     * Legt den Wert der polizzennr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolizzennr(String value) {
-        this.polizzennr = value;
-    }
-
-    /**
-     * Ruft den Wert der vertragsID-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVertragsID() {
-        return vertragsID;
-    }
-
-    /**
-     * Legt den Wert der vertragsID-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVertragsID(String value) {
-        this.vertragsID = value;
-    }
-
-    /**
-     * Ruft den Wert der betrag-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getBetrag() {
-        return betrag;
-    }
-
-    /**
-     * Legt den Wert der betrag-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setBetrag(BigDecimal value) {
-        this.betrag = value;
-    }
-
-    /**
-     * Ruft den Wert der grund-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGrund() {
-        return grund;
-    }
-
-    /**
-     * Legt den Wert der grund-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGrund(String value) {
-        this.grund = value;
-    }
-
-    /**
-     * Ruft den Wert der zahlweg-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ZahlwegType }
-     *     
-     */
-    public ZahlwegType getZahlweg() {
-        return zahlweg;
-    }
-
-    /**
-     * Legt den Wert der zahlweg-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ZahlwegType }
-     *     
-     */
-    public void setZahlweg(ZahlwegType value) {
-        this.zahlweg = value;
-    }
-
-    /**
-     * Gets the value of the belege property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the belege property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getBelege().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link DokumentDataType }
-     * 
-     * 
-     */
-    public List getBelege() {
-        if (belege == null) {
-            belege = new ArrayList();
-        }
-        return this.belege;
-    }
-
-    /**
-     * Gets the value of the zusaetzlicheBelegeinreichungsdaten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zusaetzlicheBelegeinreichungsdaten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZusaetzlicheBelegeinreichungsdaten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ZusaetzlicheBelegeinreichungsdatenType }
-     * 
-     * 
-     */
-    public List getZusaetzlicheBelegeinreichungsdaten() {
-        if (zusaetzlicheBelegeinreichungsdaten == null) {
-            zusaetzlicheBelegeinreichungsdaten = new ArrayList();
-        }
-        return this.zusaetzlicheBelegeinreichungsdaten;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SubmitReceiptResponse.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SubmitReceiptResponse.java
deleted file mode 100644
index f8fb6174..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/SubmitReceiptResponse.java
+++ /dev/null
@@ -1,35 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "")
-@XmlRootElement(name = "SubmitReceiptResponse")
-public class SubmitReceiptResponse
-    extends CommonResponseType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ZusaetzlicheBelegeinreichungsdatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ZusaetzlicheBelegeinreichungsdatenType.java
deleted file mode 100644
index 1752349e..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ZusaetzlicheBelegeinreichungsdatenType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Typ fuer die Erweiterung des Service zur Belegeinreichung mit Datentypen, die nicht im Standard halten sind
- * 
- * 
Java-Klasse für ZusaetzlicheBelegeinreichungsdaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheBelegeinreichungsdaten_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheBelegeinreichungsdaten_Type")
-public abstract class ZusaetzlicheBelegeinreichungsdatenType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ZusaetzlicheDeckungsauskunftsdatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ZusaetzlicheDeckungsauskunftsdatenType.java
deleted file mode 100644
index 18b03a78..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ZusaetzlicheDeckungsauskunftsdatenType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Typ fuer die Erweiterung von Anfragen zu Deckungsauskünften mit Datentypen, die nicht im Standard halten sind
- * 
- * 
Java-Klasse für ZusaetzlicheDeckungsauskunftsdaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheDeckungsauskunftsdaten_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheDeckungsauskunftsdaten_Type")
-public abstract class ZusaetzlicheDeckungsauskunftsdatenType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ZusaetzlicheRollendatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ZusaetzlicheRollendatenType.java
deleted file mode 100644
index 4643d6f5..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ZusaetzlicheRollendatenType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Typ fuer die Erweiterung von Rollen um Elemente, die nicht im Standard enthalten sind
- * 
- * 
Java-Klasse für ZusaetzlicheRollendaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheRollendaten_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheRollendaten_Type")
-public abstract class ZusaetzlicheRollendatenType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ZusaetzlicheSchadensdatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ZusaetzlicheSchadensdatenType.java
deleted file mode 100644
index e5088edf..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ZusaetzlicheSchadensdatenType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Typ fuer die Erweiterung von Schäden um Elemente, die nicht im Standard enthalten sind
- * 
- * 
Java-Klasse für ZusaetzlicheSchadensdaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheSchadensdaten_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheSchadensdaten_Type")
-public abstract class ZusaetzlicheSchadensdatenType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ZusaetzlicheSchadensereignisdatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ZusaetzlicheSchadensereignisdatenType.java
deleted file mode 100644
index dd1303fe..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ZusaetzlicheSchadensereignisdatenType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Typ fuer die Erweiterung der Schadensmeldung um Elemente, die nicht im Standard enthalten sind
- * 
- * 
Java-Klasse für ZusaetzlicheSchadensereignisdaten_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusaetzlicheSchadensereignisdaten_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusaetzlicheSchadensereignisdaten_Type")
-public abstract class ZusaetzlicheSchadensereignisdatenType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/package-info.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/package-info.java
deleted file mode 100644
index 176a7b5c..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package at.vvo.omds.types.omds3Types.r1_7_0.on7schaden;
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/OmdsService.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/OmdsService.java
deleted file mode 100644
index c015b4d3..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/OmdsService.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package at.vvo.omds.types.omds3Types.r1_7_0.service;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-import javax.xml.ws.Service;
-
-/**
- * This class was generated by Apache CXF 3.2.0
- * 2021-12-16T15:04:17.861+01:00
- * Generated source version: 3.2.0
- * 
- */
-@WebServiceClient(name = "omdsService", 
-                  wsdlLocation = "file:/C:/Users/jensb/git/omdsservicedefinitions/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3Services.wsdl",
-                  targetNamespace = "urn:omds3Services-1-4-0") 
-public class OmdsService extends Service {
-
-    public final static URL WSDL_LOCATION;
-
-    public final static QName SERVICE = new QName("urn:omds3Services-1-4-0", "omdsService");
-    public final static QName OmdsServicePort = new QName("urn:omds3Services-1-4-0", "omdsServicePort");
-    static {
-        URL url = null;
-        try {
-            url = new URL("file:/C:/Users/jensb/git/omdsservicedefinitions/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3Services.wsdl");
-        } catch (MalformedURLException e) {
-            java.util.logging.Logger.getLogger(OmdsService.class.getName())
-                .log(java.util.logging.Level.INFO, 
-                     "Can not initialize the default wsdl from {0}", "file:/C:/Users/jensb/git/omdsservicedefinitions/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3Services.wsdl");
-        }
-        WSDL_LOCATION = url;
-    }
-
-    public OmdsService(URL wsdlLocation) {
-        super(wsdlLocation, SERVICE);
-    }
-
-    public OmdsService(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public OmdsService() {
-        super(WSDL_LOCATION, SERVICE);
-    }
-    
-    public OmdsService(WebServiceFeature ... features) {
-        super(WSDL_LOCATION, SERVICE, features);
-    }
-
-    public OmdsService(URL wsdlLocation, WebServiceFeature ... features) {
-        super(wsdlLocation, SERVICE, features);
-    }
-
-    public OmdsService(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
-        super(wsdlLocation, serviceName, features);
-    }    
-
-
-
-
-    /**
-     *
-     * @return
-     *     returns OmdsServicePortType
-     */
-    @WebEndpoint(name = "omdsServicePort")
-    public OmdsServicePortType getOmdsServicePort() {
-        return super.getPort(OmdsServicePort, OmdsServicePortType.class);
-    }
-
-    /**
-     * 
-     * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the features parameter will have their default values.
-     * @return
-     *     returns OmdsServicePortType
-     */
-    @WebEndpoint(name = "omdsServicePort")
-    public OmdsServicePortType getOmdsServicePort(WebServiceFeature... features) {
-        return super.getPort(OmdsServicePort, OmdsServicePortType.class, features);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/OmdsServicePortImpl.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/OmdsServicePortImpl.java
deleted file mode 100644
index 9e426fa6..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/OmdsServicePortImpl.java
+++ /dev/null
@@ -1,947 +0,0 @@
-
-/**
- * Please modify this class to meet your needs
- * This class is not complete
- */
-
-package at.vvo.omds.types.omds3Types.r1_7_0.service;
-
-import java.util.logging.Logger;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-
-/**
- * This class was generated by Apache CXF 3.2.0
- * 2021-12-16T15:04:17.798+01:00
- * Generated source version: 3.2.0
- * 
- */
-
-@javax.jws.WebService(
-                      serviceName = "omdsService",
-                      portName = "omdsServicePort",
-                      targetNamespace = "urn:omds3Services-1-4-0",
-                      wsdlLocation = "file:/C:/Users/jensb/git/omdsservicedefinitions/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3Services.wsdl",
-                      endpointInterface = "at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType")
-                      
-public class OmdsServicePortImpl implements OmdsServicePortType {
-
-    private static final Logger LOG = Logger.getLogger(OmdsServicePortImpl.class.getName());
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#calculateLeben(leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CalculateLebenRequestType parameters)*
-     */
-    public leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CalculateLebenResponseType calculateLeben(leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CalculateLebenRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation calculateLeben");
-        System.out.println(parameters);
-        try {
-            leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CalculateLebenResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#addDocToBusinessCase(at.vvo.omds.types.omds3Types.r1_7_0.on1basis.AddDocToBusinessCaseRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.on1basis.AddDocToBusinessCaseResponseType addDocToBusinessCase(at.vvo.omds.types.omds3Types.r1_7_0.on1basis.AddDocToBusinessCaseRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation addDocToBusinessCase");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on1basis.AddDocToBusinessCaseResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#checkAddress(on4partner._0._4.v1.omds3types.types.omds.vvo.at.CheckAddressRequestType parameters)*
-     */
-    public on4partner._0._4.v1.omds3types.types.omds.vvo.at.CheckAddressResponseType checkAddress(on4partner._0._4.v1.omds3types.types.omds.vvo.at.CheckAddressRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation checkAddress");
-        System.out.println(parameters);
-        try {
-            on4partner._0._4.v1.omds3types.types.omds.vvo.at.CheckAddressResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#addCommunicationObject(on4partner._0._4.v1.omds3types.types.omds.vvo.at.AddCommunicationObjectRequestType parameters)*
-     */
-    public on4partner._0._4.v1.omds3types.types.omds.vvo.at.AddCommunicationObjectResponseType addCommunicationObject(on4partner._0._4.v1.omds3types.types.omds.vvo.at.AddCommunicationObjectRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation addCommunicationObject");
-        System.out.println(parameters);
-        try {
-            on4partner._0._4.v1.omds3types.types.omds.vvo.at.AddCommunicationObjectResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#calculateRechtsschutz(rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CalculateRechtsschutzRequest parameters)*
-     */
-    public rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CalculateRechtsschutzResponse calculateRechtsschutz(rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CalculateRechtsschutzRequest parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation calculateRechtsschutz");
-        System.out.println(parameters);
-        try {
-            rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CalculateRechtsschutzResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#createApplicationKfz(at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CreateApplicationKfzRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CreateApplicationKfzResponseType createApplicationKfz(at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CreateApplicationKfzRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation createApplicationKfz");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CreateApplicationKfzResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#submitReceipt(at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SubmitReceiptRequest parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SubmitReceiptResponse submitReceipt(at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SubmitReceiptRequest parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation submitReceipt");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SubmitReceiptResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#createOfferKfz(at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CreateOfferKfzRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CreateOfferKfzResponseType createOfferKfz(at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CreateOfferKfzRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation createOfferKfz");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CreateOfferKfzResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#submitApplicationLeben(leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.SubmitApplicationLebenRequestType parameters)*
-     */
-    public leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.SubmitApplicationLebenResponseType submitApplicationLeben(leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.SubmitApplicationLebenRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation submitApplicationLeben");
-        System.out.println(parameters);
-        try {
-            leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.SubmitApplicationLebenResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#createOfferRechtsschutz(rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateOfferRechtsschutzRequest parameters)*
-     */
-    public rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateOfferRechtsschutzResponse createOfferRechtsschutz(rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateOfferRechtsschutzRequest parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation createOfferRechtsschutz");
-        System.out.println(parameters);
-        try {
-            rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateOfferRechtsschutzResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#searchClaim(at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SearchClaimRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SearchClaimResponseType searchClaim(at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SearchClaimRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation searchClaim");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SearchClaimResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#getStateChanges(at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetStateChangesRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetStateChangesResponseType getStateChanges(at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetStateChangesRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation getStateChanges");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetStateChangesResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#changePersonData(on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangePersonDataRequestType parameters)*
-     */
-    public on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangePersonDataResponseType changePersonData(on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangePersonDataRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation changePersonData");
-        System.out.println(parameters);
-        try {
-            on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangePersonDataResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#submitClaim(at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SubmitClaimRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SubmitClaimResponseType submitClaim(at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SubmitClaimRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation submitClaim");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SubmitClaimResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#deepLinkOffer(at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkOfferRequest parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkBusinessObjectResponse deepLinkOffer(at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkOfferRequest parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation deepLinkOffer");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkBusinessObjectResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#getStateSignatures(at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetStateSignaturesRequest parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetStateSignaturesResponse getStateSignatures(at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetStateSignaturesRequest parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation getStateSignatures");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetStateSignaturesResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#getDocumentsOfPeriod(at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetDocumentsOfPeriodRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetDocumentsOfPeriodResponseType getDocumentsOfPeriod(at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetDocumentsOfPeriodRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation getDocumentsOfPeriod");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetDocumentsOfPeriodResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#findVerkaufsprodukt(produktfinder.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.VerkaufsproduktFinderRequestType parameters)*
-     */
-    public produktfinder.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.VerkaufsproduktFinderResponseType findVerkaufsprodukt(produktfinder.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.VerkaufsproduktFinderRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation findVerkaufsprodukt");
-        System.out.println(parameters);
-        try {
-            produktfinder.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.VerkaufsproduktFinderResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#getPoliciesOfPartner(on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.GetPoliciesOfPartnerRequestType parameters)*
-     */
-    public on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.GetPoliciesOfPartnerResponseType getPoliciesOfPartner(on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.GetPoliciesOfPartnerRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation getPoliciesOfPartner");
-        System.out.println(parameters);
-        try {
-            on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.GetPoliciesOfPartnerResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#createApplicationUnfall(unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateApplicationUnfallRequestType parameters)*
-     */
-    public unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateApplicationUnfallResponseType createApplicationUnfall(unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateApplicationUnfallRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation createApplicationUnfall");
-        System.out.println(parameters);
-        try {
-            unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateApplicationUnfallResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#calculateKranken(kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CalculateKrankenRequest parameters)*
-     */
-    public kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CalculateKrankenResponse calculateKranken(kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CalculateKrankenRequest parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation calculateKranken");
-        System.out.println(parameters);
-        try {
-            kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CalculateKrankenResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#deleteCommunicationObject(on4partner._0._4.v1.omds3types.types.omds.vvo.at.DeleteCommunicationObjectRequestType parameters)*
-     */
-    public on4partner._0._4.v1.omds3types.types.omds.vvo.at.DeleteCommunicationObjectResponseType deleteCommunicationObject(on4partner._0._4.v1.omds3types.types.omds.vvo.at.DeleteCommunicationObjectRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation deleteCommunicationObject");
-        System.out.println(parameters);
-        try {
-            on4partner._0._4.v1.omds3types.types.omds.vvo.at.DeleteCommunicationObjectResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#checkClaim(at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.CheckClaimRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.CheckClaimResponseType checkClaim(at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.CheckClaimRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation checkClaim");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.CheckClaimResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#getPartner(on4partner._0._4.v1.omds3types.types.omds.vvo.at.GetPartnerRequestType parameters)*
-     */
-    public on4partner._0._4.v1.omds3types.types.omds.vvo.at.GetPartnerResponseType getPartner(on4partner._0._4.v1.omds3types.types.omds.vvo.at.GetPartnerRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation getPartner");
-        System.out.println(parameters);
-        try {
-            on4partner._0._4.v1.omds3types.types.omds.vvo.at.GetPartnerResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#createApplicationLeben(leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CreateApplicationLebenRequestType parameters)*
-     */
-    public leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CreateApplicationLebenResponseType createApplicationLeben(leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CreateApplicationLebenRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation createApplicationLeben");
-        System.out.println(parameters);
-        try {
-            leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CreateApplicationLebenResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#createOfferUnfall(unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateOfferUnfallRequestType parameters)*
-     */
-    public unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateOfferUnfallResponseType createOfferUnfall(unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateOfferUnfallRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation createOfferUnfall");
-        System.out.println(parameters);
-        try {
-            unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateOfferUnfallResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#getArcImageInfos(at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.ArcImageInfosRequest parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.ArcImageInfosResponse getArcImageInfos(at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.ArcImageInfosRequest parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation getArcImageInfos");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.ArcImageInfosResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#getOMDSPackageList(at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.OMDSPackageListRequest parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.OMDSPackageListResponse getOMDSPackageList(at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.OMDSPackageListRequest parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation getOMDSPackageList");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.OMDSPackageListResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#createApplicationKranken(kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CreateApplicationKrankenRequest parameters)*
-     */
-    public kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CreateApplicationKrankenResponse createApplicationKranken(kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CreateApplicationKrankenRequest parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation createApplicationKranken");
-        System.out.println(parameters);
-        try {
-            kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CreateApplicationKrankenResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#calculateSachPrivat(at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CalculateSachPrivatRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CalculateSachPrivatResponseType calculateSachPrivat(at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CalculateSachPrivatRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation calculateSachPrivat");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CalculateSachPrivatResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#createApplicationRechtsschutz(rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateApplicationRechtsschutzRequest parameters)*
-     */
-    public rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateApplicationRechtsschutzResponse createApplicationRechtsschutz(rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateApplicationRechtsschutzRequest parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation createApplicationRechtsschutz");
-        System.out.println(parameters);
-        try {
-            rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateApplicationRechtsschutzResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#deepLinkPartner(at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkPartnerRequest parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkBusinessObjectResponse deepLinkPartner(at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkPartnerRequest parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation deepLinkPartner");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkBusinessObjectResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#deepLinkPolicy(at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkPolicyRequest parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkBusinessObjectResponse deepLinkPolicy(at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkPolicyRequest parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation deepLinkPolicy");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkBusinessObjectResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#getUserData(at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.UserDataRequest parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.UserDataResponse getUserData(at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.UserDataRequest parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation getUserData");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.UserDataResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#deepLinkClaim(at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkClaimRequest parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkBusinessObjectResponse deepLinkClaim(at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkClaimRequest parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation deepLinkClaim");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkBusinessObjectResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#checkCoverage(at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.CheckCoverageRequest parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.CheckCoverageResponse checkCoverage(at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.CheckCoverageRequest parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation checkCoverage");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.CheckCoverageResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#submitApplicationKranken(kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.SubmitApplicationKrankenRequest parameters)*
-     */
-    public kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.SubmitApplicationKrankenResponse submitApplicationKranken(kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.SubmitApplicationKrankenRequest parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation submitApplicationKranken");
-        System.out.println(parameters);
-        try {
-            kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.SubmitApplicationKrankenResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#collectionChange(on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.CollectionChangeRequest parameters)*
-     */
-    public on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.CollectionChangeResponse collectionChange(on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.CollectionChangeRequest parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation collectionChange");
-        System.out.println(parameters);
-        try {
-            on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.CollectionChangeResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#getOMDSPackage(at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.OMDSPackageRequest parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.OMDSPackageResponse getOMDSPackage(at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.OMDSPackageRequest parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation getOMDSPackage");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.OMDSPackageResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#getNumberOfDocuments(at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetNumberOfDocumentsRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetNumberOfDocumentsResponseType getNumberOfDocuments(at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetNumberOfDocumentsRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation getNumberOfDocuments");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetNumberOfDocumentsResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#calculateUnfall(unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CalculateUnfallRequestType parameters)*
-     */
-    public unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CalculateUnfallResponseType calculateUnfall(unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CalculateUnfallRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation calculateUnfall");
-        System.out.println(parameters);
-        try {
-            unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CalculateUnfallResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#submitApplicationUnfall(unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SubmitApplicationUnfallRequestType parameters)*
-     */
-    public unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SubmitApplicationUnfallResponseType submitApplicationUnfall(unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SubmitApplicationUnfallRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation submitApplicationUnfall");
-        System.out.println(parameters);
-        try {
-            unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SubmitApplicationUnfallResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#getDocumentsOfObject(at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetDocumentsOfObjectRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetDocumentsOfObjectResponseType getDocumentsOfObject(at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetDocumentsOfObjectRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation getDocumentsOfObject");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetDocumentsOfObjectResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#calculateKfz(at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CalculateKfzRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CalculateKfzResponseType calculateKfz(at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CalculateKfzRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation calculateKfz");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CalculateKfzResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#createOfferKranken(kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CreateOfferKrankenRequest parameters)*
-     */
-    public kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CreateOfferKrankenResponse createOfferKranken(kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CreateOfferKrankenRequest parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation createOfferKranken");
-        System.out.println(parameters);
-        try {
-            kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CreateOfferKrankenResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#changeCommunicationObject(on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangeCommunicationObjectRequestType parameters)*
-     */
-    public on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangeCommunicationObjectResponse changeCommunicationObject(on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangeCommunicationObjectRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation changeCommunicationObject");
-        System.out.println(parameters);
-        try {
-            on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangeCommunicationObjectResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#createOfferSachPrivat(at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CreateOfferSachPrivatRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CreateOfferSachPrivatResponseType createOfferSachPrivat(at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CreateOfferSachPrivatRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation createOfferSachPrivat");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CreateOfferSachPrivatResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#createApplicationSachPrivat(at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CreateApplicationSachPrivatRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CreateApplicationSachPrivatResponseType createApplicationSachPrivat(at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CreateApplicationSachPrivatRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation createApplicationSachPrivat");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CreateApplicationSachPrivatResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#getClaim(at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.GetClaimRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.GetClaimResponseType getClaim(at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.GetClaimRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation getClaim");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.GetClaimResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#getArcImage(at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.ArcImageRequest parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.ArcImageResponse getArcImage(at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.ArcImageRequest parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation getArcImage");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.ArcImageResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#setMailingAddress(on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.SetMailingAddressRequestType parameters)*
-     */
-    public on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.SetMailingAddressResponseType setMailingAddress(on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.SetMailingAddressRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation setMailingAddress");
-        System.out.println(parameters);
-        try {
-            on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.SetMailingAddressResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#submitApplicationRechtsschutz(rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SubmitApplicationRechtsschutzRequest parameters)*
-     */
-    public rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SubmitApplicationRechtsschutzResponse submitApplicationRechtsschutz(rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SubmitApplicationRechtsschutzRequest parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation submitApplicationRechtsschutz");
-        System.out.println(parameters);
-        try {
-            rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SubmitApplicationRechtsschutzResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#createOfferLeben(leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CreateOfferLebenRequestType parameters)*
-     */
-    public leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CreateOfferLebenResponseType createOfferLeben(leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CreateOfferLebenRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation createOfferLeben");
-        System.out.println(parameters);
-        try {
-            leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CreateOfferLebenResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#login(at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.LoginRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkBusinessObjectResponse login(at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.LoginRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation login");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkBusinessObjectResponse _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#changePartnerMainAddress(on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangePartnerMainAddressRequestType parameters)*
-     */
-    public on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangePartnerMainAddressResponseType changePartnerMainAddress(on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangePartnerMainAddressRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation changePartnerMainAddress");
-        System.out.println(parameters);
-        try {
-            on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangePartnerMainAddressResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#submitApplicationKfz(at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.SubmitApplicationKfzRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.SubmitApplicationKfzResponseType submitApplicationKfz(at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.SubmitApplicationKfzRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation submitApplicationKfz");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.SubmitApplicationKfzResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_7_0.service.OmdsServicePortType#submitApplicationSachPrivat(at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.SubmitApplicationSachPrivatRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.SubmitApplicationSachPrivatResponseType submitApplicationSachPrivat(at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.SubmitApplicationSachPrivatRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation submitApplicationSachPrivat");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.SubmitApplicationSachPrivatResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/OmdsServicePortType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/OmdsServicePortType.java
deleted file mode 100644
index f135341c..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/OmdsServicePortType.java
+++ /dev/null
@@ -1,419 +0,0 @@
-package at.vvo.omds.types.omds3Types.r1_7_0.service;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-
-/**
- * This class was generated by Apache CXF 3.2.0
- * 2021-12-16T15:04:17.840+01:00
- * Generated source version: 3.2.0
- * 
- */
-@WebService(targetNamespace = "urn:omds3Services-1-4-0", name = "omdsServicePortType")
-@XmlSeeAlso({at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_7_0.common.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.ObjectFactory.class, produktfinder.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_7_0.on1basis.ObjectFactory.class, on4partner._0._4.v1.omds3types.types.omds.vvo.at.ObjectFactory.class, leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.ObjectFactory.class, kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.ObjectFactory.class, on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.ObjectFactory.class, unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.ObjectFactory.class, rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.ObjectFactory.class, at.vvo.omds.types.omds2Types.v2_14.ObjectFactory.class})
-@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-public interface OmdsServicePortType {
-
-    @WebMethod(action = "urn:calculateLeben")
-    @WebResult(name = "CalculateLebenResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", partName = "parameters")
-    public leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CalculateLebenResponseType calculateLeben(
-        @WebParam(partName = "parameters", name = "CalculateLebenRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben")
-        leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CalculateLebenRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:addDocToBusinessCase")
-    @WebResult(name = "AddDocToBusinessCaseResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.on1basis.AddDocToBusinessCaseResponseType addDocToBusinessCase(
-        @WebParam(partName = "parameters", name = "AddDocToBusinessCaseRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen")
-        at.vvo.omds.types.omds3Types.r1_7_0.on1basis.AddDocToBusinessCaseRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:checkAddress")
-    @WebResult(name = "CheckAddressResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", partName = "parameters")
-    public on4partner._0._4.v1.omds3types.types.omds.vvo.at.CheckAddressResponseType checkAddress(
-        @WebParam(partName = "parameters", name = "CheckAddressRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner")
-        on4partner._0._4.v1.omds3types.types.omds.vvo.at.CheckAddressRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:addCommunicationObject")
-    @WebResult(name = "AddCommunicationObjectResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", partName = "parameters")
-    public on4partner._0._4.v1.omds3types.types.omds.vvo.at.AddCommunicationObjectResponseType addCommunicationObject(
-        @WebParam(partName = "parameters", name = "AddCommunicationObjectRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner")
-        on4partner._0._4.v1.omds3types.types.omds.vvo.at.AddCommunicationObjectRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:calculateRechtsschutz")
-    @WebResult(name = "CalculateRechtsschutzResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs", partName = "parameters")
-    public rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CalculateRechtsschutzResponse calculateRechtsschutz(
-        @WebParam(partName = "parameters", name = "CalculateRechtsschutzRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs")
-        rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CalculateRechtsschutzRequest parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:createApplicationKfz")
-    @WebResult(name = "CreateApplicationKfzResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CreateApplicationKfzResponseType createApplicationKfz(
-        @WebParam(partName = "parameters", name = "CreateApplicationKfzRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz")
-        at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CreateApplicationKfzRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:submitReceipt")
-    @WebResult(name = "SubmitReceiptResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SubmitReceiptResponse submitReceipt(
-        @WebParam(partName = "parameters", name = "SubmitReceiptRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden")
-        at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SubmitReceiptRequest parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:createOfferKfz")
-    @WebResult(name = "CreateOfferKfzResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CreateOfferKfzResponseType createOfferKfz(
-        @WebParam(partName = "parameters", name = "CreateOfferKfzRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz")
-        at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CreateOfferKfzRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:submitApplicationLeben")
-    @WebResult(name = "SubmitApplicationLebenResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", partName = "parameters")
-    public leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.SubmitApplicationLebenResponseType submitApplicationLeben(
-        @WebParam(partName = "parameters", name = "SubmitApplicationLebenRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben")
-        leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.SubmitApplicationLebenRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:createOfferRechtsschutz")
-    @WebResult(name = "CreateOfferRechtsschutzResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs", partName = "parameters")
-    public rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateOfferRechtsschutzResponse createOfferRechtsschutz(
-        @WebParam(partName = "parameters", name = "CreateOfferRechtsschutzRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs")
-        rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateOfferRechtsschutzRequest parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:searchClaim")
-    @WebResult(name = "SearchClaimResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SearchClaimResponseType searchClaim(
-        @WebParam(partName = "parameters", name = "SearchClaimRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden")
-        at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SearchClaimRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:getStateChanges")
-    @WebResult(name = "GetStateChangesResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetStateChangesResponseType getStateChanges(
-        @WebParam(partName = "parameters", name = "GetStateChangesRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen")
-        at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetStateChangesRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:changePersonData")
-    @WebResult(name = "ChangePersonDataResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", partName = "parameters")
-    public on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangePersonDataResponseType changePersonData(
-        @WebParam(partName = "parameters", name = "ChangePersonDataRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner")
-        on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangePersonDataRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:submitClaim")
-    @WebResult(name = "SubmitClaimResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SubmitClaimResponseType submitClaim(
-        @WebParam(partName = "parameters", name = "SubmitClaimRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden")
-        at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SubmitClaimRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:deepLinkOffer")
-    @WebResult(name = "getDeepLinkOfferResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkBusinessObjectResponse deepLinkOffer(
-        @WebParam(partName = "parameters", name = "getDeepLinkOfferRequest", targetNamespace = "urn:omds3ServiceTypes-1-1-0")
-        at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkOfferRequest parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:getStateSignatures")
-    @WebResult(name = "GetStateSignaturesResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetStateSignaturesResponse getStateSignatures(
-        @WebParam(partName = "parameters", name = "GetStateSignaturesRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen")
-        at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetStateSignaturesRequest parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:getDocumentsOfPeriod")
-    @WebResult(name = "GetDocumentsOfPeriodResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetDocumentsOfPeriodResponseType getDocumentsOfPeriod(
-        @WebParam(partName = "parameters", name = "GetDocumentsOfPeriodRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen")
-        at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetDocumentsOfPeriodRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:findVerkaufsprodukt")
-    @WebResult(name = "VerkaufsproduktfinderResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.produktfinder", partName = "parameters")
-    public produktfinder.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.VerkaufsproduktFinderResponseType findVerkaufsprodukt(
-        @WebParam(partName = "parameters", name = "VerkaufsproduktfinderRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.produktfinder")
-        produktfinder.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.VerkaufsproduktFinderRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:changePersonData")
-    @WebResult(name = "GetPoliciesOfPartnerResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag", partName = "parameters")
-    public on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.GetPoliciesOfPartnerResponseType getPoliciesOfPartner(
-        @WebParam(partName = "parameters", name = "GetPoliciesOfPartnerRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag")
-        on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.GetPoliciesOfPartnerRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:createApplicationUnfall")
-    @WebResult(name = "CreateApplicationUnfallResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", partName = "parameters")
-    public unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateApplicationUnfallResponseType createApplicationUnfall(
-        @WebParam(partName = "parameters", name = "CreateApplicationUnfallRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall")
-        unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateApplicationUnfallRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:calculateKranken")
-    @WebResult(name = "CalculateKrankenResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken", partName = "parameters")
-    public kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CalculateKrankenResponse calculateKranken(
-        @WebParam(partName = "parameters", name = "CalculateKrankenRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken")
-        kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CalculateKrankenRequest parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:deleteCommunicationObject")
-    @WebResult(name = "DeleteCommunicationObjectResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", partName = "parameters")
-    public on4partner._0._4.v1.omds3types.types.omds.vvo.at.DeleteCommunicationObjectResponseType deleteCommunicationObject(
-        @WebParam(partName = "parameters", name = "DeleteCommunicationObjectRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner")
-        on4partner._0._4.v1.omds3types.types.omds.vvo.at.DeleteCommunicationObjectRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:checkClaim")
-    @WebResult(name = "CheckClaimResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.CheckClaimResponseType checkClaim(
-        @WebParam(partName = "parameters", name = "CheckClaimRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden")
-        at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.CheckClaimRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:getPartner")
-    @WebResult(name = "GetPartnerResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", partName = "parameters")
-    public on4partner._0._4.v1.omds3types.types.omds.vvo.at.GetPartnerResponseType getPartner(
-        @WebParam(partName = "parameters", name = "GetPartnerRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner")
-        on4partner._0._4.v1.omds3types.types.omds.vvo.at.GetPartnerRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:createApplicationLeben")
-    @WebResult(name = "CreateApplicationLebenResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", partName = "parameters")
-    public leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CreateApplicationLebenResponseType createApplicationLeben(
-        @WebParam(partName = "parameters", name = "CreateApplicationLebenRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben")
-        leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CreateApplicationLebenRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:createOfferUnfall")
-    @WebResult(name = "CreateOfferUnfallResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", partName = "parameters")
-    public unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateOfferUnfallResponseType createOfferUnfall(
-        @WebParam(partName = "parameters", name = "CreateOfferUnfallRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall")
-        unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateOfferUnfallRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:getArcImageInfos")
-    @WebResult(name = "getArcImageInfosResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.ArcImageInfosResponse getArcImageInfos(
-        @WebParam(partName = "parameters", name = "getArcImageInfosRequest", targetNamespace = "urn:omds3ServiceTypes-1-1-0")
-        at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.ArcImageInfosRequest parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:getOMDSPackageList")
-    @WebResult(name = "getOMDSPackageListResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.OMDSPackageListResponse getOMDSPackageList(
-        @WebParam(partName = "parameters", name = "getOMDSPackageListRequest", targetNamespace = "urn:omds3ServiceTypes-1-1-0")
-        at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.OMDSPackageListRequest parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:createApplicationKranken")
-    @WebResult(name = "CreateApplicationKrankenResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken", partName = "parameters")
-    public kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CreateApplicationKrankenResponse createApplicationKranken(
-        @WebParam(partName = "parameters", name = "CreateApplicationKrankenRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken")
-        kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CreateApplicationKrankenRequest parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:calculateSachPrivat")
-    @WebResult(name = "CalculateSachPrivatResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CalculateSachPrivatResponseType calculateSachPrivat(
-        @WebParam(partName = "parameters", name = "CalculateSachPrivatRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat")
-        at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CalculateSachPrivatRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:createApplicationRechtsschutz")
-    @WebResult(name = "CreateApplicationRechtsschutzResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs", partName = "parameters")
-    public rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateApplicationRechtsschutzResponse createApplicationRechtsschutz(
-        @WebParam(partName = "parameters", name = "CreateApplicationRechtsschutzRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs")
-        rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateApplicationRechtsschutzRequest parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:deepLinkPartner")
-    @WebResult(name = "getDeepLinkPartnerResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkBusinessObjectResponse deepLinkPartner(
-        @WebParam(partName = "parameters", name = "getDeepLinkPartnerRequest", targetNamespace = "urn:omds3ServiceTypes-1-1-0")
-        at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkPartnerRequest parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:deepLinkPolicy")
-    @WebResult(name = "getDeepLinkPolicyResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkBusinessObjectResponse deepLinkPolicy(
-        @WebParam(partName = "parameters", name = "getDeepLinkPolicyRequest", targetNamespace = "urn:omds3ServiceTypes-1-1-0")
-        at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkPolicyRequest parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:getUserData")
-    @WebResult(name = "getUserDataResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.UserDataResponse getUserData(
-        @WebParam(partName = "parameters", name = "getUserDataRequest", targetNamespace = "urn:omds3ServiceTypes-1-1-0")
-        at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.UserDataRequest parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:deepLinkClaim")
-    @WebResult(name = "getDeepLinkClaimResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkBusinessObjectResponse deepLinkClaim(
-        @WebParam(partName = "parameters", name = "getDeepLinkClaimRequest", targetNamespace = "urn:omds3ServiceTypes-1-1-0")
-        at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkClaimRequest parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:checkCoverage")
-    @WebResult(name = "CheckCoverageResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.CheckCoverageResponse checkCoverage(
-        @WebParam(partName = "parameters", name = "CheckCoverageRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden")
-        at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.CheckCoverageRequest parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:submitApplicationKranken")
-    @WebResult(name = "SubmitApplicationKrankenResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken", partName = "parameters")
-    public kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.SubmitApplicationKrankenResponse submitApplicationKranken(
-        @WebParam(partName = "parameters", name = "SubmitApplicationKrankenRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken")
-        kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.SubmitApplicationKrankenRequest parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:collectionChange")
-    @WebResult(name = "CollectionChangeResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag", partName = "parameters")
-    public on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.CollectionChangeResponse collectionChange(
-        @WebParam(partName = "parameters", name = "CollectionChangeRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag")
-        on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.CollectionChangeRequest parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:getOMDSPackage")
-    @WebResult(name = "getOMDSPackageResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.OMDSPackageResponse getOMDSPackage(
-        @WebParam(partName = "parameters", name = "getOMDSPackageRequest", targetNamespace = "urn:omds3ServiceTypes-1-1-0")
-        at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.OMDSPackageRequest parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:getNumberOfDocuments")
-    @WebResult(name = "GetNumberOfDocumentsResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetNumberOfDocumentsResponseType getNumberOfDocuments(
-        @WebParam(partName = "parameters", name = "GetNumberOfDocumentsRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen")
-        at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetNumberOfDocumentsRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:calculateUnfall")
-    @WebResult(name = "CalculateUnfallResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", partName = "parameters")
-    public unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CalculateUnfallResponseType calculateUnfall(
-        @WebParam(partName = "parameters", name = "CalculateUnfallRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall")
-        unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CalculateUnfallRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:submitApplicationUnfall")
-    @WebResult(name = "SubmitApplicationUnfallResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", partName = "parameters")
-    public unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SubmitApplicationUnfallResponseType submitApplicationUnfall(
-        @WebParam(partName = "parameters", name = "SubmitApplicationUnfallRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall")
-        unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SubmitApplicationUnfallRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:getDocumentsOfObject")
-    @WebResult(name = "GetDocumentsOfObjectResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetDocumentsOfObjectResponseType getDocumentsOfObject(
-        @WebParam(partName = "parameters", name = "GetDocumentsOfObjectRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen")
-        at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetDocumentsOfObjectRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:calculateKfz")
-    @WebResult(name = "CalculateKfzResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CalculateKfzResponseType calculateKfz(
-        @WebParam(partName = "parameters", name = "CalculateKfzRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz")
-        at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CalculateKfzRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:createOfferKranken")
-    @WebResult(name = "CreateOfferKrankenResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken", partName = "parameters")
-    public kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CreateOfferKrankenResponse createOfferKranken(
-        @WebParam(partName = "parameters", name = "CreateOfferKrankenRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken")
-        kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CreateOfferKrankenRequest parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:changeCommunicationObject")
-    @WebResult(name = "ChangeCommunicationObjectResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", partName = "parameters")
-    public on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangeCommunicationObjectResponse changeCommunicationObject(
-        @WebParam(partName = "parameters", name = "ChangeCommunicationObjectRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner")
-        on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangeCommunicationObjectRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:createOfferSachPrivat")
-    @WebResult(name = "CreateOfferSachPrivatResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CreateOfferSachPrivatResponseType createOfferSachPrivat(
-        @WebParam(partName = "parameters", name = "CreateOfferSachPrivatRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat")
-        at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CreateOfferSachPrivatRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:createApplicationSachPrivat")
-    @WebResult(name = "CreateApplicationSachPrivatResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CreateApplicationSachPrivatResponseType createApplicationSachPrivat(
-        @WebParam(partName = "parameters", name = "CreateApplicationSachPrivatRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat")
-        at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CreateApplicationSachPrivatRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:getClaim")
-    @WebResult(name = "GetClaimResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.GetClaimResponseType getClaim(
-        @WebParam(partName = "parameters", name = "GetClaimRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden")
-        at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.GetClaimRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:getArcImage")
-    @WebResult(name = "getArcImageResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.ArcImageResponse getArcImage(
-        @WebParam(partName = "parameters", name = "getArcImageRequest", targetNamespace = "urn:omds3ServiceTypes-1-1-0")
-        at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.ArcImageRequest parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:setMailingAddress")
-    @WebResult(name = "SetMailingAddressResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag", partName = "parameters")
-    public on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.SetMailingAddressResponseType setMailingAddress(
-        @WebParam(partName = "parameters", name = "SetMailingAddressRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag")
-        on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.SetMailingAddressRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:submitApplicationRechtsschutz")
-    @WebResult(name = "SubmitApplicationRechtsschutzResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs", partName = "parameters")
-    public rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SubmitApplicationRechtsschutzResponse submitApplicationRechtsschutz(
-        @WebParam(partName = "parameters", name = "SubmitApplicationRechtsschutzRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs")
-        rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SubmitApplicationRechtsschutzRequest parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:createOfferLeben")
-    @WebResult(name = "CreateOfferLebenResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", partName = "parameters")
-    public leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CreateOfferLebenResponseType createOfferLeben(
-        @WebParam(partName = "parameters", name = "CreateOfferLebenRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben")
-        leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CreateOfferLebenRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:login")
-    @WebResult(name = "loginResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkBusinessObjectResponse login(
-        @WebParam(partName = "parameters", name = "loginRequest", targetNamespace = "urn:omds3ServiceTypes-1-1-0")
-        at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.LoginRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:changePartnerMainAddress")
-    @WebResult(name = "ChangePartnerMainAddressResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", partName = "parameters")
-    public on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangePartnerMainAddressResponseType changePartnerMainAddress(
-        @WebParam(partName = "parameters", name = "ChangePartnerMainAddressRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner")
-        on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangePartnerMainAddressRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:submitApplicationKfz")
-    @WebResult(name = "SubmitApplicationKfzResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.SubmitApplicationKfzResponseType submitApplicationKfz(
-        @WebParam(partName = "parameters", name = "SubmitApplicationKfzRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz")
-        at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.SubmitApplicationKfzRequestType parameters
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:submitApplicationSachPrivat")
-    @WebResult(name = "SubmitApplicationSachPrivatResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.SubmitApplicationSachPrivatResponseType submitApplicationSachPrivat(
-        @WebParam(partName = "parameters", name = "SubmitApplicationSachPrivatRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat")
-        at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.SubmitApplicationSachPrivatRequestType parameters
-    ) throws ServiceFaultMsg;
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/OmdsServicePortType_OmdsServicePort_Client.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/OmdsServicePortType_OmdsServicePort_Client.java
deleted file mode 100644
index 0c5e92e8..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/OmdsServicePortType_OmdsServicePort_Client.java
+++ /dev/null
@@ -1,739 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.service;
-
-/**
- * Please modify this class to meet your needs
- * This class is not complete
- */
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-
-/**
- * This class was generated by Apache CXF 3.2.0
- * 2021-12-16T15:04:17.720+01:00
- * Generated source version: 3.2.0
- * 
- */
-public final class OmdsServicePortType_OmdsServicePort_Client {
-
-    private static final QName SERVICE_NAME = new QName("urn:omds3Services-1-4-0", "omdsService");
-
-    private OmdsServicePortType_OmdsServicePort_Client() {
-    }
-
-    public static void main(String args[]) throws java.lang.Exception {
-        URL wsdlURL = OmdsService.WSDL_LOCATION;
-        if (args.length > 0 && args[0] != null && !"".equals(args[0])) { 
-            File wsdlFile = new File(args[0]);
-            try {
-                if (wsdlFile.exists()) {
-                    wsdlURL = wsdlFile.toURI().toURL();
-                } else {
-                    wsdlURL = new URL(args[0]);
-                }
-            } catch (MalformedURLException e) {
-                e.printStackTrace();
-            }
-        }
-      
-        OmdsService ss = new OmdsService(wsdlURL, SERVICE_NAME);
-        OmdsServicePortType port = ss.getOmdsServicePort();  
-        
-        {
-        System.out.println("Invoking calculateLeben...");
-        leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CalculateLebenRequestType _calculateLeben_parameters = null;
-        try {
-            leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CalculateLebenResponseType _calculateLeben__return = port.calculateLeben(_calculateLeben_parameters);
-            System.out.println("calculateLeben.result=" + _calculateLeben__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking addDocToBusinessCase...");
-        at.vvo.omds.types.omds3Types.r1_7_0.on1basis.AddDocToBusinessCaseRequestType _addDocToBusinessCase_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on1basis.AddDocToBusinessCaseResponseType _addDocToBusinessCase__return = port.addDocToBusinessCase(_addDocToBusinessCase_parameters);
-            System.out.println("addDocToBusinessCase.result=" + _addDocToBusinessCase__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking checkAddress...");
-        on4partner._0._4.v1.omds3types.types.omds.vvo.at.CheckAddressRequestType _checkAddress_parameters = null;
-        try {
-            on4partner._0._4.v1.omds3types.types.omds.vvo.at.CheckAddressResponseType _checkAddress__return = port.checkAddress(_checkAddress_parameters);
-            System.out.println("checkAddress.result=" + _checkAddress__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking addCommunicationObject...");
-        on4partner._0._4.v1.omds3types.types.omds.vvo.at.AddCommunicationObjectRequestType _addCommunicationObject_parameters = null;
-        try {
-            on4partner._0._4.v1.omds3types.types.omds.vvo.at.AddCommunicationObjectResponseType _addCommunicationObject__return = port.addCommunicationObject(_addCommunicationObject_parameters);
-            System.out.println("addCommunicationObject.result=" + _addCommunicationObject__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking calculateRechtsschutz...");
-        rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CalculateRechtsschutzRequest _calculateRechtsschutz_parameters = null;
-        try {
-            rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CalculateRechtsschutzResponse _calculateRechtsschutz__return = port.calculateRechtsschutz(_calculateRechtsschutz_parameters);
-            System.out.println("calculateRechtsschutz.result=" + _calculateRechtsschutz__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking createApplicationKfz...");
-        at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CreateApplicationKfzRequestType _createApplicationKfz_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CreateApplicationKfzResponseType _createApplicationKfz__return = port.createApplicationKfz(_createApplicationKfz_parameters);
-            System.out.println("createApplicationKfz.result=" + _createApplicationKfz__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking submitReceipt...");
-        at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SubmitReceiptRequest _submitReceipt_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SubmitReceiptResponse _submitReceipt__return = port.submitReceipt(_submitReceipt_parameters);
-            System.out.println("submitReceipt.result=" + _submitReceipt__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking createOfferKfz...");
-        at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CreateOfferKfzRequestType _createOfferKfz_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CreateOfferKfzResponseType _createOfferKfz__return = port.createOfferKfz(_createOfferKfz_parameters);
-            System.out.println("createOfferKfz.result=" + _createOfferKfz__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking submitApplicationLeben...");
-        leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.SubmitApplicationLebenRequestType _submitApplicationLeben_parameters = null;
-        try {
-            leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.SubmitApplicationLebenResponseType _submitApplicationLeben__return = port.submitApplicationLeben(_submitApplicationLeben_parameters);
-            System.out.println("submitApplicationLeben.result=" + _submitApplicationLeben__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking createOfferRechtsschutz...");
-        rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateOfferRechtsschutzRequest _createOfferRechtsschutz_parameters = null;
-        try {
-            rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateOfferRechtsschutzResponse _createOfferRechtsschutz__return = port.createOfferRechtsschutz(_createOfferRechtsschutz_parameters);
-            System.out.println("createOfferRechtsschutz.result=" + _createOfferRechtsschutz__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking searchClaim...");
-        at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SearchClaimRequestType _searchClaim_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SearchClaimResponseType _searchClaim__return = port.searchClaim(_searchClaim_parameters);
-            System.out.println("searchClaim.result=" + _searchClaim__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking getStateChanges...");
-        at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetStateChangesRequestType _getStateChanges_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetStateChangesResponseType _getStateChanges__return = port.getStateChanges(_getStateChanges_parameters);
-            System.out.println("getStateChanges.result=" + _getStateChanges__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking changePersonData...");
-        on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangePersonDataRequestType _changePersonData_parameters = null;
-        try {
-            on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangePersonDataResponseType _changePersonData__return = port.changePersonData(_changePersonData_parameters);
-            System.out.println("changePersonData.result=" + _changePersonData__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking submitClaim...");
-        at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SubmitClaimRequestType _submitClaim_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.SubmitClaimResponseType _submitClaim__return = port.submitClaim(_submitClaim_parameters);
-            System.out.println("submitClaim.result=" + _submitClaim__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking deepLinkOffer...");
-        at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkOfferRequest _deepLinkOffer_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkBusinessObjectResponse _deepLinkOffer__return = port.deepLinkOffer(_deepLinkOffer_parameters);
-            System.out.println("deepLinkOffer.result=" + _deepLinkOffer__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking getStateSignatures...");
-        at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetStateSignaturesRequest _getStateSignatures_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetStateSignaturesResponse _getStateSignatures__return = port.getStateSignatures(_getStateSignatures_parameters);
-            System.out.println("getStateSignatures.result=" + _getStateSignatures__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking getDocumentsOfPeriod...");
-        at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetDocumentsOfPeriodRequestType _getDocumentsOfPeriod_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetDocumentsOfPeriodResponseType _getDocumentsOfPeriod__return = port.getDocumentsOfPeriod(_getDocumentsOfPeriod_parameters);
-            System.out.println("getDocumentsOfPeriod.result=" + _getDocumentsOfPeriod__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking findVerkaufsprodukt...");
-        produktfinder.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.VerkaufsproduktFinderRequestType _findVerkaufsprodukt_parameters = null;
-        try {
-            produktfinder.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.VerkaufsproduktFinderResponseType _findVerkaufsprodukt__return = port.findVerkaufsprodukt(_findVerkaufsprodukt_parameters);
-            System.out.println("findVerkaufsprodukt.result=" + _findVerkaufsprodukt__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking getPoliciesOfPartner...");
-        on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.GetPoliciesOfPartnerRequestType _getPoliciesOfPartner_parameters = null;
-        try {
-            on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.GetPoliciesOfPartnerResponseType _getPoliciesOfPartner__return = port.getPoliciesOfPartner(_getPoliciesOfPartner_parameters);
-            System.out.println("getPoliciesOfPartner.result=" + _getPoliciesOfPartner__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking createApplicationUnfall...");
-        unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateApplicationUnfallRequestType _createApplicationUnfall_parameters = null;
-        try {
-            unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateApplicationUnfallResponseType _createApplicationUnfall__return = port.createApplicationUnfall(_createApplicationUnfall_parameters);
-            System.out.println("createApplicationUnfall.result=" + _createApplicationUnfall__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking calculateKranken...");
-        kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CalculateKrankenRequest _calculateKranken_parameters = null;
-        try {
-            kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CalculateKrankenResponse _calculateKranken__return = port.calculateKranken(_calculateKranken_parameters);
-            System.out.println("calculateKranken.result=" + _calculateKranken__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking deleteCommunicationObject...");
-        on4partner._0._4.v1.omds3types.types.omds.vvo.at.DeleteCommunicationObjectRequestType _deleteCommunicationObject_parameters = null;
-        try {
-            on4partner._0._4.v1.omds3types.types.omds.vvo.at.DeleteCommunicationObjectResponseType _deleteCommunicationObject__return = port.deleteCommunicationObject(_deleteCommunicationObject_parameters);
-            System.out.println("deleteCommunicationObject.result=" + _deleteCommunicationObject__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking checkClaim...");
-        at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.CheckClaimRequestType _checkClaim_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.CheckClaimResponseType _checkClaim__return = port.checkClaim(_checkClaim_parameters);
-            System.out.println("checkClaim.result=" + _checkClaim__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking getPartner...");
-        on4partner._0._4.v1.omds3types.types.omds.vvo.at.GetPartnerRequestType _getPartner_parameters = null;
-        try {
-            on4partner._0._4.v1.omds3types.types.omds.vvo.at.GetPartnerResponseType _getPartner__return = port.getPartner(_getPartner_parameters);
-            System.out.println("getPartner.result=" + _getPartner__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking createApplicationLeben...");
-        leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CreateApplicationLebenRequestType _createApplicationLeben_parameters = null;
-        try {
-            leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CreateApplicationLebenResponseType _createApplicationLeben__return = port.createApplicationLeben(_createApplicationLeben_parameters);
-            System.out.println("createApplicationLeben.result=" + _createApplicationLeben__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking createOfferUnfall...");
-        unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateOfferUnfallRequestType _createOfferUnfall_parameters = null;
-        try {
-            unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateOfferUnfallResponseType _createOfferUnfall__return = port.createOfferUnfall(_createOfferUnfall_parameters);
-            System.out.println("createOfferUnfall.result=" + _createOfferUnfall__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking getArcImageInfos...");
-        at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.ArcImageInfosRequest _getArcImageInfos_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.ArcImageInfosResponse _getArcImageInfos__return = port.getArcImageInfos(_getArcImageInfos_parameters);
-            System.out.println("getArcImageInfos.result=" + _getArcImageInfos__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking getOMDSPackageList...");
-        at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.OMDSPackageListRequest _getOMDSPackageList_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.OMDSPackageListResponse _getOMDSPackageList__return = port.getOMDSPackageList(_getOMDSPackageList_parameters);
-            System.out.println("getOMDSPackageList.result=" + _getOMDSPackageList__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking createApplicationKranken...");
-        kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CreateApplicationKrankenRequest _createApplicationKranken_parameters = null;
-        try {
-            kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CreateApplicationKrankenResponse _createApplicationKranken__return = port.createApplicationKranken(_createApplicationKranken_parameters);
-            System.out.println("createApplicationKranken.result=" + _createApplicationKranken__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking calculateSachPrivat...");
-        at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CalculateSachPrivatRequestType _calculateSachPrivat_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CalculateSachPrivatResponseType _calculateSachPrivat__return = port.calculateSachPrivat(_calculateSachPrivat_parameters);
-            System.out.println("calculateSachPrivat.result=" + _calculateSachPrivat__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking createApplicationRechtsschutz...");
-        rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateApplicationRechtsschutzRequest _createApplicationRechtsschutz_parameters = null;
-        try {
-            rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CreateApplicationRechtsschutzResponse _createApplicationRechtsschutz__return = port.createApplicationRechtsschutz(_createApplicationRechtsschutz_parameters);
-            System.out.println("createApplicationRechtsschutz.result=" + _createApplicationRechtsschutz__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking deepLinkPartner...");
-        at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkPartnerRequest _deepLinkPartner_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkBusinessObjectResponse _deepLinkPartner__return = port.deepLinkPartner(_deepLinkPartner_parameters);
-            System.out.println("deepLinkPartner.result=" + _deepLinkPartner__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking deepLinkPolicy...");
-        at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkPolicyRequest _deepLinkPolicy_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkBusinessObjectResponse _deepLinkPolicy__return = port.deepLinkPolicy(_deepLinkPolicy_parameters);
-            System.out.println("deepLinkPolicy.result=" + _deepLinkPolicy__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking getUserData...");
-        at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.UserDataRequest _getUserData_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.UserDataResponse _getUserData__return = port.getUserData(_getUserData_parameters);
-            System.out.println("getUserData.result=" + _getUserData__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking deepLinkClaim...");
-        at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkClaimRequest _deepLinkClaim_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkBusinessObjectResponse _deepLinkClaim__return = port.deepLinkClaim(_deepLinkClaim_parameters);
-            System.out.println("deepLinkClaim.result=" + _deepLinkClaim__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking checkCoverage...");
-        at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.CheckCoverageRequest _checkCoverage_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.CheckCoverageResponse _checkCoverage__return = port.checkCoverage(_checkCoverage_parameters);
-            System.out.println("checkCoverage.result=" + _checkCoverage__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking submitApplicationKranken...");
-        kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.SubmitApplicationKrankenRequest _submitApplicationKranken_parameters = null;
-        try {
-            kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.SubmitApplicationKrankenResponse _submitApplicationKranken__return = port.submitApplicationKranken(_submitApplicationKranken_parameters);
-            System.out.println("submitApplicationKranken.result=" + _submitApplicationKranken__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking collectionChange...");
-        on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.CollectionChangeRequest _collectionChange_parameters = null;
-        try {
-            on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.CollectionChangeResponse _collectionChange__return = port.collectionChange(_collectionChange_parameters);
-            System.out.println("collectionChange.result=" + _collectionChange__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking getOMDSPackage...");
-        at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.OMDSPackageRequest _getOMDSPackage_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.OMDSPackageResponse _getOMDSPackage__return = port.getOMDSPackage(_getOMDSPackage_parameters);
-            System.out.println("getOMDSPackage.result=" + _getOMDSPackage__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking getNumberOfDocuments...");
-        at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetNumberOfDocumentsRequestType _getNumberOfDocuments_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetNumberOfDocumentsResponseType _getNumberOfDocuments__return = port.getNumberOfDocuments(_getNumberOfDocuments_parameters);
-            System.out.println("getNumberOfDocuments.result=" + _getNumberOfDocuments__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking calculateUnfall...");
-        unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CalculateUnfallRequestType _calculateUnfall_parameters = null;
-        try {
-            unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.CalculateUnfallResponseType _calculateUnfall__return = port.calculateUnfall(_calculateUnfall_parameters);
-            System.out.println("calculateUnfall.result=" + _calculateUnfall__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking submitApplicationUnfall...");
-        unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SubmitApplicationUnfallRequestType _submitApplicationUnfall_parameters = null;
-        try {
-            unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SubmitApplicationUnfallResponseType _submitApplicationUnfall__return = port.submitApplicationUnfall(_submitApplicationUnfall_parameters);
-            System.out.println("submitApplicationUnfall.result=" + _submitApplicationUnfall__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking getDocumentsOfObject...");
-        at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetDocumentsOfObjectRequestType _getDocumentsOfObject_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on1basis.GetDocumentsOfObjectResponseType _getDocumentsOfObject__return = port.getDocumentsOfObject(_getDocumentsOfObject_parameters);
-            System.out.println("getDocumentsOfObject.result=" + _getDocumentsOfObject__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking calculateKfz...");
-        at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CalculateKfzRequestType _calculateKfz_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.CalculateKfzResponseType _calculateKfz__return = port.calculateKfz(_calculateKfz_parameters);
-            System.out.println("calculateKfz.result=" + _calculateKfz__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking createOfferKranken...");
-        kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CreateOfferKrankenRequest _createOfferKranken_parameters = null;
-        try {
-            kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at.CreateOfferKrankenResponse _createOfferKranken__return = port.createOfferKranken(_createOfferKranken_parameters);
-            System.out.println("createOfferKranken.result=" + _createOfferKranken__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking changeCommunicationObject...");
-        on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangeCommunicationObjectRequestType _changeCommunicationObject_parameters = null;
-        try {
-            on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangeCommunicationObjectResponse _changeCommunicationObject__return = port.changeCommunicationObject(_changeCommunicationObject_parameters);
-            System.out.println("changeCommunicationObject.result=" + _changeCommunicationObject__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking createOfferSachPrivat...");
-        at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CreateOfferSachPrivatRequestType _createOfferSachPrivat_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CreateOfferSachPrivatResponseType _createOfferSachPrivat__return = port.createOfferSachPrivat(_createOfferSachPrivat_parameters);
-            System.out.println("createOfferSachPrivat.result=" + _createOfferSachPrivat__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking createApplicationSachPrivat...");
-        at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CreateApplicationSachPrivatRequestType _createApplicationSachPrivat_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.CreateApplicationSachPrivatResponseType _createApplicationSachPrivat__return = port.createApplicationSachPrivat(_createApplicationSachPrivat_parameters);
-            System.out.println("createApplicationSachPrivat.result=" + _createApplicationSachPrivat__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking getClaim...");
-        at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.GetClaimRequestType _getClaim_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on7schaden.GetClaimResponseType _getClaim__return = port.getClaim(_getClaim_parameters);
-            System.out.println("getClaim.result=" + _getClaim__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking getArcImage...");
-        at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.ArcImageRequest _getArcImage_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.ArcImageResponse _getArcImage__return = port.getArcImage(_getArcImage_parameters);
-            System.out.println("getArcImage.result=" + _getArcImage__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking setMailingAddress...");
-        on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.SetMailingAddressRequestType _setMailingAddress_parameters = null;
-        try {
-            on3vertrag._0._4.v1.omds3types.types.omds.vvo.at.SetMailingAddressResponseType _setMailingAddress__return = port.setMailingAddress(_setMailingAddress_parameters);
-            System.out.println("setMailingAddress.result=" + _setMailingAddress__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking submitApplicationRechtsschutz...");
-        rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SubmitApplicationRechtsschutzRequest _submitApplicationRechtsschutz_parameters = null;
-        try {
-            rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at.SubmitApplicationRechtsschutzResponse _submitApplicationRechtsschutz__return = port.submitApplicationRechtsschutz(_submitApplicationRechtsschutz_parameters);
-            System.out.println("submitApplicationRechtsschutz.result=" + _submitApplicationRechtsschutz__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking createOfferLeben...");
-        leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CreateOfferLebenRequestType _createOfferLeben_parameters = null;
-        try {
-            leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at.CreateOfferLebenResponseType _createOfferLeben__return = port.createOfferLeben(_createOfferLeben_parameters);
-            System.out.println("createOfferLeben.result=" + _createOfferLeben__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking login...");
-        at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.LoginRequestType _login_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.servicetypes.DeepLinkBusinessObjectResponse _login__return = port.login(_login_parameters);
-            System.out.println("login.result=" + _login__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking changePartnerMainAddress...");
-        on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangePartnerMainAddressRequestType _changePartnerMainAddress_parameters = null;
-        try {
-            on4partner._0._4.v1.omds3types.types.omds.vvo.at.ChangePartnerMainAddressResponseType _changePartnerMainAddress__return = port.changePartnerMainAddress(_changePartnerMainAddress_parameters);
-            System.out.println("changePartnerMainAddress.result=" + _changePartnerMainAddress__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking submitApplicationKfz...");
-        at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.SubmitApplicationKfzRequestType _submitApplicationKfz_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.kfz.SubmitApplicationKfzResponseType _submitApplicationKfz__return = port.submitApplicationKfz(_submitApplicationKfz_parameters);
-            System.out.println("submitApplicationKfz.result=" + _submitApplicationKfz__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking submitApplicationSachPrivat...");
-        at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.SubmitApplicationSachPrivatRequestType _submitApplicationSachPrivat_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.sachPrivat.SubmitApplicationSachPrivatResponseType _submitApplicationSachPrivat__return = port.submitApplicationSachPrivat(_submitApplicationSachPrivat_parameters);
-            System.out.println("submitApplicationSachPrivat.result=" + _submitApplicationSachPrivat__return);
-
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-
-        System.exit(0);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/ServiceFaultMsg.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/ServiceFaultMsg.java
deleted file mode 100644
index 9288f4e9..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/service/ServiceFaultMsg.java
+++ /dev/null
@@ -1,43 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.service;
-
-import javax.xml.ws.WebFault;
-
-
-/**
- * This class was generated by Apache CXF 3.2.0
- * 2021-12-16T15:04:17.791+01:00
- * Generated source version: 3.2.0
- */
-
-@WebFault(name = "serviceFault", targetNamespace = "urn:omds3CommonServiceTypes-1-1-0")
-public class ServiceFaultMsg extends Exception {
-    
-    private at.vvo.omds.types.omds3Types.r1_7_0.common.ServiceFault serviceFault;
-
-    public ServiceFaultMsg() {
-        super();
-    }
-    
-    public ServiceFaultMsg(String message) {
-        super(message);
-    }
-    
-    public ServiceFaultMsg(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public ServiceFaultMsg(String message, at.vvo.omds.types.omds3Types.r1_7_0.common.ServiceFault serviceFault) {
-        super(message);
-        this.serviceFault = serviceFault;
-    }
-
-    public ServiceFaultMsg(String message, at.vvo.omds.types.omds3Types.r1_7_0.common.ServiceFault serviceFault, Throwable cause) {
-        super(message, cause);
-        this.serviceFault = serviceFault;
-    }
-
-    public at.vvo.omds.types.omds3Types.r1_7_0.common.ServiceFault getFaultInfo() {
-        return this.serviceFault;
-    }
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcContent.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcContent.java
deleted file mode 100644
index ae31e3a3..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcContent.java
+++ /dev/null
@@ -1,95 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-import javax.activation.DataHandler;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlMimeType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Informationen zu einem Dokument und das Dokument base64encoded
- * 
- * 
Java-Klasse für ArcContent complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ArcContent">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="arcImageInfo" type="{urn:omds3ServiceTypes-1-1-0}ArcImageInfo"/>
- *         <element name="arcImage" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ArcContent", propOrder = {
-    "arcImageInfo",
-    "arcImage"
-})
-public class ArcContent {
-
-    @XmlElement(required = true)
-    protected ArcImageInfo arcImageInfo;
-    @XmlElement(required = true)
-    @XmlMimeType("application/octet-stream")
-    protected DataHandler arcImage;
-
-    /**
-     * Ruft den Wert der arcImageInfo-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ArcImageInfo }
-     *     
-     */
-    public ArcImageInfo getArcImageInfo() {
-        return arcImageInfo;
-    }
-
-    /**
-     * Legt den Wert der arcImageInfo-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ArcImageInfo }
-     *     
-     */
-    public void setArcImageInfo(ArcImageInfo value) {
-        this.arcImageInfo = value;
-    }
-
-    /**
-     * Ruft den Wert der arcImage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DataHandler }
-     *     
-     */
-    public DataHandler getArcImage() {
-        return arcImage;
-    }
-
-    /**
-     * Legt den Wert der arcImage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DataHandler }
-     *     
-     */
-    public void setArcImage(DataHandler value) {
-        this.arcImage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcImageInfo.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcImageInfo.java
deleted file mode 100644
index 34b359a2..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcImageInfo.java
+++ /dev/null
@@ -1,231 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ElementIdType;
-
-
-/**
- * Information zu einem einzelnen Dokument
- * 
- * 
Java-Klasse für ArcImageInfo complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ArcImageInfo">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="arcImageIdDetails" type="{urn:omds3CommonServiceTypes-1-1-0}ElementIdType"/>
- *         <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="documentType" type="{urn:omds3CommonServiceTypes-1-1-0}DocumentType"/>
- *         <element name="arcContentType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="arcContentLength" type="{http://www.w3.org/2001/XMLSchema}long" minOccurs="0"/>
- *         <element name="date" type="{http://www.w3.org/2001/XMLSchema}date"/>
- *         <element name="docReference" type="{urn:omds3ServiceTypes-1-1-0}ArcImageInfo" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ArcImageInfo", propOrder = {
-    "arcImageIdDetails",
-    "name",
-    "documentType",
-    "arcContentType",
-    "arcContentLength",
-    "date",
-    "docReference"
-})
-public class ArcImageInfo {
-
-    @XmlElement(required = true)
-    protected ElementIdType arcImageIdDetails;
-    @XmlElement(required = true)
-    protected String name;
-    protected int documentType;
-    protected String arcContentType;
-    protected Long arcContentLength;
-    @XmlElement(required = true)
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar date;
-    protected List docReference;
-
-    /**
-     * Ruft den Wert der arcImageIdDetails-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ElementIdType }
-     *     
-     */
-    public ElementIdType getArcImageIdDetails() {
-        return arcImageIdDetails;
-    }
-
-    /**
-     * Legt den Wert der arcImageIdDetails-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ElementIdType }
-     *     
-     */
-    public void setArcImageIdDetails(ElementIdType value) {
-        this.arcImageIdDetails = value;
-    }
-
-    /**
-     * Ruft den Wert der name-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Legt den Wert der name-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Ruft den Wert der documentType-Eigenschaft ab.
-     * 
-     */
-    public int getDocumentType() {
-        return documentType;
-    }
-
-    /**
-     * Legt den Wert der documentType-Eigenschaft fest.
-     * 
-     */
-    public void setDocumentType(int value) {
-        this.documentType = value;
-    }
-
-    /**
-     * Ruft den Wert der arcContentType-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getArcContentType() {
-        return arcContentType;
-    }
-
-    /**
-     * Legt den Wert der arcContentType-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setArcContentType(String value) {
-        this.arcContentType = value;
-    }
-
-    /**
-     * Ruft den Wert der arcContentLength-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Long }
-     *     
-     */
-    public Long getArcContentLength() {
-        return arcContentLength;
-    }
-
-    /**
-     * Legt den Wert der arcContentLength-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Long }
-     *     
-     */
-    public void setArcContentLength(Long value) {
-        this.arcContentLength = value;
-    }
-
-    /**
-     * Ruft den Wert der date-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDate() {
-        return date;
-    }
-
-    /**
-     * Legt den Wert der date-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDate(XMLGregorianCalendar value) {
-        this.date = value;
-    }
-
-    /**
-     * Gets the value of the docReference property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the docReference property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDocReference().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ArcImageInfo }
-     * 
-     * 
-     */
-    public List getDocReference() {
-        if (docReference == null) {
-            docReference = new ArrayList();
-        }
-        return this.docReference;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcImageInfosRequest.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcImageInfosRequest.java
deleted file mode 100644
index 1e004a99..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcImageInfosRequest.java
+++ /dev/null
@@ -1,273 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AuthorizationFilter;
-
-
-/**
- * Anfragetyp Informationen zu vertragsbezogenen Dokumenten
- * 
- * 
Java-Klasse für ArcImageInfosRequest complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ArcImageInfosRequest">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="VUNr" type="{urn:omds20}VUNr" minOccurs="0"/>
- *         <element name="AuthFilter" type="{urn:omds3CommonServiceTypes-1-1-0}AuthorizationFilter" minOccurs="0"/>
- *         <element name="policyNumber" type="{urn:omds20}Polizzennr"/>
- *         <element name="policyType" type="{urn:omds20}VtgProdCd_Type" minOccurs="0"/>
- *         <element name="policyPartnerRole" type="{urn:omds3ServiceTypes-1-1-0}PolicyPartnerRole" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="documentType" type="{urn:omds3CommonServiceTypes-1-1-0}DocumentType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="dateFrom" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
- *         <element name="dateUntil" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ArcImageInfosRequest", propOrder = {
-    "vuNr",
-    "authFilter",
-    "policyNumber",
-    "policyType",
-    "policyPartnerRole",
-    "documentType",
-    "dateFrom",
-    "dateUntil"
-})
-public class ArcImageInfosRequest {
-
-    @XmlElement(name = "VUNr")
-    protected String vuNr;
-    @XmlElement(name = "AuthFilter")
-    protected AuthorizationFilter authFilter;
-    @XmlElement(required = true)
-    protected String policyNumber;
-    protected String policyType;
-    protected List policyPartnerRole;
-    @XmlElement(type = Integer.class)
-    protected List documentType;
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar dateFrom;
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar dateUntil;
-
-    /**
-     * Ruft den Wert der vuNr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVUNr() {
-        return vuNr;
-    }
-
-    /**
-     * Legt den Wert der vuNr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVUNr(String value) {
-        this.vuNr = value;
-    }
-
-    /**
-     * Ruft den Wert der authFilter-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public AuthorizationFilter getAuthFilter() {
-        return authFilter;
-    }
-
-    /**
-     * Legt den Wert der authFilter-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public void setAuthFilter(AuthorizationFilter value) {
-        this.authFilter = value;
-    }
-
-    /**
-     * Ruft den Wert der policyNumber-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolicyNumber() {
-        return policyNumber;
-    }
-
-    /**
-     * Legt den Wert der policyNumber-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolicyNumber(String value) {
-        this.policyNumber = value;
-    }
-
-    /**
-     * Ruft den Wert der policyType-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolicyType() {
-        return policyType;
-    }
-
-    /**
-     * Legt den Wert der policyType-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolicyType(String value) {
-        this.policyType = value;
-    }
-
-    /**
-     * Gets the value of the policyPartnerRole property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the policyPartnerRole property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getPolicyPartnerRole().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link PolicyPartnerRole }
-     * 
-     * 
-     */
-    public List getPolicyPartnerRole() {
-        if (policyPartnerRole == null) {
-            policyPartnerRole = new ArrayList();
-        }
-        return this.policyPartnerRole;
-    }
-
-    /**
-     * Gets the value of the documentType property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the documentType property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDocumentType().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link Integer }
-     * 
-     * 
-     */
-    public List getDocumentType() {
-        if (documentType == null) {
-            documentType = new ArrayList();
-        }
-        return this.documentType;
-    }
-
-    /**
-     * Ruft den Wert der dateFrom-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDateFrom() {
-        return dateFrom;
-    }
-
-    /**
-     * Legt den Wert der dateFrom-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDateFrom(XMLGregorianCalendar value) {
-        this.dateFrom = value;
-    }
-
-    /**
-     * Ruft den Wert der dateUntil-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDateUntil() {
-        return dateUntil;
-    }
-
-    /**
-     * Legt den Wert der dateUntil-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDateUntil(XMLGregorianCalendar value) {
-        this.dateUntil = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcImageInfosResponse.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcImageInfosResponse.java
deleted file mode 100644
index 347a803f..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcImageInfosResponse.java
+++ /dev/null
@@ -1,99 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ServiceFault;
-
-
-/**
- * Rückgabetyp Informationen zu vertragsbezogenen Dokumenten
- * 
- * 
Java-Klasse für ArcImageInfosResponse complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ArcImageInfosResponse">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="arcImageInfo" type="{urn:omds3ServiceTypes-1-1-0}ArcImageInfo" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="ServiceFault" type="{urn:omds3CommonServiceTypes-1-1-0}ServiceFault" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ArcImageInfosResponse", propOrder = {
-    "arcImageInfo",
-    "serviceFault"
-})
-public class ArcImageInfosResponse {
-
-    protected List arcImageInfo;
-    @XmlElement(name = "ServiceFault")
-    protected ServiceFault serviceFault;
-
-    /**
-     * Gets the value of the arcImageInfo property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the arcImageInfo property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getArcImageInfo().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ArcImageInfo }
-     * 
-     * 
-     */
-    public List getArcImageInfo() {
-        if (arcImageInfo == null) {
-            arcImageInfo = new ArrayList();
-        }
-        return this.arcImageInfo;
-    }
-
-    /**
-     * Ruft den Wert der serviceFault-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ServiceFault }
-     *     
-     */
-    public ServiceFault getServiceFault() {
-        return serviceFault;
-    }
-
-    /**
-     * Legt den Wert der serviceFault-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ServiceFault }
-     *     
-     */
-    public void setServiceFault(ServiceFault value) {
-        this.serviceFault = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcImageRequest.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcImageRequest.java
deleted file mode 100644
index d0a2cb93..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcImageRequest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AuthorizationFilter;
-
-
-/**
- * Requesttyp zur Abholung eines einzelnen bekannten Dokuments
- * 
- * 
Java-Klasse für ArcImageRequest complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ArcImageRequest">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="VUNr" type="{urn:omds20}VUNr" minOccurs="0"/>
- *         <element name="AuthFilter" type="{urn:omds3CommonServiceTypes-1-1-0}AuthorizationFilter" minOccurs="0"/>
- *         <element name="ArcImageId">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <maxLength value="1024"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ArcImageRequest", propOrder = {
-    "vuNr",
-    "authFilter",
-    "arcImageId"
-})
-public class ArcImageRequest {
-
-    @XmlElement(name = "VUNr")
-    protected String vuNr;
-    @XmlElement(name = "AuthFilter")
-    protected AuthorizationFilter authFilter;
-    @XmlElement(name = "ArcImageId", required = true)
-    protected String arcImageId;
-
-    /**
-     * Ruft den Wert der vuNr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVUNr() {
-        return vuNr;
-    }
-
-    /**
-     * Legt den Wert der vuNr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVUNr(String value) {
-        this.vuNr = value;
-    }
-
-    /**
-     * Ruft den Wert der authFilter-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public AuthorizationFilter getAuthFilter() {
-        return authFilter;
-    }
-
-    /**
-     * Legt den Wert der authFilter-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public void setAuthFilter(AuthorizationFilter value) {
-        this.authFilter = value;
-    }
-
-    /**
-     * Ruft den Wert der arcImageId-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getArcImageId() {
-        return arcImageId;
-    }
-
-    /**
-     * Legt den Wert der arcImageId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setArcImageId(String value) {
-        this.arcImageId = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcImageResponse.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcImageResponse.java
deleted file mode 100644
index 1f3ae1c3..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ArcImageResponse.java
+++ /dev/null
@@ -1,93 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ServiceFault;
-
-
-/**
- * Responsetyp zur Rückgabe eines einzelnen Dokumentes
- * 
- * 
Java-Klasse für ArcImageResponse complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ArcImageResponse">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ArcContent" type="{urn:omds3ServiceTypes-1-1-0}ArcContent" minOccurs="0"/>
- *         <element name="ServiceFault" type="{urn:omds3CommonServiceTypes-1-1-0}ServiceFault" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ArcImageResponse", propOrder = {
-    "arcContent",
-    "serviceFault"
-})
-public class ArcImageResponse {
-
-    @XmlElement(name = "ArcContent")
-    protected ArcContent arcContent;
-    @XmlElement(name = "ServiceFault")
-    protected ServiceFault serviceFault;
-
-    /**
-     * Ruft den Wert der arcContent-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ArcContent }
-     *     
-     */
-    public ArcContent getArcContent() {
-        return arcContent;
-    }
-
-    /**
-     * Legt den Wert der arcContent-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ArcContent }
-     *     
-     */
-    public void setArcContent(ArcContent value) {
-        this.arcContent = value;
-    }
-
-    /**
-     * Ruft den Wert der serviceFault-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ServiceFault }
-     *     
-     */
-    public ServiceFault getServiceFault() {
-        return serviceFault;
-    }
-
-    /**
-     * Legt den Wert der serviceFault-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ServiceFault }
-     *     
-     */
-    public void setServiceFault(ServiceFault value) {
-        this.serviceFault = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/DeepLinkBusinessObjectResponse.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/DeepLinkBusinessObjectResponse.java
deleted file mode 100644
index 5181133f..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/DeepLinkBusinessObjectResponse.java
+++ /dev/null
@@ -1,102 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ServiceFault;
-
-
-/**
- * 
Java-Klasse für DeepLinkBusinessObjectResponse complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="DeepLinkBusinessObjectResponse">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="httpActionLink" type="{urn:omds3ServiceTypes-1-1-0}HttpActionLinkType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="ServiceFault" type="{urn:omds3CommonServiceTypes-1-1-0}ServiceFault" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DeepLinkBusinessObjectResponse", propOrder = {
-    "httpActionLink",
-    "serviceFault"
-})
-public class DeepLinkBusinessObjectResponse {
-
-    protected List httpActionLink;
-    @XmlElement(name = "ServiceFault")
-    protected List serviceFault;
-
-    /**
-     * Gets the value of the httpActionLink property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the httpActionLink property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getHttpActionLink().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link HttpActionLinkType }
-     * 
-     * 
-     */
-    public List getHttpActionLink() {
-        if (httpActionLink == null) {
-            httpActionLink = new ArrayList();
-        }
-        return this.httpActionLink;
-    }
-
-    /**
-     * Gets the value of the serviceFault property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the serviceFault property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getServiceFault().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ServiceFault }
-     * 
-     * 
-     */
-    public List getServiceFault() {
-        if (serviceFault == null) {
-            serviceFault = new ArrayList();
-        }
-        return this.serviceFault;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/DeepLinkClaimRequest.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/DeepLinkClaimRequest.java
deleted file mode 100644
index 493b1d19..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/DeepLinkClaimRequest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AuthorizationFilter;
-
-
-/**
- * 
Java-Klasse für DeepLinkClaimRequest complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="DeepLinkClaimRequest">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="VUNr" type="{urn:omds20}VUNr" minOccurs="0"/>
- *         <element name="AuthFilter" type="{urn:omds3CommonServiceTypes-1-1-0}AuthorizationFilter" minOccurs="0"/>
- *         <element name="claimNumber" type="{urn:omds20}Schadennr"/>
- *         <element ref="{urn:omds3ServiceTypes-1-1-0}withoutFrame" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DeepLinkClaimRequest", propOrder = {
-    "vuNr",
-    "authFilter",
-    "claimNumber",
-    "withoutFrame"
-})
-public class DeepLinkClaimRequest {
-
-    @XmlElement(name = "VUNr")
-    protected String vuNr;
-    @XmlElement(name = "AuthFilter")
-    protected AuthorizationFilter authFilter;
-    @XmlElement(required = true)
-    protected String claimNumber;
-    protected Boolean withoutFrame;
-
-    /**
-     * Ruft den Wert der vuNr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVUNr() {
-        return vuNr;
-    }
-
-    /**
-     * Legt den Wert der vuNr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVUNr(String value) {
-        this.vuNr = value;
-    }
-
-    /**
-     * Ruft den Wert der authFilter-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public AuthorizationFilter getAuthFilter() {
-        return authFilter;
-    }
-
-    /**
-     * Legt den Wert der authFilter-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public void setAuthFilter(AuthorizationFilter value) {
-        this.authFilter = value;
-    }
-
-    /**
-     * Ruft den Wert der claimNumber-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getClaimNumber() {
-        return claimNumber;
-    }
-
-    /**
-     * Legt den Wert der claimNumber-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setClaimNumber(String value) {
-        this.claimNumber = value;
-    }
-
-    /**
-     * Ruft den Wert der withoutFrame-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isWithoutFrame() {
-        return withoutFrame;
-    }
-
-    /**
-     * Legt den Wert der withoutFrame-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setWithoutFrame(Boolean value) {
-        this.withoutFrame = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/DeepLinkOfferRequest.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/DeepLinkOfferRequest.java
deleted file mode 100644
index 6591529d..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/DeepLinkOfferRequest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AuthorizationFilter;
-
-
-/**
- * 
Java-Klasse für DeepLinkOfferRequest complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="DeepLinkOfferRequest">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="VUNr" type="{urn:omds20}VUNr" minOccurs="0"/>
- *         <element name="AuthFilter" type="{urn:omds3CommonServiceTypes-1-1-0}AuthorizationFilter" minOccurs="0"/>
- *         <element name="offerNumber" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element ref="{urn:omds3ServiceTypes-1-1-0}withoutFrame" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DeepLinkOfferRequest", propOrder = {
-    "vuNr",
-    "authFilter",
-    "offerNumber",
-    "withoutFrame"
-})
-public class DeepLinkOfferRequest {
-
-    @XmlElement(name = "VUNr")
-    protected String vuNr;
-    @XmlElement(name = "AuthFilter")
-    protected AuthorizationFilter authFilter;
-    @XmlElement(required = true)
-    protected String offerNumber;
-    protected Boolean withoutFrame;
-
-    /**
-     * Ruft den Wert der vuNr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVUNr() {
-        return vuNr;
-    }
-
-    /**
-     * Legt den Wert der vuNr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVUNr(String value) {
-        this.vuNr = value;
-    }
-
-    /**
-     * Ruft den Wert der authFilter-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public AuthorizationFilter getAuthFilter() {
-        return authFilter;
-    }
-
-    /**
-     * Legt den Wert der authFilter-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public void setAuthFilter(AuthorizationFilter value) {
-        this.authFilter = value;
-    }
-
-    /**
-     * Ruft den Wert der offerNumber-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOfferNumber() {
-        return offerNumber;
-    }
-
-    /**
-     * Legt den Wert der offerNumber-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOfferNumber(String value) {
-        this.offerNumber = value;
-    }
-
-    /**
-     * Ruft den Wert der withoutFrame-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isWithoutFrame() {
-        return withoutFrame;
-    }
-
-    /**
-     * Legt den Wert der withoutFrame-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setWithoutFrame(Boolean value) {
-        this.withoutFrame = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/DeepLinkPartnerRequest.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/DeepLinkPartnerRequest.java
deleted file mode 100644
index 309d54cf..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/DeepLinkPartnerRequest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AuthorizationFilter;
-
-
-/**
- * 
Java-Klasse für DeepLinkPartnerRequest complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="DeepLinkPartnerRequest">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="VUNr" type="{urn:omds20}VUNr" minOccurs="0"/>
- *         <element name="AuthFilter" type="{urn:omds3CommonServiceTypes-1-1-0}AuthorizationFilter" minOccurs="0"/>
- *         <element name="partnerNumber" type="{urn:omds20}Personennr"/>
- *         <element ref="{urn:omds3ServiceTypes-1-1-0}withoutFrame" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DeepLinkPartnerRequest", propOrder = {
-    "vuNr",
-    "authFilter",
-    "partnerNumber",
-    "withoutFrame"
-})
-public class DeepLinkPartnerRequest {
-
-    @XmlElement(name = "VUNr")
-    protected String vuNr;
-    @XmlElement(name = "AuthFilter")
-    protected AuthorizationFilter authFilter;
-    @XmlElement(required = true)
-    protected String partnerNumber;
-    protected Boolean withoutFrame;
-
-    /**
-     * Ruft den Wert der vuNr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVUNr() {
-        return vuNr;
-    }
-
-    /**
-     * Legt den Wert der vuNr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVUNr(String value) {
-        this.vuNr = value;
-    }
-
-    /**
-     * Ruft den Wert der authFilter-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public AuthorizationFilter getAuthFilter() {
-        return authFilter;
-    }
-
-    /**
-     * Legt den Wert der authFilter-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public void setAuthFilter(AuthorizationFilter value) {
-        this.authFilter = value;
-    }
-
-    /**
-     * Ruft den Wert der partnerNumber-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerNumber() {
-        return partnerNumber;
-    }
-
-    /**
-     * Legt den Wert der partnerNumber-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerNumber(String value) {
-        this.partnerNumber = value;
-    }
-
-    /**
-     * Ruft den Wert der withoutFrame-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isWithoutFrame() {
-        return withoutFrame;
-    }
-
-    /**
-     * Legt den Wert der withoutFrame-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setWithoutFrame(Boolean value) {
-        this.withoutFrame = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/DeepLinkPolicyRequest.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/DeepLinkPolicyRequest.java
deleted file mode 100644
index 2bf12d97..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/DeepLinkPolicyRequest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AuthorizationFilter;
-
-
-/**
- * 
Java-Klasse für DeepLinkPolicyRequest complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="DeepLinkPolicyRequest">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="VUNr" type="{urn:omds20}VUNr" minOccurs="0"/>
- *         <element name="AuthFilter" type="{urn:omds3CommonServiceTypes-1-1-0}AuthorizationFilter" minOccurs="0"/>
- *         <element name="policyNumber" type="{urn:omds20}Polizzennr"/>
- *         <element ref="{urn:omds3ServiceTypes-1-1-0}withoutFrame" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DeepLinkPolicyRequest", propOrder = {
-    "vuNr",
-    "authFilter",
-    "policyNumber",
-    "withoutFrame"
-})
-public class DeepLinkPolicyRequest {
-
-    @XmlElement(name = "VUNr")
-    protected String vuNr;
-    @XmlElement(name = "AuthFilter")
-    protected AuthorizationFilter authFilter;
-    @XmlElement(required = true)
-    protected String policyNumber;
-    protected Boolean withoutFrame;
-
-    /**
-     * Ruft den Wert der vuNr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVUNr() {
-        return vuNr;
-    }
-
-    /**
-     * Legt den Wert der vuNr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVUNr(String value) {
-        this.vuNr = value;
-    }
-
-    /**
-     * Ruft den Wert der authFilter-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public AuthorizationFilter getAuthFilter() {
-        return authFilter;
-    }
-
-    /**
-     * Legt den Wert der authFilter-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public void setAuthFilter(AuthorizationFilter value) {
-        this.authFilter = value;
-    }
-
-    /**
-     * Ruft den Wert der policyNumber-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolicyNumber() {
-        return policyNumber;
-    }
-
-    /**
-     * Legt den Wert der policyNumber-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolicyNumber(String value) {
-        this.policyNumber = value;
-    }
-
-    /**
-     * Ruft den Wert der withoutFrame-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isWithoutFrame() {
-        return withoutFrame;
-    }
-
-    /**
-     * Legt den Wert der withoutFrame-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setWithoutFrame(Boolean value) {
-        this.withoutFrame = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/HttpActionLinkType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/HttpActionLinkType.java
deleted file mode 100644
index 21bf5947..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/HttpActionLinkType.java
+++ /dev/null
@@ -1,142 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-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;
-
-
-/**
- * Definiert einen Deep-Link
- * 
- * 
Java-Klasse für HttpActionLinkType complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="HttpActionLinkType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="url">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <maxLength value="1024"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="type">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}int">
- *               <enumeration value="1"/>
- *               <enumeration value="2"/>
- *               <enumeration value="3"/>
- *               <enumeration value="4"/>
- *               <enumeration value="5"/>
- *               <enumeration value="6"/>
- *               <enumeration value="7"/>
- *               <enumeration value="8"/>
- *               <enumeration value="9"/>
- *               <enumeration value="10"/>
- *               <enumeration value="11"/>
- *               <enumeration value="12"/>
- *               <enumeration value="13"/>
- *               <enumeration value="14"/>
- *               <enumeration value="15"/>
- *               <enumeration value="16"/>
- *               <enumeration value="17"/>
- *               <enumeration value="18"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="validUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HttpActionLinkType", propOrder = {
-    "url",
-    "type",
-    "validUntil"
-})
-public class HttpActionLinkType {
-
-    @XmlElement(required = true)
-    protected String url;
-    protected int type;
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar validUntil;
-
-    /**
-     * Ruft den Wert der url-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUrl() {
-        return url;
-    }
-
-    /**
-     * Legt den Wert der url-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUrl(String value) {
-        this.url = value;
-    }
-
-    /**
-     * Ruft den Wert der type-Eigenschaft ab.
-     * 
-     */
-    public int getType() {
-        return type;
-    }
-
-    /**
-     * Legt den Wert der type-Eigenschaft fest.
-     * 
-     */
-    public void setType(int value) {
-        this.type = value;
-    }
-
-    /**
-     * Ruft den Wert der validUntil-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getValidUntil() {
-        return validUntil;
-    }
-
-    /**
-     * Legt den Wert der validUntil-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setValidUntil(XMLGregorianCalendar value) {
-        this.validUntil = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/LoginRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/LoginRequestType.java
deleted file mode 100644
index d3af91d1..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/LoginRequestType.java
+++ /dev/null
@@ -1,93 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AuthorizationFilter;
-
-
-/**
- * Der Typ des Request-Objekts fuer den allgemeinen Portaleinstieg
- * 
- * 
Java-Klasse für LoginRequestType complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="LoginRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="VUNr" type="{urn:omds20}VUNr" minOccurs="0"/>
- *         <element name="AuthFilter" type="{urn:omds3CommonServiceTypes-1-1-0}AuthorizationFilter" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "LoginRequestType", propOrder = {
-    "vuNr",
-    "authFilter"
-})
-public class LoginRequestType {
-
-    @XmlElement(name = "VUNr")
-    protected String vuNr;
-    @XmlElement(name = "AuthFilter")
-    protected AuthorizationFilter authFilter;
-
-    /**
-     * Ruft den Wert der vuNr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVUNr() {
-        return vuNr;
-    }
-
-    /**
-     * Legt den Wert der vuNr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVUNr(String value) {
-        this.vuNr = value;
-    }
-
-    /**
-     * Ruft den Wert der authFilter-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public AuthorizationFilter getAuthFilter() {
-        return authFilter;
-    }
-
-    /**
-     * Legt den Wert der authFilter-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public void setAuthFilter(AuthorizationFilter value) {
-        this.authFilter = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/OMDSPackageInfoType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/OMDSPackageInfoType.java
deleted file mode 100644
index c2087b99..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/OMDSPackageInfoType.java
+++ /dev/null
@@ -1,238 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-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;
-import at.vvo.omds.types.omds2Types.v2_14.PaketInhCdType;
-import at.vvo.omds.types.omds2Types.v2_14.PaketUmfCdType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ElementIdType;
-
-
-/**
- * Typ fuer die wesentlichen Informationen zu einem OMDS-Datensatz-Package
- * 
- * 
Java-Klasse für OMDSPackageInfoType complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="OMDSPackageInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="VUNr" type="{urn:omds20}VUNr"/>
- *         <element name="MaklerID" type="{urn:omds3CommonServiceTypes-1-1-0}MaklerID_Type"/>
- *         <element name="omdsPackageIdDetails" type="{urn:omds3CommonServiceTypes-1-1-0}ElementIdType"/>
- *         <element name="timeStamp" type="{urn:omds20}Datum-Zeit"/>
- *         <element name="packageSize" type="{http://www.w3.org/2001/XMLSchema}int"/>
- *         <element name="packageExtent" type="{urn:omds20}PaketUmfCd_Type"/>
- *         <element name="packageContentCode" type="{urn:omds20}PaketInhCd_Type" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OMDSPackageInfoType", propOrder = {
-    "vuNr",
-    "maklerID",
-    "omdsPackageIdDetails",
-    "timeStamp",
-    "packageSize",
-    "packageExtent",
-    "packageContentCode"
-})
-public class OMDSPackageInfoType {
-
-    @XmlElement(name = "VUNr", required = true)
-    protected String vuNr;
-    @XmlElement(name = "MaklerID", required = true)
-    protected String maklerID;
-    @XmlElement(required = true)
-    protected ElementIdType omdsPackageIdDetails;
-    @XmlElement(required = true)
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar timeStamp;
-    protected int packageSize;
-    @XmlElement(required = true)
-    @XmlSchemaType(name = "string")
-    protected PaketUmfCdType packageExtent;
-    @XmlElement(required = true)
-    @XmlSchemaType(name = "string")
-    protected List packageContentCode;
-
-    /**
-     * Ruft den Wert der vuNr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVUNr() {
-        return vuNr;
-    }
-
-    /**
-     * Legt den Wert der vuNr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVUNr(String value) {
-        this.vuNr = value;
-    }
-
-    /**
-     * Ruft den Wert der maklerID-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMaklerID() {
-        return maklerID;
-    }
-
-    /**
-     * Legt den Wert der maklerID-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMaklerID(String value) {
-        this.maklerID = value;
-    }
-
-    /**
-     * Ruft den Wert der omdsPackageIdDetails-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ElementIdType }
-     *     
-     */
-    public ElementIdType getOmdsPackageIdDetails() {
-        return omdsPackageIdDetails;
-    }
-
-    /**
-     * Legt den Wert der omdsPackageIdDetails-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ElementIdType }
-     *     
-     */
-    public void setOmdsPackageIdDetails(ElementIdType value) {
-        this.omdsPackageIdDetails = value;
-    }
-
-    /**
-     * Ruft den Wert der timeStamp-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getTimeStamp() {
-        return timeStamp;
-    }
-
-    /**
-     * Legt den Wert der timeStamp-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setTimeStamp(XMLGregorianCalendar value) {
-        this.timeStamp = value;
-    }
-
-    /**
-     * Ruft den Wert der packageSize-Eigenschaft ab.
-     * 
-     */
-    public int getPackageSize() {
-        return packageSize;
-    }
-
-    /**
-     * Legt den Wert der packageSize-Eigenschaft fest.
-     * 
-     */
-    public void setPackageSize(int value) {
-        this.packageSize = value;
-    }
-
-    /**
-     * Ruft den Wert der packageExtent-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PaketUmfCdType }
-     *     
-     */
-    public PaketUmfCdType getPackageExtent() {
-        return packageExtent;
-    }
-
-    /**
-     * Legt den Wert der packageExtent-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PaketUmfCdType }
-     *     
-     */
-    public void setPackageExtent(PaketUmfCdType value) {
-        this.packageExtent = value;
-    }
-
-    /**
-     * Gets the value of the packageContentCode property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the packageContentCode property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getPackageContentCode().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link PaketInhCdType }
-     * 
-     * 
-     */
-    public List getPackageContentCode() {
-        if (packageContentCode == null) {
-            packageContentCode = new ArrayList();
-        }
-        return this.packageContentCode;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/OMDSPackageListRequest.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/OMDSPackageListRequest.java
deleted file mode 100644
index 24a42f4e..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/OMDSPackageListRequest.java
+++ /dev/null
@@ -1,148 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AgentFilterType;
-
-
-/**
- * 
Java-Klasse für OMDSPackageListRequest complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="OMDSPackageListRequest">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="VUNr" type="{urn:omds20}VUNr" minOccurs="0"/>
- *         <element name="agentFilter" type="{urn:omds3CommonServiceTypes-1-1-0}AgentFilter_Type" minOccurs="0"/>
- *         <element name="dateFrom" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
- *         <element name="dateUntil" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OMDSPackageListRequest", propOrder = {
-    "vuNr",
-    "agentFilter",
-    "dateFrom",
-    "dateUntil"
-})
-public class OMDSPackageListRequest {
-
-    @XmlElement(name = "VUNr")
-    protected String vuNr;
-    protected AgentFilterType agentFilter;
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar dateFrom;
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar dateUntil;
-
-    /**
-     * Ruft den Wert der vuNr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVUNr() {
-        return vuNr;
-    }
-
-    /**
-     * Legt den Wert der vuNr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVUNr(String value) {
-        this.vuNr = value;
-    }
-
-    /**
-     * Ruft den Wert der agentFilter-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AgentFilterType }
-     *     
-     */
-    public AgentFilterType getAgentFilter() {
-        return agentFilter;
-    }
-
-    /**
-     * Legt den Wert der agentFilter-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AgentFilterType }
-     *     
-     */
-    public void setAgentFilter(AgentFilterType value) {
-        this.agentFilter = value;
-    }
-
-    /**
-     * Ruft den Wert der dateFrom-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDateFrom() {
-        return dateFrom;
-    }
-
-    /**
-     * Legt den Wert der dateFrom-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDateFrom(XMLGregorianCalendar value) {
-        this.dateFrom = value;
-    }
-
-    /**
-     * Ruft den Wert der dateUntil-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDateUntil() {
-        return dateUntil;
-    }
-
-    /**
-     * Legt den Wert der dateUntil-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDateUntil(XMLGregorianCalendar value) {
-        this.dateUntil = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/OMDSPackageListResponse.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/OMDSPackageListResponse.java
deleted file mode 100644
index 008aabe1..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/OMDSPackageListResponse.java
+++ /dev/null
@@ -1,104 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ServiceFault;
-
-
-/**
- * Dieser Typ definiert eine Liste von OMDS-Datensaetzen
- * 
- * 
Java-Klasse für OMDSPackageListResponse complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="OMDSPackageListResponse">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence minOccurs="0">
- *         <element name="omdsPackageInfo" type="{urn:omds3ServiceTypes-1-1-0}OMDSPackageInfoType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="ServiceFault" type="{urn:omds3CommonServiceTypes-1-1-0}ServiceFault" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OMDSPackageListResponse", propOrder = {
-    "omdsPackageInfo",
-    "serviceFault"
-})
-public class OMDSPackageListResponse {
-
-    protected List omdsPackageInfo;
-    @XmlElement(name = "ServiceFault")
-    protected List serviceFault;
-
-    /**
-     * Gets the value of the omdsPackageInfo property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the omdsPackageInfo property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getOmdsPackageInfo().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link OMDSPackageInfoType }
-     * 
-     * 
-     */
-    public List getOmdsPackageInfo() {
-        if (omdsPackageInfo == null) {
-            omdsPackageInfo = new ArrayList();
-        }
-        return this.omdsPackageInfo;
-    }
-
-    /**
-     * Gets the value of the serviceFault property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the serviceFault property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getServiceFault().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ServiceFault }
-     * 
-     * 
-     */
-    public List getServiceFault() {
-        if (serviceFault == null) {
-            serviceFault = new ArrayList();
-        }
-        return this.serviceFault;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/OMDSPackageRequest.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/OMDSPackageRequest.java
deleted file mode 100644
index bd8fcdde..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/OMDSPackageRequest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AgentFilterType;
-
-
-/**
- * 
Java-Klasse für OMDSPackageRequest complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="OMDSPackageRequest">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="VUNr" type="{urn:omds20}VUNr" minOccurs="0"/>
- *         <element name="agentFilter" type="{urn:omds3CommonServiceTypes-1-1-0}AgentFilter_Type" minOccurs="0"/>
- *         <element name="omdsPackageId" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OMDSPackageRequest", propOrder = {
-    "vuNr",
-    "agentFilter",
-    "omdsPackageId"
-})
-public class OMDSPackageRequest {
-
-    @XmlElement(name = "VUNr")
-    protected String vuNr;
-    protected AgentFilterType agentFilter;
-    @XmlElement(required = true)
-    protected List omdsPackageId;
-
-    /**
-     * Ruft den Wert der vuNr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVUNr() {
-        return vuNr;
-    }
-
-    /**
-     * Legt den Wert der vuNr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVUNr(String value) {
-        this.vuNr = value;
-    }
-
-    /**
-     * Ruft den Wert der agentFilter-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AgentFilterType }
-     *     
-     */
-    public AgentFilterType getAgentFilter() {
-        return agentFilter;
-    }
-
-    /**
-     * Legt den Wert der agentFilter-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AgentFilterType }
-     *     
-     */
-    public void setAgentFilter(AgentFilterType value) {
-        this.agentFilter = value;
-    }
-
-    /**
-     * Gets the value of the omdsPackageId property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the omdsPackageId property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getOmdsPackageId().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List getOmdsPackageId() {
-        if (omdsPackageId == null) {
-            omdsPackageId = new ArrayList();
-        }
-        return this.omdsPackageId;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/OMDSPackageResponse.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/OMDSPackageResponse.java
deleted file mode 100644
index 2cc32231..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/OMDSPackageResponse.java
+++ /dev/null
@@ -1,102 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ServiceFault;
-
-
-/**
- * 
Java-Klasse für OMDSPackageResponse complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="OMDSPackageResponse">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="requestedOmdsPackage" type="{urn:omds3ServiceTypes-1-1-0}RequestedOMDSPackage" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="ServiceFault" type="{urn:omds3CommonServiceTypes-1-1-0}ServiceFault" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OMDSPackageResponse", propOrder = {
-    "requestedOmdsPackage",
-    "serviceFault"
-})
-public class OMDSPackageResponse {
-
-    protected List requestedOmdsPackage;
-    @XmlElement(name = "ServiceFault")
-    protected List serviceFault;
-
-    /**
-     * Gets the value of the requestedOmdsPackage property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the requestedOmdsPackage property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getRequestedOmdsPackage().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link RequestedOMDSPackage }
-     * 
-     * 
-     */
-    public List getRequestedOmdsPackage() {
-        if (requestedOmdsPackage == null) {
-            requestedOmdsPackage = new ArrayList();
-        }
-        return this.requestedOmdsPackage;
-    }
-
-    /**
-     * Gets the value of the serviceFault property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the serviceFault property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getServiceFault().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ServiceFault }
-     * 
-     * 
-     */
-    public List getServiceFault() {
-        if (serviceFault == null) {
-            serviceFault = new ArrayList();
-        }
-        return this.serviceFault;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ObjectFactory.java
deleted file mode 100644
index a377d0f5..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/ObjectFactory.java
+++ /dev/null
@@ -1,457 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-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 at.vvo.omds.types.omds3Types.r1_7_0.servicetypes package. 
- * 
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 _LoginRequest_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "loginRequest");
-    private final static QName _LoginResponse_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "loginResponse");
-    private final static QName _GetUserDataRequest_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "getUserDataRequest");
-    private final static QName _GetUserDataResponse_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "getUserDataResponse");
-    private final static QName _GetOMDSPackageListRequest_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "getOMDSPackageListRequest");
-    private final static QName _GetOMDSPackageListResponse_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "getOMDSPackageListResponse");
-    private final static QName _GetOMDSPackageRequest_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "getOMDSPackageRequest");
-    private final static QName _GetOMDSPackageResponse_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "getOMDSPackageResponse");
-    private final static QName _GetArcImageInfosRequest_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "getArcImageInfosRequest");
-    private final static QName _GetArcImageInfosResponse_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "getArcImageInfosResponse");
-    private final static QName _GetArcImageRequest_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "getArcImageRequest");
-    private final static QName _GetArcImageResponse_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "getArcImageResponse");
-    private final static QName _GetDeepLinkClaimRequest_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "getDeepLinkClaimRequest");
-    private final static QName _GetDeepLinkClaimResponse_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "getDeepLinkClaimResponse");
-    private final static QName _GetDeepLinkPartnerRequest_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "getDeepLinkPartnerRequest");
-    private final static QName _GetDeepLinkPartnerResponse_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "getDeepLinkPartnerResponse");
-    private final static QName _GetDeepLinkOfferRequest_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "getDeepLinkOfferRequest");
-    private final static QName _GetDeepLinkOfferResponse_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "getDeepLinkOfferResponse");
-    private final static QName _GetDeepLinkPolicyRequest_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "getDeepLinkPolicyRequest");
-    private final static QName _GetDeepLinkPolicyResponse_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "getDeepLinkPolicyResponse");
-    private final static QName _GetDeepLinkBusinessObjectResponse_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "getDeepLinkBusinessObjectResponse");
-    private final static QName _WithoutFrame_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "withoutFrame");
-    private final static QName _HttpActionLink_QNAME = new QName("urn:omds3ServiceTypes-1-1-0", "httpActionLink");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.vvo.omds.types.omds3Types.r1_7_0.servicetypes
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link RequestedOMDSPackage }
-     * 
-     */
-    public RequestedOMDSPackage createRequestedOMDSPackage() {
-        return new RequestedOMDSPackage();
-    }
-
-    /**
-     * Create an instance of {@link UserDataResponse }
-     * 
-     */
-    public UserDataResponse createUserDataResponse() {
-        return new UserDataResponse();
-    }
-
-    /**
-     * Create an instance of {@link LoginRequestType }
-     * 
-     */
-    public LoginRequestType createLoginRequestType() {
-        return new LoginRequestType();
-    }
-
-    /**
-     * Create an instance of {@link DeepLinkBusinessObjectResponse }
-     * 
-     */
-    public DeepLinkBusinessObjectResponse createDeepLinkBusinessObjectResponse() {
-        return new DeepLinkBusinessObjectResponse();
-    }
-
-    /**
-     * Create an instance of {@link UserDataRequest }
-     * 
-     */
-    public UserDataRequest createUserDataRequest() {
-        return new UserDataRequest();
-    }
-
-    /**
-     * Create an instance of {@link OMDSPackageListRequest }
-     * 
-     */
-    public OMDSPackageListRequest createOMDSPackageListRequest() {
-        return new OMDSPackageListRequest();
-    }
-
-    /**
-     * Create an instance of {@link OMDSPackageListResponse }
-     * 
-     */
-    public OMDSPackageListResponse createOMDSPackageListResponse() {
-        return new OMDSPackageListResponse();
-    }
-
-    /**
-     * Create an instance of {@link OMDSPackageRequest }
-     * 
-     */
-    public OMDSPackageRequest createOMDSPackageRequest() {
-        return new OMDSPackageRequest();
-    }
-
-    /**
-     * Create an instance of {@link OMDSPackageResponse }
-     * 
-     */
-    public OMDSPackageResponse createOMDSPackageResponse() {
-        return new OMDSPackageResponse();
-    }
-
-    /**
-     * Create an instance of {@link ArcImageInfosRequest }
-     * 
-     */
-    public ArcImageInfosRequest createArcImageInfosRequest() {
-        return new ArcImageInfosRequest();
-    }
-
-    /**
-     * Create an instance of {@link ArcImageInfosResponse }
-     * 
-     */
-    public ArcImageInfosResponse createArcImageInfosResponse() {
-        return new ArcImageInfosResponse();
-    }
-
-    /**
-     * Create an instance of {@link ArcImageRequest }
-     * 
-     */
-    public ArcImageRequest createArcImageRequest() {
-        return new ArcImageRequest();
-    }
-
-    /**
-     * Create an instance of {@link ArcImageResponse }
-     * 
-     */
-    public ArcImageResponse createArcImageResponse() {
-        return new ArcImageResponse();
-    }
-
-    /**
-     * Create an instance of {@link DeepLinkClaimRequest }
-     * 
-     */
-    public DeepLinkClaimRequest createDeepLinkClaimRequest() {
-        return new DeepLinkClaimRequest();
-    }
-
-    /**
-     * Create an instance of {@link DeepLinkPartnerRequest }
-     * 
-     */
-    public DeepLinkPartnerRequest createDeepLinkPartnerRequest() {
-        return new DeepLinkPartnerRequest();
-    }
-
-    /**
-     * Create an instance of {@link DeepLinkOfferRequest }
-     * 
-     */
-    public DeepLinkOfferRequest createDeepLinkOfferRequest() {
-        return new DeepLinkOfferRequest();
-    }
-
-    /**
-     * Create an instance of {@link DeepLinkPolicyRequest }
-     * 
-     */
-    public DeepLinkPolicyRequest createDeepLinkPolicyRequest() {
-        return new DeepLinkPolicyRequest();
-    }
-
-    /**
-     * Create an instance of {@link HttpActionLinkType }
-     * 
-     */
-    public HttpActionLinkType createHttpActionLinkType() {
-        return new HttpActionLinkType();
-    }
-
-    /**
-     * Create an instance of {@link OMDSPackageInfoType }
-     * 
-     */
-    public OMDSPackageInfoType createOMDSPackageInfoType() {
-        return new OMDSPackageInfoType();
-    }
-
-    /**
-     * Create an instance of {@link PolicyPartnerRole }
-     * 
-     */
-    public PolicyPartnerRole createPolicyPartnerRole() {
-        return new PolicyPartnerRole();
-    }
-
-    /**
-     * Create an instance of {@link ArcImageInfo }
-     * 
-     */
-    public ArcImageInfo createArcImageInfo() {
-        return new ArcImageInfo();
-    }
-
-    /**
-     * Create an instance of {@link ArcContent }
-     * 
-     */
-    public ArcContent createArcContent() {
-        return new ArcContent();
-    }
-
-    /**
-     * Create an instance of {@link RequestedOMDSPackage.OmdsPackage }
-     * 
-     */
-    public RequestedOMDSPackage.OmdsPackage createRequestedOMDSPackageOmdsPackage() {
-        return new RequestedOMDSPackage.OmdsPackage();
-    }
-
-    /**
-     * Create an instance of {@link UserDataResponse.AvailableServices }
-     * 
-     */
-    public UserDataResponse.AvailableServices createUserDataResponseAvailableServices() {
-        return new UserDataResponse.AvailableServices();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link LoginRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "loginRequest")
-    public JAXBElement createLoginRequest(LoginRequestType value) {
-        return new JAXBElement(_LoginRequest_QNAME, LoginRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeepLinkBusinessObjectResponse }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "loginResponse")
-    public JAXBElement createLoginResponse(DeepLinkBusinessObjectResponse value) {
-        return new JAXBElement(_LoginResponse_QNAME, DeepLinkBusinessObjectResponse.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link UserDataRequest }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "getUserDataRequest")
-    public JAXBElement createGetUserDataRequest(UserDataRequest value) {
-        return new JAXBElement(_GetUserDataRequest_QNAME, UserDataRequest.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link UserDataResponse }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "getUserDataResponse")
-    public JAXBElement createGetUserDataResponse(UserDataResponse value) {
-        return new JAXBElement(_GetUserDataResponse_QNAME, UserDataResponse.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link OMDSPackageListRequest }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "getOMDSPackageListRequest")
-    public JAXBElement createGetOMDSPackageListRequest(OMDSPackageListRequest value) {
-        return new JAXBElement(_GetOMDSPackageListRequest_QNAME, OMDSPackageListRequest.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link OMDSPackageListResponse }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "getOMDSPackageListResponse")
-    public JAXBElement createGetOMDSPackageListResponse(OMDSPackageListResponse value) {
-        return new JAXBElement(_GetOMDSPackageListResponse_QNAME, OMDSPackageListResponse.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link OMDSPackageRequest }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "getOMDSPackageRequest")
-    public JAXBElement createGetOMDSPackageRequest(OMDSPackageRequest value) {
-        return new JAXBElement(_GetOMDSPackageRequest_QNAME, OMDSPackageRequest.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link OMDSPackageResponse }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "getOMDSPackageResponse")
-    public JAXBElement createGetOMDSPackageResponse(OMDSPackageResponse value) {
-        return new JAXBElement(_GetOMDSPackageResponse_QNAME, OMDSPackageResponse.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ArcImageInfosRequest }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "getArcImageInfosRequest")
-    public JAXBElement createGetArcImageInfosRequest(ArcImageInfosRequest value) {
-        return new JAXBElement(_GetArcImageInfosRequest_QNAME, ArcImageInfosRequest.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ArcImageInfosResponse }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "getArcImageInfosResponse")
-    public JAXBElement createGetArcImageInfosResponse(ArcImageInfosResponse value) {
-        return new JAXBElement(_GetArcImageInfosResponse_QNAME, ArcImageInfosResponse.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ArcImageRequest }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "getArcImageRequest")
-    public JAXBElement createGetArcImageRequest(ArcImageRequest value) {
-        return new JAXBElement(_GetArcImageRequest_QNAME, ArcImageRequest.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ArcImageResponse }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "getArcImageResponse")
-    public JAXBElement createGetArcImageResponse(ArcImageResponse value) {
-        return new JAXBElement(_GetArcImageResponse_QNAME, ArcImageResponse.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeepLinkClaimRequest }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "getDeepLinkClaimRequest")
-    public JAXBElement createGetDeepLinkClaimRequest(DeepLinkClaimRequest value) {
-        return new JAXBElement(_GetDeepLinkClaimRequest_QNAME, DeepLinkClaimRequest.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeepLinkBusinessObjectResponse }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "getDeepLinkClaimResponse")
-    public JAXBElement createGetDeepLinkClaimResponse(DeepLinkBusinessObjectResponse value) {
-        return new JAXBElement(_GetDeepLinkClaimResponse_QNAME, DeepLinkBusinessObjectResponse.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeepLinkPartnerRequest }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "getDeepLinkPartnerRequest")
-    public JAXBElement createGetDeepLinkPartnerRequest(DeepLinkPartnerRequest value) {
-        return new JAXBElement(_GetDeepLinkPartnerRequest_QNAME, DeepLinkPartnerRequest.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeepLinkBusinessObjectResponse }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "getDeepLinkPartnerResponse")
-    public JAXBElement createGetDeepLinkPartnerResponse(DeepLinkBusinessObjectResponse value) {
-        return new JAXBElement(_GetDeepLinkPartnerResponse_QNAME, DeepLinkBusinessObjectResponse.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeepLinkOfferRequest }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "getDeepLinkOfferRequest")
-    public JAXBElement createGetDeepLinkOfferRequest(DeepLinkOfferRequest value) {
-        return new JAXBElement(_GetDeepLinkOfferRequest_QNAME, DeepLinkOfferRequest.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeepLinkBusinessObjectResponse }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "getDeepLinkOfferResponse")
-    public JAXBElement createGetDeepLinkOfferResponse(DeepLinkBusinessObjectResponse value) {
-        return new JAXBElement(_GetDeepLinkOfferResponse_QNAME, DeepLinkBusinessObjectResponse.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeepLinkPolicyRequest }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "getDeepLinkPolicyRequest")
-    public JAXBElement createGetDeepLinkPolicyRequest(DeepLinkPolicyRequest value) {
-        return new JAXBElement(_GetDeepLinkPolicyRequest_QNAME, DeepLinkPolicyRequest.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeepLinkBusinessObjectResponse }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "getDeepLinkPolicyResponse")
-    public JAXBElement createGetDeepLinkPolicyResponse(DeepLinkBusinessObjectResponse value) {
-        return new JAXBElement(_GetDeepLinkPolicyResponse_QNAME, DeepLinkBusinessObjectResponse.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeepLinkBusinessObjectResponse }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "getDeepLinkBusinessObjectResponse")
-    public JAXBElement createGetDeepLinkBusinessObjectResponse(DeepLinkBusinessObjectResponse value) {
-        return new JAXBElement(_GetDeepLinkBusinessObjectResponse_QNAME, DeepLinkBusinessObjectResponse.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "withoutFrame")
-    public JAXBElement createWithoutFrame(Boolean value) {
-        return new JAXBElement(_WithoutFrame_QNAME, Boolean.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link HttpActionLinkType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:omds3ServiceTypes-1-1-0", name = "httpActionLink")
-    public JAXBElement createHttpActionLink(HttpActionLinkType value) {
-        return new JAXBElement(_HttpActionLink_QNAME, HttpActionLinkType.class, null, value);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/PolicyPartnerRole.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/PolicyPartnerRole.java
deleted file mode 100644
index 9fe6d12a..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/PolicyPartnerRole.java
+++ /dev/null
@@ -1,101 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-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 at.vvo.omds.types.omds3Types.r1_7_0.common.PartnerRoleType;
-
-
-/**
- * Partnerrollen in einer Polizze: Versicherungsnehmer, Versicherte Person
- * 
- * 
Java-Klasse für PolicyPartnerRole complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="PolicyPartnerRole">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="partnerNumber" type="{urn:omds20}Personennr"/>
- *         <element name="partnerRole" type="{urn:omds3CommonServiceTypes-1-1-0}PartnerRoleType" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PolicyPartnerRole", propOrder = {
-    "partnerNumber",
-    "partnerRole"
-})
-public class PolicyPartnerRole {
-
-    @XmlElement(required = true)
-    protected String partnerNumber;
-    @XmlSchemaType(name = "string")
-    protected List partnerRole;
-
-    /**
-     * Ruft den Wert der partnerNumber-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPartnerNumber() {
-        return partnerNumber;
-    }
-
-    /**
-     * Legt den Wert der partnerNumber-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPartnerNumber(String value) {
-        this.partnerNumber = value;
-    }
-
-    /**
-     * Gets the value of the partnerRole property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the partnerRole property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getPartnerRole().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link PartnerRoleType }
-     * 
-     * 
-     */
-    public List getPartnerRole() {
-        if (partnerRole == null) {
-            partnerRole = new ArrayList();
-        }
-        return this.partnerRole;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/RequestedOMDSPackage.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/RequestedOMDSPackage.java
deleted file mode 100644
index 7a4f1ab7..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/RequestedOMDSPackage.java
+++ /dev/null
@@ -1,231 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.activation.DataHandler;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlMimeType;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ServiceFault;
-
-
-/**
- * Typ fuer ein OMDS-Datensatz-Package
- * 
- * 
Java-Klasse für RequestedOMDSPackage complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="RequestedOMDSPackage">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="requestedOmdsPackageId">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <minLength value="1"/>
- *               <maxLength value="1024"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="omdsPackage" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="omdsPackageInfo" type="{urn:omds3ServiceTypes-1-1-0}OMDSPackageInfoType"/>
- *                   <element name="content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="ServiceFault" type="{urn:omds3CommonServiceTypes-1-1-0}ServiceFault" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RequestedOMDSPackage", propOrder = {
-    "requestedOmdsPackageId",
-    "omdsPackage",
-    "serviceFault"
-})
-public class RequestedOMDSPackage {
-
-    @XmlElement(required = true)
-    protected String requestedOmdsPackageId;
-    protected RequestedOMDSPackage.OmdsPackage omdsPackage;
-    @XmlElement(name = "ServiceFault")
-    protected List serviceFault;
-
-    /**
-     * Ruft den Wert der requestedOmdsPackageId-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRequestedOmdsPackageId() {
-        return requestedOmdsPackageId;
-    }
-
-    /**
-     * Legt den Wert der requestedOmdsPackageId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRequestedOmdsPackageId(String value) {
-        this.requestedOmdsPackageId = value;
-    }
-
-    /**
-     * Ruft den Wert der omdsPackage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RequestedOMDSPackage.OmdsPackage }
-     *     
-     */
-    public RequestedOMDSPackage.OmdsPackage getOmdsPackage() {
-        return omdsPackage;
-    }
-
-    /**
-     * Legt den Wert der omdsPackage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RequestedOMDSPackage.OmdsPackage }
-     *     
-     */
-    public void setOmdsPackage(RequestedOMDSPackage.OmdsPackage value) {
-        this.omdsPackage = value;
-    }
-
-    /**
-     * Gets the value of the serviceFault property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the serviceFault property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getServiceFault().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ServiceFault }
-     * 
-     * 
-     */
-    public List getServiceFault() {
-        if (serviceFault == null) {
-            serviceFault = new ArrayList();
-        }
-        return this.serviceFault;
-    }
-
-
-    /**
-     * 
Java-Klasse für anonymous complex type.
-     * 
-     * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="omdsPackageInfo" type="{urn:omds3ServiceTypes-1-1-0}OMDSPackageInfoType"/>
-     *         <element name="content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "omdsPackageInfo",
-        "content"
-    })
-    public static class OmdsPackage {
-
-        @XmlElement(required = true)
-        protected OMDSPackageInfoType omdsPackageInfo;
-        @XmlElement(required = true)
-        @XmlMimeType("application/zip")
-        protected DataHandler content;
-
-        /**
-         * Ruft den Wert der omdsPackageInfo-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link OMDSPackageInfoType }
-         *     
-         */
-        public OMDSPackageInfoType getOmdsPackageInfo() {
-            return omdsPackageInfo;
-        }
-
-        /**
-         * Legt den Wert der omdsPackageInfo-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link OMDSPackageInfoType }
-         *     
-         */
-        public void setOmdsPackageInfo(OMDSPackageInfoType value) {
-            this.omdsPackageInfo = value;
-        }
-
-        /**
-         * Ruft den Wert der content-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link DataHandler }
-         *     
-         */
-        public DataHandler getContent() {
-            return content;
-        }
-
-        /**
-         * Legt den Wert der content-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link DataHandler }
-         *     
-         */
-        public void setContent(DataHandler value) {
-            this.content = value;
-        }
-
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/UserDataRequest.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/UserDataRequest.java
deleted file mode 100644
index 99e10b94..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/UserDataRequest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
Java-Klasse für UserDataRequest complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="UserDataRequest">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="VUNr" type="{urn:omds20}VUNr" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "UserDataRequest", propOrder = {
-    "vuNr"
-})
-public class UserDataRequest {
-
-    @XmlElement(name = "VUNr")
-    protected String vuNr;
-
-    /**
-     * Ruft den Wert der vuNr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVUNr() {
-        return vuNr;
-    }
-
-    /**
-     * Legt den Wert der vuNr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVUNr(String value) {
-        this.vuNr = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/UserDataResponse.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/UserDataResponse.java
deleted file mode 100644
index ed30aac4..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/UserDataResponse.java
+++ /dev/null
@@ -1,200 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
-
-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;
-import at.vvo.omds.types.omds2Types.v2_14.PERSONType;
-
-
-/**
- * Response Type mit Benutzerinformationen. Das Element 'address' ist mit Version 1.1.0 entfallen, da diese Informationen auch im Element 'person' übermittelt werden können
- * 			
- * 
- * 
Java-Klasse für UserDataResponse complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="UserDataResponse">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="userid">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <minLength value="1"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="availableServices">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="service" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="person" type="{urn:omds20}PERSON_Type"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "UserDataResponse", propOrder = {
-    "userid",
-    "availableServices",
-    "person"
-})
-public class UserDataResponse {
-
-    @XmlElement(required = true)
-    protected String userid;
-    @XmlElement(required = true)
-    protected UserDataResponse.AvailableServices availableServices;
-    @XmlElement(required = true)
-    protected PERSONType person;
-
-    /**
-     * Ruft den Wert der userid-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserid() {
-        return userid;
-    }
-
-    /**
-     * Legt den Wert der userid-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserid(String value) {
-        this.userid = value;
-    }
-
-    /**
-     * Ruft den Wert der availableServices-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link UserDataResponse.AvailableServices }
-     *     
-     */
-    public UserDataResponse.AvailableServices getAvailableServices() {
-        return availableServices;
-    }
-
-    /**
-     * Legt den Wert der availableServices-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link UserDataResponse.AvailableServices }
-     *     
-     */
-    public void setAvailableServices(UserDataResponse.AvailableServices value) {
-        this.availableServices = value;
-    }
-
-    /**
-     * Ruft den Wert der person-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PERSONType }
-     *     
-     */
-    public PERSONType getPerson() {
-        return person;
-    }
-
-    /**
-     * Legt den Wert der person-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PERSONType }
-     *     
-     */
-    public void setPerson(PERSONType value) {
-        this.person = value;
-    }
-
-
-    /**
-     * 
Java-Klasse für anonymous complex type.
-     * 
-     * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="service" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "service"
-    })
-    public static class AvailableServices {
-
-        @XmlElement(required = true)
-        protected List service;
-
-        /**
-         * Gets the value of the service property.
-         * 
-         * 

-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a set method for the service property.
-         * 
-         * 

-         * For example, to add a new item, do as follows:
-         * 
-         *    getService().add(newItem);
-         * 

-         * 
-         * 
-         * 

-         * Objects of the following type(s) are allowed in the list
-         * {@link String }
-         * 
-         * 
-         */
-        public List getService() {
-            if (service == null) {
-                service = new ArrayList();
-            }
-            return this.service;
-        }
-
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/package-info.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/package-info.java
deleted file mode 100644
index d200410c..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/servicetypes/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:omds3ServiceTypes-1-1-0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package at.vvo.omds.types.omds3Types.r1_7_0.servicetypes;
diff --git a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CalculateKrankenRequest.java b/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CalculateKrankenRequest.java
deleted file mode 100644
index 9cb1c187..00000000
--- a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CalculateKrankenRequest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-
-package kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CalculateRequestGenType;
-
-
-/**
- * Typ des Requestobjekts für eine Berechnung Kranken
- * 
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CalculateRequestGen_Type">
- *       <sequence>
- *         <element name="Berechnungsanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken}SpezBerechnungKranken_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "berechnungsanfrage"
-})
-@XmlRootElement(name = "CalculateKrankenRequest")
-public class CalculateKrankenRequest
-    extends CalculateRequestGenType
-{
-
-    @XmlElement(name = "Berechnungsanfrage", required = true)
-    protected SpezBerechnungKrankenType berechnungsanfrage;
-
-    /**
-     * Ruft den Wert der berechnungsanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezBerechnungKrankenType }
-     *     
-     */
-    public SpezBerechnungKrankenType getBerechnungsanfrage() {
-        return berechnungsanfrage;
-    }
-
-    /**
-     * Legt den Wert der berechnungsanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezBerechnungKrankenType }
-     *     
-     */
-    public void setBerechnungsanfrage(SpezBerechnungKrankenType value) {
-        this.berechnungsanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CalculateKrankenResponse.java b/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CalculateKrankenResponse.java
deleted file mode 100644
index 13bdc725..00000000
--- a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CalculateKrankenResponse.java
+++ /dev/null
@@ -1,69 +0,0 @@
-
-package kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CalculateResponseGenType;
-
-
-/**
- * Typ des Responseobjekts für eine Kranken-Berechnung
- * 
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CalculateResponseGen_Type">
- *       <sequence>
- *         <element name="Berechnungsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken}SpezBerechnungKranken_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "berechnungsantwort"
-})
-@XmlRootElement(name = "CalculateKrankenResponse")
-public class CalculateKrankenResponse
-    extends CalculateResponseGenType
-{
-
-    @XmlElement(name = "Berechnungsantwort", required = true)
-    protected SpezBerechnungKrankenType berechnungsantwort;
-
-    /**
-     * Ruft den Wert der berechnungsantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezBerechnungKrankenType }
-     *     
-     */
-    public SpezBerechnungKrankenType getBerechnungsantwort() {
-        return berechnungsantwort;
-    }
-
-    /**
-     * Legt den Wert der berechnungsantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezBerechnungKrankenType }
-     *     
-     */
-    public void setBerechnungsantwort(SpezBerechnungKrankenType value) {
-        this.berechnungsantwort = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CreateApplicationKrankenRequest.java b/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CreateApplicationKrankenRequest.java
deleted file mode 100644
index 65055795..00000000
--- a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CreateApplicationKrankenRequest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-
-package kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateApplicationRequestGenType;
-
-
-/**
- * Type des Requestobjekts für die Erstellung eines Krankenantrags
- * 
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateApplicationRequestGen_Type">
- *       <sequence>
- *         <element name="Antragsanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken}SpezAntragKranken_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "antragsanfrage"
-})
-@XmlRootElement(name = "CreateApplicationKrankenRequest")
-public class CreateApplicationKrankenRequest
-    extends CreateApplicationRequestGenType
-{
-
-    @XmlElement(name = "Antragsanfrage", required = true)
-    protected SpezAntragKrankenType antragsanfrage;
-
-    /**
-     * Ruft den Wert der antragsanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezAntragKrankenType }
-     *     
-     */
-    public SpezAntragKrankenType getAntragsanfrage() {
-        return antragsanfrage;
-    }
-
-    /**
-     * Legt den Wert der antragsanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezAntragKrankenType }
-     *     
-     */
-    public void setAntragsanfrage(SpezAntragKrankenType value) {
-        this.antragsanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CreateApplicationKrankenResponse.java b/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CreateApplicationKrankenResponse.java
deleted file mode 100644
index 1f456d09..00000000
--- a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CreateApplicationKrankenResponse.java
+++ /dev/null
@@ -1,69 +0,0 @@
-
-package kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateApplicationResponseGenType;
-
-
-/**
- * Type des Responseobjekts für die Erstellung eines Krankenantrags
- * 
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateApplicationResponseGen_Type">
- *       <sequence>
- *         <element name="Antragsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken}SpezAntragKranken_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "antragsantwort"
-})
-@XmlRootElement(name = "CreateApplicationKrankenResponse")
-public class CreateApplicationKrankenResponse
-    extends CreateApplicationResponseGenType
-{
-
-    @XmlElement(name = "Antragsantwort", required = true)
-    protected SpezAntragKrankenType antragsantwort;
-
-    /**
-     * Ruft den Wert der antragsantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezAntragKrankenType }
-     *     
-     */
-    public SpezAntragKrankenType getAntragsantwort() {
-        return antragsantwort;
-    }
-
-    /**
-     * Legt den Wert der antragsantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezAntragKrankenType }
-     *     
-     */
-    public void setAntragsantwort(SpezAntragKrankenType value) {
-        this.antragsantwort = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CreateOfferKrankenRequest.java b/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CreateOfferKrankenRequest.java
deleted file mode 100644
index 01ad4c35..00000000
--- a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CreateOfferKrankenRequest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-
-package kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateOfferRequestGenType;
-
-
-/**
- * Typ des Requestobjekts für eine Erstellung eines Kranken-Offerts
- * 
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateOfferRequestGen_Type">
- *       <sequence>
- *         <element name="Offertanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken}SpezOffertKranken_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "offertanfrage"
-})
-@XmlRootElement(name = "CreateOfferKrankenRequest")
-public class CreateOfferKrankenRequest
-    extends CreateOfferRequestGenType
-{
-
-    @XmlElement(name = "Offertanfrage", required = true)
-    protected SpezOffertKrankenType offertanfrage;
-
-    /**
-     * Ruft den Wert der offertanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezOffertKrankenType }
-     *     
-     */
-    public SpezOffertKrankenType getOffertanfrage() {
-        return offertanfrage;
-    }
-
-    /**
-     * Legt den Wert der offertanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezOffertKrankenType }
-     *     
-     */
-    public void setOffertanfrage(SpezOffertKrankenType value) {
-        this.offertanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CreateOfferKrankenResponse.java b/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CreateOfferKrankenResponse.java
deleted file mode 100644
index 9fef8be0..00000000
--- a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/CreateOfferKrankenResponse.java
+++ /dev/null
@@ -1,69 +0,0 @@
-
-package kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateOfferResponseGenType;
-
-
-/**
- * Type des Responseobjekts für eine Erstellung eines Kranken-Offerts
- * 
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateOfferResponseGen_Type">
- *       <sequence>
- *         <element name="Offertantwort" type="{urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken}SpezOffertKranken_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "offertantwort"
-})
-@XmlRootElement(name = "CreateOfferKrankenResponse")
-public class CreateOfferKrankenResponse
-    extends CreateOfferResponseGenType
-{
-
-    @XmlElement(name = "Offertantwort", required = true)
-    protected SpezOffertKrankenType offertantwort;
-
-    /**
-     * Ruft den Wert der offertantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezOffertKrankenType }
-     *     
-     */
-    public SpezOffertKrankenType getOffertantwort() {
-        return offertantwort;
-    }
-
-    /**
-     * Legt den Wert der offertantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezOffertKrankenType }
-     *     
-     */
-    public void setOffertantwort(SpezOffertKrankenType value) {
-        this.offertantwort = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/ElementarproduktKrankenType.java b/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/ElementarproduktKrankenType.java
deleted file mode 100644
index e03aadec..00000000
--- a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/ElementarproduktKrankenType.java
+++ /dev/null
@@ -1,68 +0,0 @@
-
-package kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ElementarproduktGenerischType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.SelbstbehaltType;
-
-
-/**
- * Typ für ein Elementarprodukt in der Sparte Kranken. Von diesem Typ werden etwaige unternehmesspezifische Deckungen oder potentielle Standard-Deckungen abgeleitet.
- * 
- * 
Java-Klasse für ElementarproduktKranken_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ElementarproduktKranken_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ElementarproduktGenerisch_Type">
- *       <sequence>
- *         <element name="Selbstbehalt" type="{urn:omds3CommonServiceTypes-1-1-0}Selbstbehalt_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ElementarproduktKranken_Type", propOrder = {
-    "selbstbehalt"
-})
-public class ElementarproduktKrankenType
-    extends ElementarproduktGenerischType
-{
-
-    @XmlElement(name = "Selbstbehalt")
-    protected SelbstbehaltType selbstbehalt;
-
-    /**
-     * Ruft den Wert der selbstbehalt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SelbstbehaltType }
-     *     
-     */
-    public SelbstbehaltType getSelbstbehalt() {
-        return selbstbehalt;
-    }
-
-    /**
-     * Legt den Wert der selbstbehalt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SelbstbehaltType }
-     *     
-     */
-    public void setSelbstbehalt(SelbstbehaltType value) {
-        this.selbstbehalt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/ObjectFactory.java
deleted file mode 100644
index 35a1798c..00000000
--- a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/ObjectFactory.java
+++ /dev/null
@@ -1,144 +0,0 @@
-
-package kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at package. 
- * 
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 {
-
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link CalculateKrankenRequest }
-     * 
-     */
-    public CalculateKrankenRequest createCalculateKrankenRequest() {
-        return new CalculateKrankenRequest();
-    }
-
-    /**
-     * Create an instance of {@link SpezBerechnungKrankenType }
-     * 
-     */
-    public SpezBerechnungKrankenType createSpezBerechnungKrankenType() {
-        return new SpezBerechnungKrankenType();
-    }
-
-    /**
-     * Create an instance of {@link CalculateKrankenResponse }
-     * 
-     */
-    public CalculateKrankenResponse createCalculateKrankenResponse() {
-        return new CalculateKrankenResponse();
-    }
-
-    /**
-     * Create an instance of {@link CreateOfferKrankenRequest }
-     * 
-     */
-    public CreateOfferKrankenRequest createCreateOfferKrankenRequest() {
-        return new CreateOfferKrankenRequest();
-    }
-
-    /**
-     * Create an instance of {@link SpezOffertKrankenType }
-     * 
-     */
-    public SpezOffertKrankenType createSpezOffertKrankenType() {
-        return new SpezOffertKrankenType();
-    }
-
-    /**
-     * Create an instance of {@link CreateOfferKrankenResponse }
-     * 
-     */
-    public CreateOfferKrankenResponse createCreateOfferKrankenResponse() {
-        return new CreateOfferKrankenResponse();
-    }
-
-    /**
-     * Create an instance of {@link CreateApplicationKrankenRequest }
-     * 
-     */
-    public CreateApplicationKrankenRequest createCreateApplicationKrankenRequest() {
-        return new CreateApplicationKrankenRequest();
-    }
-
-    /**
-     * Create an instance of {@link SpezAntragKrankenType }
-     * 
-     */
-    public SpezAntragKrankenType createSpezAntragKrankenType() {
-        return new SpezAntragKrankenType();
-    }
-
-    /**
-     * Create an instance of {@link CreateApplicationKrankenResponse }
-     * 
-     */
-    public CreateApplicationKrankenResponse createCreateApplicationKrankenResponse() {
-        return new CreateApplicationKrankenResponse();
-    }
-
-    /**
-     * Create an instance of {@link SubmitApplicationKrankenRequest }
-     * 
-     */
-    public SubmitApplicationKrankenRequest createSubmitApplicationKrankenRequest() {
-        return new SubmitApplicationKrankenRequest();
-    }
-
-    /**
-     * Create an instance of {@link SubmitApplicationKrankenResponse }
-     * 
-     */
-    public SubmitApplicationKrankenResponse createSubmitApplicationKrankenResponse() {
-        return new SubmitApplicationKrankenResponse();
-    }
-
-    /**
-     * Create an instance of {@link VerkaufsproduktKrankenType }
-     * 
-     */
-    public VerkaufsproduktKrankenType createVerkaufsproduktKrankenType() {
-        return new VerkaufsproduktKrankenType();
-    }
-
-    /**
-     * Create an instance of {@link ProduktKrankenType }
-     * 
-     */
-    public ProduktKrankenType createProduktKrankenType() {
-        return new ProduktKrankenType();
-    }
-
-    /**
-     * Create an instance of {@link ElementarproduktKrankenType }
-     * 
-     */
-    public ElementarproduktKrankenType createElementarproduktKrankenType() {
-        return new ElementarproduktKrankenType();
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/ProduktKrankenType.java b/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/ProduktKrankenType.java
deleted file mode 100644
index a02a89fe..00000000
--- a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/ProduktKrankenType.java
+++ /dev/null
@@ -1,103 +0,0 @@
-
-package kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ProduktMitVpType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.SelbstbehaltType;
-
-
-/**
- * Typ für ein Produkt in der Sparte Kranken. Von diesem Typ können einzelne VUs ihre eigenen Produkte ableiten, wenn sie möchten.
- * 
- * 
Java-Klasse für ProduktKranken_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProduktKranken_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ProduktMitVp_Type">
- *       <sequence>
- *         <element name="Elementarprodukte" type="{urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken}ElementarproduktKranken_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Selbstbehalt" type="{urn:omds3CommonServiceTypes-1-1-0}Selbstbehalt_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProduktKranken_Type", propOrder = {
-    "elementarprodukte",
-    "selbstbehalt"
-})
-public class ProduktKrankenType
-    extends ProduktMitVpType
-{
-
-    @XmlElement(name = "Elementarprodukte")
-    protected List elementarprodukte;
-    @XmlElement(name = "Selbstbehalt")
-    protected SelbstbehaltType selbstbehalt;
-
-    /**
-     * Gets the value of the elementarprodukte property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the elementarprodukte property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getElementarprodukte().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ElementarproduktKrankenType }
-     * 
-     * 
-     */
-    public List getElementarprodukte() {
-        if (elementarprodukte == null) {
-            elementarprodukte = new ArrayList();
-        }
-        return this.elementarprodukte;
-    }
-
-    /**
-     * Ruft den Wert der selbstbehalt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SelbstbehaltType }
-     *     
-     */
-    public SelbstbehaltType getSelbstbehalt() {
-        return selbstbehalt;
-    }
-
-    /**
-     * Legt den Wert der selbstbehalt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SelbstbehaltType }
-     *     
-     */
-    public void setSelbstbehalt(SelbstbehaltType value) {
-        this.selbstbehalt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/SpezAntragKrankenType.java b/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/SpezAntragKrankenType.java
deleted file mode 100644
index 3c080f10..00000000
--- a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/SpezAntragKrankenType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SpezAntragType;
-
-
-/**
- * Typ für den Schritt Antrags-Erzeugung
- * 
- * 
Java-Klasse für SpezAntragKranken_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezAntragKranken_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezAntrag_Type">
- *       <sequence>
- *         <element name="Verkaufsprodukt" type="{urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken}VerkaufsproduktKranken_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezAntragKranken_Type", propOrder = {
-    "verkaufsprodukt"
-})
-public class SpezAntragKrankenType
-    extends SpezAntragType
-{
-
-    @XmlElement(name = "Verkaufsprodukt", required = true)
-    protected VerkaufsproduktKrankenType verkaufsprodukt;
-
-    /**
-     * Ruft den Wert der verkaufsprodukt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VerkaufsproduktKrankenType }
-     *     
-     */
-    public VerkaufsproduktKrankenType getVerkaufsprodukt() {
-        return verkaufsprodukt;
-    }
-
-    /**
-     * Legt den Wert der verkaufsprodukt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VerkaufsproduktKrankenType }
-     *     
-     */
-    public void setVerkaufsprodukt(VerkaufsproduktKrankenType value) {
-        this.verkaufsprodukt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/SpezBerechnungKrankenType.java b/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/SpezBerechnungKrankenType.java
deleted file mode 100644
index cde676ab..00000000
--- a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/SpezBerechnungKrankenType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SpezBerechnungType;
-
-
-/**
- * Typ für den Schritt Berechnung
- * 
- * 
Java-Klasse für SpezBerechnungKranken_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezBerechnungKranken_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezBerechnung_Type">
- *       <sequence>
- *         <element name="Verkaufsprodukt" type="{urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken}VerkaufsproduktKranken_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezBerechnungKranken_Type", propOrder = {
-    "verkaufsprodukt"
-})
-public class SpezBerechnungKrankenType
-    extends SpezBerechnungType
-{
-
-    @XmlElement(name = "Verkaufsprodukt", required = true)
-    protected VerkaufsproduktKrankenType verkaufsprodukt;
-
-    /**
-     * Ruft den Wert der verkaufsprodukt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VerkaufsproduktKrankenType }
-     *     
-     */
-    public VerkaufsproduktKrankenType getVerkaufsprodukt() {
-        return verkaufsprodukt;
-    }
-
-    /**
-     * Legt den Wert der verkaufsprodukt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VerkaufsproduktKrankenType }
-     *     
-     */
-    public void setVerkaufsprodukt(VerkaufsproduktKrankenType value) {
-        this.verkaufsprodukt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/SpezOffertKrankenType.java b/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/SpezOffertKrankenType.java
deleted file mode 100644
index 23462db8..00000000
--- a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/SpezOffertKrankenType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SpezOffertType;
-
-
-/**
- * Typ für den Schritt Offert-Erzeugung
- * 
- * 
Java-Klasse für SpezOffertKranken_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezOffertKranken_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezOffert_Type">
- *       <sequence>
- *         <element name="Verkaufsprodukt" type="{urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken}VerkaufsproduktKranken_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezOffertKranken_Type", propOrder = {
-    "verkaufsprodukt"
-})
-public class SpezOffertKrankenType
-    extends SpezOffertType
-{
-
-    @XmlElement(name = "Verkaufsprodukt", required = true)
-    protected VerkaufsproduktKrankenType verkaufsprodukt;
-
-    /**
-     * Ruft den Wert der verkaufsprodukt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VerkaufsproduktKrankenType }
-     *     
-     */
-    public VerkaufsproduktKrankenType getVerkaufsprodukt() {
-        return verkaufsprodukt;
-    }
-
-    /**
-     * Legt den Wert der verkaufsprodukt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VerkaufsproduktKrankenType }
-     *     
-     */
-    public void setVerkaufsprodukt(VerkaufsproduktKrankenType value) {
-        this.verkaufsprodukt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/SubmitApplicationKrankenRequest.java b/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/SubmitApplicationKrankenRequest.java
deleted file mode 100644
index fbace0d3..00000000
--- a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/SubmitApplicationKrankenRequest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-
-package kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SubmitApplicationRequestGenType;
-
-
-/**
- * Type des Requests, um den Antrag einzureichen
- * 
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SubmitApplicationRequestGen_Type">
- *       <sequence>
- *         <element name="Antragsanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken}SpezAntragKranken_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "antragsanfrage"
-})
-@XmlRootElement(name = "SubmitApplicationKrankenRequest")
-public class SubmitApplicationKrankenRequest
-    extends SubmitApplicationRequestGenType
-{
-
-    @XmlElement(name = "Antragsanfrage")
-    protected SpezAntragKrankenType antragsanfrage;
-
-    /**
-     * Ruft den Wert der antragsanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezAntragKrankenType }
-     *     
-     */
-    public SpezAntragKrankenType getAntragsanfrage() {
-        return antragsanfrage;
-    }
-
-    /**
-     * Legt den Wert der antragsanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezAntragKrankenType }
-     *     
-     */
-    public void setAntragsanfrage(SpezAntragKrankenType value) {
-        this.antragsanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/SubmitApplicationKrankenResponse.java b/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/SubmitApplicationKrankenResponse.java
deleted file mode 100644
index 6fdf0b1d..00000000
--- a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/SubmitApplicationKrankenResponse.java
+++ /dev/null
@@ -1,69 +0,0 @@
-
-package kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SubmitApplicationResponseGenType;
-
-
-/**
- * Type des Response, um den Antrag einzureichen
- * 
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SubmitApplicationResponseGen_Type">
- *       <sequence>
- *         <element name="Antragsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken}SpezAntragKranken_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "antragsantwort"
-})
-@XmlRootElement(name = "SubmitApplicationKrankenResponse")
-public class SubmitApplicationKrankenResponse
-    extends SubmitApplicationResponseGenType
-{
-
-    @XmlElement(name = "Antragsantwort", required = true)
-    protected SpezAntragKrankenType antragsantwort;
-
-    /**
-     * Ruft den Wert der antragsantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezAntragKrankenType }
-     *     
-     */
-    public SpezAntragKrankenType getAntragsantwort() {
-        return antragsantwort;
-    }
-
-    /**
-     * Legt den Wert der antragsantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezAntragKrankenType }
-     *     
-     */
-    public void setAntragsantwort(SpezAntragKrankenType value) {
-        this.antragsantwort = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/VerkaufsproduktKrankenType.java b/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/VerkaufsproduktKrankenType.java
deleted file mode 100644
index 5e78e900..00000000
--- a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/VerkaufsproduktKrankenType.java
+++ /dev/null
@@ -1,170 +0,0 @@
-
-package kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ProduktGenerischType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VerkaufsproduktGenerischType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VersichertePersonType;
-
-
-/**
- * Typ für ein Verkaufsprodukt in der Sparte Krankenversicherung
- * 
- * 
Java-Klasse für VerkaufsproduktKranken_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VerkaufsproduktKranken_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}VerkaufsproduktGenerisch_Type">
- *       <sequence>
- *         <element name="Krankenprodukte" type="{urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken}ProduktKranken_Type" maxOccurs="unbounded"/>
- *         <element name="Zusatzprodukte" type="{urn:omds3CommonServiceTypes-1-1-0}ProduktGenerisch_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="VersichertePersonen" type="{urn:omds3CommonServiceTypes-1-1-0}VersichertePerson_Type" maxOccurs="unbounded"/>
- *         <element name="Gruppe" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VerkaufsproduktKranken_Type", propOrder = {
-    "krankenprodukte",
-    "zusatzprodukte",
-    "versichertePersonen",
-    "gruppe"
-})
-public class VerkaufsproduktKrankenType
-    extends VerkaufsproduktGenerischType
-{
-
-    @XmlElement(name = "Krankenprodukte", required = true)
-    protected List krankenprodukte;
-    @XmlElement(name = "Zusatzprodukte")
-    protected List zusatzprodukte;
-    @XmlElement(name = "VersichertePersonen", required = true)
-    protected List versichertePersonen;
-    @XmlElement(name = "Gruppe")
-    protected String gruppe;
-
-    /**
-     * Gets the value of the krankenprodukte property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the krankenprodukte property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getKrankenprodukte().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ProduktKrankenType }
-     * 
-     * 
-     */
-    public List getKrankenprodukte() {
-        if (krankenprodukte == null) {
-            krankenprodukte = new ArrayList();
-        }
-        return this.krankenprodukte;
-    }
-
-    /**
-     * Gets the value of the zusatzprodukte property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zusatzprodukte property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZusatzprodukte().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ProduktGenerischType }
-     * 
-     * 
-     */
-    public List getZusatzprodukte() {
-        if (zusatzprodukte == null) {
-            zusatzprodukte = new ArrayList();
-        }
-        return this.zusatzprodukte;
-    }
-
-    /**
-     * Gets the value of the versichertePersonen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the versichertePersonen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVersichertePersonen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link VersichertePersonType }
-     * 
-     * 
-     */
-    public List getVersichertePersonen() {
-        if (versichertePersonen == null) {
-            versichertePersonen = new ArrayList();
-        }
-        return this.versichertePersonen;
-    }
-
-    /**
-     * Ruft den Wert der gruppe-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGruppe() {
-        return gruppe;
-    }
-
-    /**
-     * Legt den Wert der gruppe-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGruppe(String value) {
-        this.gruppe = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/package-info.java b/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/package-info.java
deleted file mode 100644
index 27b1a109..00000000
--- a/OMDSServiceDefinition/src/main/java/kranken/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package kranken.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CalculateLebenRequestType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CalculateLebenRequestType.java
deleted file mode 100644
index b602938e..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CalculateLebenRequestType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CalculateRequestGenType;
-
-
-/**
- * Typ des Requestobjekts für eine Berechnung Leben
- * 
- * 
Java-Klasse für CalculateLebenRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CalculateLebenRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CalculateRequestGen_Type">
- *       <sequence>
- *         <element name="Berechnungsanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}SpezBerechnungLeben_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CalculateLebenRequest_Type", propOrder = {
-    "berechnungsanfrage"
-})
-public class CalculateLebenRequestType
-    extends CalculateRequestGenType
-{
-
-    @XmlElement(name = "Berechnungsanfrage", required = true)
-    protected SpezBerechnungLebenType berechnungsanfrage;
-
-    /**
-     * Ruft den Wert der berechnungsanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezBerechnungLebenType }
-     *     
-     */
-    public SpezBerechnungLebenType getBerechnungsanfrage() {
-        return berechnungsanfrage;
-    }
-
-    /**
-     * Legt den Wert der berechnungsanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezBerechnungLebenType }
-     *     
-     */
-    public void setBerechnungsanfrage(SpezBerechnungLebenType value) {
-        this.berechnungsanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CalculateLebenResponseType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CalculateLebenResponseType.java
deleted file mode 100644
index 5f2b18af..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CalculateLebenResponseType.java
+++ /dev/null
@@ -1,102 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CalculateResponseGenType;
-
-
-/**
- * Typ des Responseobjekts für eine Leben-Berechnung
- * 
- * 
Java-Klasse für CalculateLebenResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CalculateLebenResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CalculateResponseGen_Type">
- *       <sequence>
- *         <element name="Berechnungsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}SpezBerechnungLeben_Type"/>
- *         <element name="Upsellingvarianten" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}SpezBerechnungLeben_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CalculateLebenResponse_Type", propOrder = {
-    "berechnungsantwort",
-    "upsellingvarianten"
-})
-public class CalculateLebenResponseType
-    extends CalculateResponseGenType
-{
-
-    @XmlElement(name = "Berechnungsantwort", required = true)
-    protected SpezBerechnungLebenType berechnungsantwort;
-    @XmlElement(name = "Upsellingvarianten")
-    protected List upsellingvarianten;
-
-    /**
-     * Ruft den Wert der berechnungsantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezBerechnungLebenType }
-     *     
-     */
-    public SpezBerechnungLebenType getBerechnungsantwort() {
-        return berechnungsantwort;
-    }
-
-    /**
-     * Legt den Wert der berechnungsantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezBerechnungLebenType }
-     *     
-     */
-    public void setBerechnungsantwort(SpezBerechnungLebenType value) {
-        this.berechnungsantwort = value;
-    }
-
-    /**
-     * Gets the value of the upsellingvarianten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the upsellingvarianten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getUpsellingvarianten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link SpezBerechnungLebenType }
-     * 
-     * 
-     */
-    public List getUpsellingvarianten() {
-        if (upsellingvarianten == null) {
-            upsellingvarianten = new ArrayList();
-        }
-        return this.upsellingvarianten;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CreateApplicationLebenRequestType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CreateApplicationLebenRequestType.java
deleted file mode 100644
index a341690e..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CreateApplicationLebenRequestType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateApplicationRequestGenType;
-
-
-/**
- * Type des Requestobjekts für die Erstellung eines Leben-Antrags
- * 
- * 
Java-Klasse für CreateApplicationLebenRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateApplicationLebenRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateApplicationRequestGen_Type">
- *       <sequence>
- *         <element name="Antragsanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}SpezAntragLeben_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateApplicationLebenRequest_Type", propOrder = {
-    "antragsanfrage"
-})
-public class CreateApplicationLebenRequestType
-    extends CreateApplicationRequestGenType
-{
-
-    @XmlElement(name = "Antragsanfrage", required = true)
-    protected SpezAntragLebenType antragsanfrage;
-
-    /**
-     * Ruft den Wert der antragsanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezAntragLebenType }
-     *     
-     */
-    public SpezAntragLebenType getAntragsanfrage() {
-        return antragsanfrage;
-    }
-
-    /**
-     * Legt den Wert der antragsanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezAntragLebenType }
-     *     
-     */
-    public void setAntragsanfrage(SpezAntragLebenType value) {
-        this.antragsanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CreateApplicationLebenResponseType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CreateApplicationLebenResponseType.java
deleted file mode 100644
index 714591f8..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CreateApplicationLebenResponseType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateApplicationResponseGenType;
-
-
-/**
- * Type des Responseobjekts für die Erstellung eines Leben-Antrags
- * 
- * 
Java-Klasse für CreateApplicationLebenResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateApplicationLebenResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateApplicationResponseGen_Type">
- *       <sequence>
- *         <element name="Antragsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}SpezAntragLeben_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateApplicationLebenResponse_Type", propOrder = {
-    "antragsantwort"
-})
-public class CreateApplicationLebenResponseType
-    extends CreateApplicationResponseGenType
-{
-
-    @XmlElement(name = "Antragsantwort", required = true)
-    protected SpezAntragLebenType antragsantwort;
-
-    /**
-     * Ruft den Wert der antragsantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezAntragLebenType }
-     *     
-     */
-    public SpezAntragLebenType getAntragsantwort() {
-        return antragsantwort;
-    }
-
-    /**
-     * Legt den Wert der antragsantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezAntragLebenType }
-     *     
-     */
-    public void setAntragsantwort(SpezAntragLebenType value) {
-        this.antragsantwort = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CreateOfferLebenRequestType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CreateOfferLebenRequestType.java
deleted file mode 100644
index 54117e3b..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CreateOfferLebenRequestType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateOfferRequestGenType;
-
-
-/**
- * Typ des Requestobjekts für eine Erstellung eines Leben-Offerts
- * 
- * 
Java-Klasse für CreateOfferLebenRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateOfferLebenRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateOfferRequestGen_Type">
- *       <sequence>
- *         <element name="Offertanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}SpezOffertLeben_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateOfferLebenRequest_Type", propOrder = {
-    "offertanfrage"
-})
-public class CreateOfferLebenRequestType
-    extends CreateOfferRequestGenType
-{
-
-    @XmlElement(name = "Offertanfrage", required = true)
-    protected SpezOffertLebenType offertanfrage;
-
-    /**
-     * Ruft den Wert der offertanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezOffertLebenType }
-     *     
-     */
-    public SpezOffertLebenType getOffertanfrage() {
-        return offertanfrage;
-    }
-
-    /**
-     * Legt den Wert der offertanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezOffertLebenType }
-     *     
-     */
-    public void setOffertanfrage(SpezOffertLebenType value) {
-        this.offertanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CreateOfferLebenResponseType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CreateOfferLebenResponseType.java
deleted file mode 100644
index df43ea80..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/CreateOfferLebenResponseType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateOfferResponseGenType;
-
-
-/**
- * Type des Responseobjekts für eine Erstellung eines Leben-Offerts
- * 
- * 
Java-Klasse für CreateOfferLebenResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateOfferLebenResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateOfferResponseGen_Type">
- *       <sequence>
- *         <element name="Offertantwort" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}SpezOffertLeben_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateOfferLebenResponse_Type", propOrder = {
-    "offertantwort"
-})
-public class CreateOfferLebenResponseType
-    extends CreateOfferResponseGenType
-{
-
-    @XmlElement(name = "Offertantwort", required = true)
-    protected SpezOffertLebenType offertantwort;
-
-    /**
-     * Ruft den Wert der offertantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezOffertLebenType }
-     *     
-     */
-    public SpezOffertLebenType getOffertantwort() {
-        return offertantwort;
-    }
-
-    /**
-     * Legt den Wert der offertantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezOffertLebenType }
-     *     
-     */
-    public void setOffertantwort(SpezOffertLebenType value) {
-        this.offertantwort = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ObjectFactory.java
deleted file mode 100644
index c6ead6d4..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ObjectFactory.java
+++ /dev/null
@@ -1,318 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-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 leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at package. 
- * 
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 _CalculateLebenRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", "CalculateLebenRequest");
-    private final static QName _CalculateLebenResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", "CalculateLebenResponse");
-    private final static QName _CreateOfferLebenRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", "CreateOfferLebenRequest");
-    private final static QName _CreateOfferLebenResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", "CreateOfferLebenResponse");
-    private final static QName _CreateApplicationLebenRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", "CreateApplicationLebenRequest");
-    private final static QName _CreateApplicationLebenResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", "CreateApplicationLebenResponse");
-    private final static QName _SubmitApplicationLebenRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", "SubmitApplicationLebenRequest");
-    private final static QName _SubmitApplicationLebenResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", "SubmitApplicationLebenResponse");
-    private final static QName _ZusatzversicherungUnfallinvaliditaetTypeVersicherungssumme_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", "Versicherungssumme");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link CalculateLebenRequestType }
-     * 
-     */
-    public CalculateLebenRequestType createCalculateLebenRequestType() {
-        return new CalculateLebenRequestType();
-    }
-
-    /**
-     * Create an instance of {@link CalculateLebenResponseType }
-     * 
-     */
-    public CalculateLebenResponseType createCalculateLebenResponseType() {
-        return new CalculateLebenResponseType();
-    }
-
-    /**
-     * Create an instance of {@link CreateOfferLebenRequestType }
-     * 
-     */
-    public CreateOfferLebenRequestType createCreateOfferLebenRequestType() {
-        return new CreateOfferLebenRequestType();
-    }
-
-    /**
-     * Create an instance of {@link CreateOfferLebenResponseType }
-     * 
-     */
-    public CreateOfferLebenResponseType createCreateOfferLebenResponseType() {
-        return new CreateOfferLebenResponseType();
-    }
-
-    /**
-     * Create an instance of {@link CreateApplicationLebenRequestType }
-     * 
-     */
-    public CreateApplicationLebenRequestType createCreateApplicationLebenRequestType() {
-        return new CreateApplicationLebenRequestType();
-    }
-
-    /**
-     * Create an instance of {@link CreateApplicationLebenResponseType }
-     * 
-     */
-    public CreateApplicationLebenResponseType createCreateApplicationLebenResponseType() {
-        return new CreateApplicationLebenResponseType();
-    }
-
-    /**
-     * Create an instance of {@link SubmitApplicationLebenRequestType }
-     * 
-     */
-    public SubmitApplicationLebenRequestType createSubmitApplicationLebenRequestType() {
-        return new SubmitApplicationLebenRequestType();
-    }
-
-    /**
-     * Create an instance of {@link SubmitApplicationLebenResponseType }
-     * 
-     */
-    public SubmitApplicationLebenResponseType createSubmitApplicationLebenResponseType() {
-        return new SubmitApplicationLebenResponseType();
-    }
-
-    /**
-     * Create an instance of {@link VerkaufsproduktLebenType }
-     * 
-     */
-    public VerkaufsproduktLebenType createVerkaufsproduktLebenType() {
-        return new VerkaufsproduktLebenType();
-    }
-
-    /**
-     * Create an instance of {@link ProduktLebenType }
-     * 
-     */
-    public ProduktLebenType createProduktLebenType() {
-        return new ProduktLebenType();
-    }
-
-    /**
-     * Create an instance of {@link TarifLebenType }
-     * 
-     */
-    public TarifLebenType createTarifLebenType() {
-        return new TarifLebenType();
-    }
-
-    /**
-     * Create an instance of {@link ZusatzversicherungLebenType }
-     * 
-     */
-    public ZusatzversicherungLebenType createZusatzversicherungLebenType() {
-        return new ZusatzversicherungLebenType();
-    }
-
-    /**
-     * Create an instance of {@link ZusatzversicherungBerufsunfaehigkeitType }
-     * 
-     */
-    public ZusatzversicherungBerufsunfaehigkeitType createZusatzversicherungBerufsunfaehigkeitType() {
-        return new ZusatzversicherungBerufsunfaehigkeitType();
-    }
-
-    /**
-     * Create an instance of {@link ZusatzversicherungErwerbsunfaehigkeitType }
-     * 
-     */
-    public ZusatzversicherungErwerbsunfaehigkeitType createZusatzversicherungErwerbsunfaehigkeitType() {
-        return new ZusatzversicherungErwerbsunfaehigkeitType();
-    }
-
-    /**
-     * Create an instance of {@link ZusatzversicherungPraemienuebernahmeAblebenType }
-     * 
-     */
-    public ZusatzversicherungPraemienuebernahmeAblebenType createZusatzversicherungPraemienuebernahmeAblebenType() {
-        return new ZusatzversicherungPraemienuebernahmeAblebenType();
-    }
-
-    /**
-     * Create an instance of {@link ZusatzversicherungUnfalltodType }
-     * 
-     */
-    public ZusatzversicherungUnfalltodType createZusatzversicherungUnfalltodType() {
-        return new ZusatzversicherungUnfalltodType();
-    }
-
-    /**
-     * Create an instance of {@link ZusatzversicherungUnfallinvaliditaetType }
-     * 
-     */
-    public ZusatzversicherungUnfallinvaliditaetType createZusatzversicherungUnfallinvaliditaetType() {
-        return new ZusatzversicherungUnfallinvaliditaetType();
-    }
-
-    /**
-     * Create an instance of {@link ZusatzproduktLebenType }
-     * 
-     */
-    public ZusatzproduktLebenType createZusatzproduktLebenType() {
-        return new ZusatzproduktLebenType();
-    }
-
-    /**
-     * Create an instance of {@link RentenoptionType }
-     * 
-     */
-    public RentenoptionType createRentenoptionType() {
-        return new RentenoptionType();
-    }
-
-    /**
-     * Create an instance of {@link VersicherungssummeZusatzbausteinType }
-     * 
-     */
-    public VersicherungssummeZusatzbausteinType createVersicherungssummeZusatzbausteinType() {
-        return new VersicherungssummeZusatzbausteinType();
-    }
-
-    /**
-     * Create an instance of {@link SpezBerechnungLebenType }
-     * 
-     */
-    public SpezBerechnungLebenType createSpezBerechnungLebenType() {
-        return new SpezBerechnungLebenType();
-    }
-
-    /**
-     * Create an instance of {@link SpezOffertLebenType }
-     * 
-     */
-    public SpezOffertLebenType createSpezOffertLebenType() {
-        return new SpezOffertLebenType();
-    }
-
-    /**
-     * Create an instance of {@link SpezAntragLebenType }
-     * 
-     */
-    public SpezAntragLebenType createSpezAntragLebenType() {
-        return new SpezAntragLebenType();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CalculateLebenRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", name = "CalculateLebenRequest")
-    public JAXBElement createCalculateLebenRequest(CalculateLebenRequestType value) {
-        return new JAXBElement(_CalculateLebenRequest_QNAME, CalculateLebenRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CalculateLebenResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", name = "CalculateLebenResponse")
-    public JAXBElement createCalculateLebenResponse(CalculateLebenResponseType value) {
-        return new JAXBElement(_CalculateLebenResponse_QNAME, CalculateLebenResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateOfferLebenRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", name = "CreateOfferLebenRequest")
-    public JAXBElement createCreateOfferLebenRequest(CreateOfferLebenRequestType value) {
-        return new JAXBElement(_CreateOfferLebenRequest_QNAME, CreateOfferLebenRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateOfferLebenResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", name = "CreateOfferLebenResponse")
-    public JAXBElement createCreateOfferLebenResponse(CreateOfferLebenResponseType value) {
-        return new JAXBElement(_CreateOfferLebenResponse_QNAME, CreateOfferLebenResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateApplicationLebenRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", name = "CreateApplicationLebenRequest")
-    public JAXBElement createCreateApplicationLebenRequest(CreateApplicationLebenRequestType value) {
-        return new JAXBElement(_CreateApplicationLebenRequest_QNAME, CreateApplicationLebenRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateApplicationLebenResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", name = "CreateApplicationLebenResponse")
-    public JAXBElement createCreateApplicationLebenResponse(CreateApplicationLebenResponseType value) {
-        return new JAXBElement(_CreateApplicationLebenResponse_QNAME, CreateApplicationLebenResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SubmitApplicationLebenRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", name = "SubmitApplicationLebenRequest")
-    public JAXBElement createSubmitApplicationLebenRequest(SubmitApplicationLebenRequestType value) {
-        return new JAXBElement(_SubmitApplicationLebenRequest_QNAME, SubmitApplicationLebenRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SubmitApplicationLebenResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", name = "SubmitApplicationLebenResponse")
-    public JAXBElement createSubmitApplicationLebenResponse(SubmitApplicationLebenResponseType value) {
-        return new JAXBElement(_SubmitApplicationLebenResponse_QNAME, SubmitApplicationLebenResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link VersicherungssummeZusatzbausteinType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", name = "Versicherungssumme", scope = ZusatzversicherungUnfallinvaliditaetType.class)
-    public JAXBElement createZusatzversicherungUnfallinvaliditaetTypeVersicherungssumme(VersicherungssummeZusatzbausteinType value) {
-        return new JAXBElement(_ZusatzversicherungUnfallinvaliditaetTypeVersicherungssumme_QNAME, VersicherungssummeZusatzbausteinType.class, ZusatzversicherungUnfallinvaliditaetType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link VersicherungssummeZusatzbausteinType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", name = "Versicherungssumme", scope = ZusatzversicherungUnfalltodType.class)
-    public JAXBElement createZusatzversicherungUnfalltodTypeVersicherungssumme(VersicherungssummeZusatzbausteinType value) {
-        return new JAXBElement(_ZusatzversicherungUnfallinvaliditaetTypeVersicherungssumme_QNAME, VersicherungssummeZusatzbausteinType.class, ZusatzversicherungUnfalltodType.class, value);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ProduktLebenType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ProduktLebenType.java
deleted file mode 100644
index 8ceebfc5..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ProduktLebenType.java
+++ /dev/null
@@ -1,74 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ProduktMitVpType;
-
-
-/**
- * Typ für ein Produkt in der Sparte Leben.
- * 
- * 
Java-Klasse für ProduktLeben_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProduktLeben_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ProduktMitVp_Type">
- *       <sequence>
- *         <element name="Tarife" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}TarifLeben_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProduktLeben_Type", propOrder = {
-    "tarife"
-})
-public class ProduktLebenType
-    extends ProduktMitVpType
-{
-
-    @XmlElement(name = "Tarife")
-    protected List tarife;
-
-    /**
-     * Gets the value of the tarife property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the tarife property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getTarife().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link TarifLebenType }
-     * 
-     * 
-     */
-    public List getTarife() {
-        if (tarife == null) {
-            tarife = new ArrayList();
-        }
-        return this.tarife;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/RentenoptionType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/RentenoptionType.java
deleted file mode 100644
index eb6d3b38..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/RentenoptionType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Vorgefertigter Typ für eine Rentenoption
- * 
- * 
Java-Klasse für Rentenoption_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Rentenoption_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Rentenoption_Type")
-public class RentenoptionType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/SpezAntragLebenType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/SpezAntragLebenType.java
deleted file mode 100644
index 4e9b8d45..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/SpezAntragLebenType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SpezAntragPersonenType;
-
-
-/**
- * Typ für den Schritt Antrags-Erzeugung
- * 
- * 
Java-Klasse für SpezAntragLeben_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezAntragLeben_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezAntragPersonen_Type">
- *       <sequence>
- *         <element name="Verkaufsprodukt" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}VerkaufsproduktLeben_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezAntragLeben_Type", propOrder = {
-    "verkaufsprodukt"
-})
-public class SpezAntragLebenType
-    extends SpezAntragPersonenType
-{
-
-    @XmlElement(name = "Verkaufsprodukt", required = true)
-    protected VerkaufsproduktLebenType verkaufsprodukt;
-
-    /**
-     * Ruft den Wert der verkaufsprodukt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VerkaufsproduktLebenType }
-     *     
-     */
-    public VerkaufsproduktLebenType getVerkaufsprodukt() {
-        return verkaufsprodukt;
-    }
-
-    /**
-     * Legt den Wert der verkaufsprodukt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VerkaufsproduktLebenType }
-     *     
-     */
-    public void setVerkaufsprodukt(VerkaufsproduktLebenType value) {
-        this.verkaufsprodukt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/SpezBerechnungLebenType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/SpezBerechnungLebenType.java
deleted file mode 100644
index cbb5a3bd..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/SpezBerechnungLebenType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SpezBerechnungType;
-
-
-/**
- * Typ für den Schritt Berechnung
- * 
- * 
Java-Klasse für SpezBerechnungLeben_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezBerechnungLeben_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezBerechnung_Type">
- *       <sequence>
- *         <element name="Verkaufsprodukt" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}VerkaufsproduktLeben_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezBerechnungLeben_Type", propOrder = {
-    "verkaufsprodukt"
-})
-public class SpezBerechnungLebenType
-    extends SpezBerechnungType
-{
-
-    @XmlElement(name = "Verkaufsprodukt", required = true)
-    protected VerkaufsproduktLebenType verkaufsprodukt;
-
-    /**
-     * Ruft den Wert der verkaufsprodukt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VerkaufsproduktLebenType }
-     *     
-     */
-    public VerkaufsproduktLebenType getVerkaufsprodukt() {
-        return verkaufsprodukt;
-    }
-
-    /**
-     * Legt den Wert der verkaufsprodukt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VerkaufsproduktLebenType }
-     *     
-     */
-    public void setVerkaufsprodukt(VerkaufsproduktLebenType value) {
-        this.verkaufsprodukt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/SpezOffertLebenType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/SpezOffertLebenType.java
deleted file mode 100644
index 6783b087..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/SpezOffertLebenType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SpezOffertType;
-
-
-/**
- * Typ für den Schritt Offert-Erzeugung
- * 
- * 
Java-Klasse für SpezOffertLeben_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezOffertLeben_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezOffert_Type">
- *       <sequence>
- *         <element name="Verkaufsprodukt" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}VerkaufsproduktLeben_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezOffertLeben_Type", propOrder = {
-    "verkaufsprodukt"
-})
-public class SpezOffertLebenType
-    extends SpezOffertType
-{
-
-    @XmlElement(name = "Verkaufsprodukt", required = true)
-    protected VerkaufsproduktLebenType verkaufsprodukt;
-
-    /**
-     * Ruft den Wert der verkaufsprodukt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VerkaufsproduktLebenType }
-     *     
-     */
-    public VerkaufsproduktLebenType getVerkaufsprodukt() {
-        return verkaufsprodukt;
-    }
-
-    /**
-     * Legt den Wert der verkaufsprodukt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VerkaufsproduktLebenType }
-     *     
-     */
-    public void setVerkaufsprodukt(VerkaufsproduktLebenType value) {
-        this.verkaufsprodukt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/SubmitApplicationLebenRequestType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/SubmitApplicationLebenRequestType.java
deleted file mode 100644
index 411f9e11..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/SubmitApplicationLebenRequestType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SubmitApplicationRequestGenType;
-
-
-/**
- * Type des Requests, um den Antrag einzureichen
- * 
- * 
Java-Klasse für SubmitApplicationLebenRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SubmitApplicationLebenRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SubmitApplicationRequestGen_Type">
- *       <sequence>
- *         <element name="Antragsanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}SpezAntragLeben_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SubmitApplicationLebenRequest_Type", propOrder = {
-    "antragsanfrage"
-})
-public class SubmitApplicationLebenRequestType
-    extends SubmitApplicationRequestGenType
-{
-
-    @XmlElement(name = "Antragsanfrage")
-    protected SpezAntragLebenType antragsanfrage;
-
-    /**
-     * Ruft den Wert der antragsanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezAntragLebenType }
-     *     
-     */
-    public SpezAntragLebenType getAntragsanfrage() {
-        return antragsanfrage;
-    }
-
-    /**
-     * Legt den Wert der antragsanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezAntragLebenType }
-     *     
-     */
-    public void setAntragsanfrage(SpezAntragLebenType value) {
-        this.antragsanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/SubmitApplicationLebenResponseType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/SubmitApplicationLebenResponseType.java
deleted file mode 100644
index 97d3d1f4..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/SubmitApplicationLebenResponseType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SubmitApplicationResponseGenType;
-
-
-/**
- * Type des Response, um den Antrag einzureichen
- * 
- * 
Java-Klasse für SubmitApplicationLebenResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SubmitApplicationLebenResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SubmitApplicationResponseGen_Type">
- *       <sequence>
- *         <element name="Antragsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}SpezAntragLeben_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SubmitApplicationLebenResponse_Type", propOrder = {
-    "antragsantwort"
-})
-public class SubmitApplicationLebenResponseType
-    extends SubmitApplicationResponseGenType
-{
-
-    @XmlElement(name = "Antragsantwort", required = true)
-    protected SpezAntragLebenType antragsantwort;
-
-    /**
-     * Ruft den Wert der antragsantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezAntragLebenType }
-     *     
-     */
-    public SpezAntragLebenType getAntragsantwort() {
-        return antragsantwort;
-    }
-
-    /**
-     * Legt den Wert der antragsantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezAntragLebenType }
-     *     
-     */
-    public void setAntragsantwort(SpezAntragLebenType value) {
-        this.antragsantwort = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/TarifLebenType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/TarifLebenType.java
deleted file mode 100644
index 8d01c4e2..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/TarifLebenType.java
+++ /dev/null
@@ -1,164 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ElementFondsauswahlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ElementarproduktGenerischType;
-
-
-/**
- * Typ für ein Elementarprodukt in der Sparte Leben.
- * 
- * 
Java-Klasse für TarifLeben_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="TarifLeben_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ElementarproduktGenerisch_Type">
- *       <sequence>
- *         <element name="GarantierteAblebenssumme" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}VersicherungssummeZusatzbaustein_Type" minOccurs="0"/>
- *         <element name="Rentenoption" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}Rentenoption_Type" minOccurs="0"/>
- *         <element name="Fondsauswahl" type="{urn:omds3CommonServiceTypes-1-1-0}ElementFondsauswahl_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Zusatzbausteine" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}ZusatzversicherungLeben_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TarifLeben_Type", propOrder = {
-    "garantierteAblebenssumme",
-    "rentenoption",
-    "fondsauswahl",
-    "zusatzbausteine"
-})
-public class TarifLebenType
-    extends ElementarproduktGenerischType
-{
-
-    @XmlElement(name = "GarantierteAblebenssumme")
-    protected VersicherungssummeZusatzbausteinType garantierteAblebenssumme;
-    @XmlElement(name = "Rentenoption")
-    protected RentenoptionType rentenoption;
-    @XmlElement(name = "Fondsauswahl")
-    protected List fondsauswahl;
-    @XmlElement(name = "Zusatzbausteine")
-    protected List zusatzbausteine;
-
-    /**
-     * Ruft den Wert der garantierteAblebenssumme-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VersicherungssummeZusatzbausteinType }
-     *     
-     */
-    public VersicherungssummeZusatzbausteinType getGarantierteAblebenssumme() {
-        return garantierteAblebenssumme;
-    }
-
-    /**
-     * Legt den Wert der garantierteAblebenssumme-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VersicherungssummeZusatzbausteinType }
-     *     
-     */
-    public void setGarantierteAblebenssumme(VersicherungssummeZusatzbausteinType value) {
-        this.garantierteAblebenssumme = value;
-    }
-
-    /**
-     * Ruft den Wert der rentenoption-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RentenoptionType }
-     *     
-     */
-    public RentenoptionType getRentenoption() {
-        return rentenoption;
-    }
-
-    /**
-     * Legt den Wert der rentenoption-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RentenoptionType }
-     *     
-     */
-    public void setRentenoption(RentenoptionType value) {
-        this.rentenoption = value;
-    }
-
-    /**
-     * Gets the value of the fondsauswahl property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the fondsauswahl property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getFondsauswahl().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ElementFondsauswahlType }
-     * 
-     * 
-     */
-    public List getFondsauswahl() {
-        if (fondsauswahl == null) {
-            fondsauswahl = new ArrayList();
-        }
-        return this.fondsauswahl;
-    }
-
-    /**
-     * Gets the value of the zusatzbausteine property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zusatzbausteine property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZusatzbausteine().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ZusatzversicherungLebenType }
-     * 
-     * 
-     */
-    public List getZusatzbausteine() {
-        if (zusatzbausteine == null) {
-            zusatzbausteine = new ArrayList();
-        }
-        return this.zusatzbausteine;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/VerkaufsproduktLebenType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/VerkaufsproduktLebenType.java
deleted file mode 100644
index 4c0f9e60..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/VerkaufsproduktLebenType.java
+++ /dev/null
@@ -1,172 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-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 at.vvo.omds.types.omds3Types.r1_7_0.common.ProduktGenerischType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VerkaufsproduktGenerischType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VersichertePersonType;
-
-
-/**
- * Typ für ein Verkaufsprodukt in der Sparte Leben
- * 
- * 
Java-Klasse für VerkaufsproduktLeben_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VerkaufsproduktLeben_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}VerkaufsproduktGenerisch_Type">
- *       <sequence>
- *         <element name="LebenProdukte" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}ProduktLeben_Type" maxOccurs="unbounded"/>
- *         <element name="Zusatzprodukte" type="{urn:omds3CommonServiceTypes-1-1-0}ProduktGenerisch_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="VersichertePersonen" type="{urn:omds3CommonServiceTypes-1-1-0}VersichertePerson_Type" maxOccurs="unbounded"/>
- *         <element name="RefSicherstellungLfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VerkaufsproduktLeben_Type", propOrder = {
-    "lebenProdukte",
-    "zusatzprodukte",
-    "versichertePersonen",
-    "refSicherstellungLfnr"
-})
-public class VerkaufsproduktLebenType
-    extends VerkaufsproduktGenerischType
-{
-
-    @XmlElement(name = "LebenProdukte", required = true)
-    protected List lebenProdukte;
-    @XmlElement(name = "Zusatzprodukte")
-    protected List zusatzprodukte;
-    @XmlElement(name = "VersichertePersonen", required = true)
-    protected List versichertePersonen;
-    @XmlElement(name = "RefSicherstellungLfnr")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer refSicherstellungLfnr;
-
-    /**
-     * Gets the value of the lebenProdukte property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the lebenProdukte property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getLebenProdukte().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ProduktLebenType }
-     * 
-     * 
-     */
-    public List getLebenProdukte() {
-        if (lebenProdukte == null) {
-            lebenProdukte = new ArrayList();
-        }
-        return this.lebenProdukte;
-    }
-
-    /**
-     * Gets the value of the zusatzprodukte property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zusatzprodukte property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZusatzprodukte().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ProduktGenerischType }
-     * 
-     * 
-     */
-    public List getZusatzprodukte() {
-        if (zusatzprodukte == null) {
-            zusatzprodukte = new ArrayList();
-        }
-        return this.zusatzprodukte;
-    }
-
-    /**
-     * Gets the value of the versichertePersonen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the versichertePersonen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVersichertePersonen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link VersichertePersonType }
-     * 
-     * 
-     */
-    public List getVersichertePersonen() {
-        if (versichertePersonen == null) {
-            versichertePersonen = new ArrayList();
-        }
-        return this.versichertePersonen;
-    }
-
-    /**
-     * Ruft den Wert der refSicherstellungLfnr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getRefSicherstellungLfnr() {
-        return refSicherstellungLfnr;
-    }
-
-    /**
-     * Legt den Wert der refSicherstellungLfnr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setRefSicherstellungLfnr(Integer value) {
-        this.refSicherstellungLfnr = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/VersicherungssummeZusatzbausteinType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/VersicherungssummeZusatzbausteinType.java
deleted file mode 100644
index 30b04006..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/VersicherungssummeZusatzbausteinType.java
+++ /dev/null
@@ -1,94 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AttributDezimalType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AttributDoubleType;
-
-
-/**
- * Definition einer Versicherungssumme in einem Zusatzbaustein
- * 
- * 
Java-Klasse für VersicherungssummeZusatzbaustein_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VersicherungssummeZusatzbaustein_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="ProzentVersicherungssumme" type="{urn:omds3CommonServiceTypes-1-1-0}AttributDouble_Type" minOccurs="0"/>
- *         <element name="Betrag" type="{urn:omds3CommonServiceTypes-1-1-0}AttributDezimal_Type" minOccurs="0"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VersicherungssummeZusatzbaustein_Type", propOrder = {
-    "prozentVersicherungssumme",
-    "betrag"
-})
-public class VersicherungssummeZusatzbausteinType {
-
-    @XmlElement(name = "ProzentVersicherungssumme")
-    protected AttributDoubleType prozentVersicherungssumme;
-    @XmlElement(name = "Betrag")
-    protected AttributDezimalType betrag;
-
-    /**
-     * Ruft den Wert der prozentVersicherungssumme-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributDoubleType }
-     *     
-     */
-    public AttributDoubleType getProzentVersicherungssumme() {
-        return prozentVersicherungssumme;
-    }
-
-    /**
-     * Legt den Wert der prozentVersicherungssumme-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributDoubleType }
-     *     
-     */
-    public void setProzentVersicherungssumme(AttributDoubleType value) {
-        this.prozentVersicherungssumme = value;
-    }
-
-    /**
-     * Ruft den Wert der betrag-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributDezimalType }
-     *     
-     */
-    public AttributDezimalType getBetrag() {
-        return betrag;
-    }
-
-    /**
-     * Legt den Wert der betrag-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributDezimalType }
-     *     
-     */
-    public void setBetrag(AttributDezimalType value) {
-        this.betrag = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/WartefristType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/WartefristType.java
deleted file mode 100644
index af704a69..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/WartefristType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstraktes Element zur Abbildung einer Wartefrist
- * 
- * 
Java-Klasse für Wartefrist_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Wartefrist_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Wartefrist_Type")
-public abstract class WartefristType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzproduktLebenType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzproduktLebenType.java
deleted file mode 100644
index a685b2b9..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzproduktLebenType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstrakter Typ um Zusatzprodukte (Ebene Produkt) im Verkausfprodukt Leben zu definieren
- * 
- * 
Java-Klasse für ZusatzproduktLeben_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusatzproduktLeben_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusatzproduktLeben_Type")
-public class ZusatzproduktLebenType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungBerufsunfaehigkeitType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungBerufsunfaehigkeitType.java
deleted file mode 100644
index d46617ac..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungBerufsunfaehigkeitType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Vorgefertigter Typ für eine Zusatzversicherung Berufsunfähigkeit
- * 
- * 
Java-Klasse für ZusatzversicherungBerufsunfaehigkeit_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusatzversicherungBerufsunfaehigkeit_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}ZusatzversicherungLeben_Type">
- *       <sequence>
- *         <element name="Wartefrist" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}Wartefrist_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusatzversicherungBerufsunfaehigkeit_Type", propOrder = {
-    "wartefrist"
-})
-public class ZusatzversicherungBerufsunfaehigkeitType
-    extends ZusatzversicherungLebenType
-{
-
-    @XmlElement(name = "Wartefrist")
-    protected WartefristType wartefrist;
-
-    /**
-     * Ruft den Wert der wartefrist-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link WartefristType }
-     *     
-     */
-    public WartefristType getWartefrist() {
-        return wartefrist;
-    }
-
-    /**
-     * Legt den Wert der wartefrist-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link WartefristType }
-     *     
-     */
-    public void setWartefrist(WartefristType value) {
-        this.wartefrist = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungErwerbsunfaehigkeitType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungErwerbsunfaehigkeitType.java
deleted file mode 100644
index c4ecc988..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungErwerbsunfaehigkeitType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Vorgefertigter Typ für eine Zusatzversicherung Erwerbsunfähigkeit
- * 
- * 
Java-Klasse für ZusatzversicherungErwerbsunfaehigkeit_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusatzversicherungErwerbsunfaehigkeit_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}ZusatzversicherungLeben_Type">
- *       <sequence>
- *         <element name="Wartefrist" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}Wartefrist_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusatzversicherungErwerbsunfaehigkeit_Type", propOrder = {
-    "wartefrist"
-})
-public class ZusatzversicherungErwerbsunfaehigkeitType
-    extends ZusatzversicherungLebenType
-{
-
-    @XmlElement(name = "Wartefrist")
-    protected WartefristType wartefrist;
-
-    /**
-     * Ruft den Wert der wartefrist-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link WartefristType }
-     *     
-     */
-    public WartefristType getWartefrist() {
-        return wartefrist;
-    }
-
-    /**
-     * Legt den Wert der wartefrist-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link WartefristType }
-     *     
-     */
-    public void setWartefrist(WartefristType value) {
-        this.wartefrist = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungLebenType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungLebenType.java
deleted file mode 100644
index c86d6171..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungLebenType.java
+++ /dev/null
@@ -1,43 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ZusatzproduktGenerischType;
-
-
-/**
- * Typ für eine Zusatzversicherung in der Sparte Leben (unterhalb von Elementarprodukt)
- * 
- * 
Java-Klasse für ZusatzversicherungLeben_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusatzversicherungLeben_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ZusatzproduktGenerisch_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusatzversicherungLeben_Type")
-@XmlSeeAlso({
-    ZusatzversicherungBerufsunfaehigkeitType.class,
-    ZusatzversicherungErwerbsunfaehigkeitType.class,
-    ZusatzversicherungPraemienuebernahmeAblebenType.class,
-    ZusatzversicherungUnfalltodType.class,
-    ZusatzversicherungUnfallinvaliditaetType.class
-})
-public class ZusatzversicherungLebenType
-    extends ZusatzproduktGenerischType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungPraemienuebernahmeAblebenType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungPraemienuebernahmeAblebenType.java
deleted file mode 100644
index 0fdc6c62..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungPraemienuebernahmeAblebenType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Vorgefertigter Typ für eine Praemienuebernahme im Ablebensfall
- * 
- * 
Java-Klasse für ZusatzversicherungPraemienuebernahmeAbleben_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusatzversicherungPraemienuebernahmeAbleben_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}ZusatzversicherungLeben_Type">
- *       <sequence>
- *         <element name="Wartefrist" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}Wartefrist_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusatzversicherungPraemienuebernahmeAbleben_Type", propOrder = {
-    "wartefrist"
-})
-public class ZusatzversicherungPraemienuebernahmeAblebenType
-    extends ZusatzversicherungLebenType
-{
-
-    @XmlElement(name = "Wartefrist")
-    protected WartefristType wartefrist;
-
-    /**
-     * Ruft den Wert der wartefrist-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link WartefristType }
-     *     
-     */
-    public WartefristType getWartefrist() {
-        return wartefrist;
-    }
-
-    /**
-     * Legt den Wert der wartefrist-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link WartefristType }
-     *     
-     */
-    public void setWartefrist(WartefristType value) {
-        this.wartefrist = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungUnfallinvaliditaetType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungUnfallinvaliditaetType.java
deleted file mode 100644
index 6e81cbab..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungUnfallinvaliditaetType.java
+++ /dev/null
@@ -1,84 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-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.XmlElementRef;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Vorgefertigter Typ für eine Zusatzversicherung bei Unfallinvaliditaet
- * 
- * 
Java-Klasse für ZusatzversicherungUnfallinvaliditaet_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusatzversicherungUnfallinvaliditaet_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}ZusatzversicherungLeben_Type">
- *       <sequence>
- *         <element name="Versicherungssumme" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}VersicherungssummeZusatzbaustein_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusatzversicherungUnfallinvaliditaet_Type", propOrder = {
-    "rest"
-})
-public class ZusatzversicherungUnfallinvaliditaetType
-    extends ZusatzversicherungLebenType
-{
-
-    @XmlElementRef(name = "Versicherungssumme", namespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", type = JAXBElement.class, required = false)
-    protected List> rest;
-
-    /**
-     * Ruft das restliche Contentmodell ab. 
-     * 
-     * 

-     * Sie rufen diese "catch-all"-Eigenschaft aus folgendem Grund ab: 
-     * Der Feldname "Versicherungssumme" wird von zwei verschiedenen Teilen eines Schemas verwendet. Siehe: 
-     * Zeile 133 von file:/C:/Users/jensb/git/omdsservicedefinitions/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Leben.xsd
-     * Zeile 1383 von file:/C:/Users/jensb/git/omdsservicedefinitions/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3CommonServiceTypes.xsd
-     * 

-     * Um diese Eigenschaft zu entfernen, wenden Sie eine Eigenschaftenanpassung für eine
-     * der beiden folgenden Deklarationen an, um deren Namen zu ändern: 
-     * Gets the value of the rest property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the rest property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getRest().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link VersicherungssummeZusatzbausteinType }{@code >}
-     * 
-     * 
-     */
-    public List> getRest() {
-        if (rest == null) {
-            rest = new ArrayList>();
-        }
-        return this.rest;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungUnfalltodType.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungUnfalltodType.java
deleted file mode 100644
index 9203da70..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/ZusatzversicherungUnfalltodType.java
+++ /dev/null
@@ -1,84 +0,0 @@
-
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
-
-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.XmlElementRef;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Vorgefertigter Typ für eine Zusatzversicherung bei Unfalltod
- * 
- * 
Java-Klasse für ZusatzversicherungUnfalltod_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ZusatzversicherungUnfalltod_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}ZusatzversicherungLeben_Type">
- *       <sequence>
- *         <element name="Versicherungssumme" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}VersicherungssummeZusatzbaustein_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZusatzversicherungUnfalltod_Type", propOrder = {
-    "rest"
-})
-public class ZusatzversicherungUnfalltodType
-    extends ZusatzversicherungLebenType
-{
-
-    @XmlElementRef(name = "Versicherungssumme", namespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", type = JAXBElement.class, required = false)
-    protected List> rest;
-
-    /**
-     * Ruft das restliche Contentmodell ab. 
-     * 
-     * 

-     * Sie rufen diese "catch-all"-Eigenschaft aus folgendem Grund ab: 
-     * Der Feldname "Versicherungssumme" wird von zwei verschiedenen Teilen eines Schemas verwendet. Siehe: 
-     * Zeile 121 von file:/C:/Users/jensb/git/omdsservicedefinitions/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Leben.xsd
-     * Zeile 1383 von file:/C:/Users/jensb/git/omdsservicedefinitions/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3CommonServiceTypes.xsd
-     * 

-     * Um diese Eigenschaft zu entfernen, wenden Sie eine Eigenschaftenanpassung für eine
-     * der beiden folgenden Deklarationen an, um deren Namen zu ändern: 
-     * Gets the value of the rest property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the rest property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getRest().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link VersicherungssummeZusatzbausteinType }{@code >}
-     * 
-     * 
-     */
-    public List> getRest() {
-        if (rest == null) {
-            rest = new ArrayList>();
-        }
-        return this.rest;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/package-info.java b/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/package-info.java
deleted file mode 100644
index 230e603a..00000000
--- a/OMDSServiceDefinition/src/main/java/leben/on2antrag/_0/_5/v1/omds3types/types/omds/vvo/at/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package leben.on2antrag._0._5.v1.omds3types.types.omds.vvo.at;
diff --git a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionChangeRequest.java b/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionChangeRequest.java
deleted file mode 100644
index 2fe5ec77..00000000
--- a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionChangeRequest.java
+++ /dev/null
@@ -1,192 +0,0 @@
-
-package on3vertrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-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.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.DateianhangType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.PersonType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}ObjektId"/>
- *         <element name="Inkassoadresse" type="{urn:omds3CommonServiceTypes-1-1-0}Person_Type"/>
- *         <element name="Zahlweg" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag}Zahlweg_Type"/>
- *         <element name="Dateianhaenge" type="{urn:omds3CommonServiceTypes-1-1-0}Dateianhang_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="WirksamtkeitAb" type="{http://www.w3.org/2001/XMLSchema}date"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "objektId",
-    "inkassoadresse",
-    "zahlweg",
-    "dateianhaenge",
-    "wirksamtkeitAb"
-})
-@XmlRootElement(name = "CollectionChangeRequest")
-public class CollectionChangeRequest
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "ObjektId", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-    protected ObjektIdType objektId;
-    @XmlElement(name = "Inkassoadresse", required = true)
-    protected PersonType inkassoadresse;
-    @XmlElement(name = "Zahlweg", required = true)
-    protected ZahlwegType zahlweg;
-    @XmlElement(name = "Dateianhaenge")
-    protected List dateianhaenge;
-    @XmlElement(name = "WirksamtkeitAb", required = true)
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar wirksamtkeitAb;
-
-    /**
-     * Die Id des Vertrag als ObjektId (VertragsID des OMDS-Datensatzes)
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getObjektId() {
-        return objektId;
-    }
-
-    /**
-     * Legt den Wert der objektId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setObjektId(ObjektIdType value) {
-        this.objektId = value;
-    }
-
-    /**
-     * Ruft den Wert der inkassoadresse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PersonType }
-     *     
-     */
-    public PersonType getInkassoadresse() {
-        return inkassoadresse;
-    }
-
-    /**
-     * Legt den Wert der inkassoadresse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PersonType }
-     *     
-     */
-    public void setInkassoadresse(PersonType value) {
-        this.inkassoadresse = value;
-    }
-
-    /**
-     * Ruft den Wert der zahlweg-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ZahlwegType }
-     *     
-     */
-    public ZahlwegType getZahlweg() {
-        return zahlweg;
-    }
-
-    /**
-     * Legt den Wert der zahlweg-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ZahlwegType }
-     *     
-     */
-    public void setZahlweg(ZahlwegType value) {
-        this.zahlweg = value;
-    }
-
-    /**
-     * Gets the value of the dateianhaenge property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the dateianhaenge property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDateianhaenge().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link DateianhangType }
-     * 
-     * 
-     */
-    public List getDateianhaenge() {
-        if (dateianhaenge == null) {
-            dateianhaenge = new ArrayList();
-        }
-        return this.dateianhaenge;
-    }
-
-    /**
-     * Ruft den Wert der wirksamtkeitAb-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getWirksamtkeitAb() {
-        return wirksamtkeitAb;
-    }
-
-    /**
-     * Legt den Wert der wirksamtkeitAb-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setWirksamtkeitAb(XMLGregorianCalendar value) {
-        this.wirksamtkeitAb = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionChangeResponse.java b/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionChangeResponse.java
deleted file mode 100644
index f6f12359..00000000
--- a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionChangeResponse.java
+++ /dev/null
@@ -1,156 +0,0 @@
-
-package on3vertrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-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.datatype.XMLGregorianCalendar;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.PersonType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence minOccurs="0">
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}ObjektId"/>
- *         <element name="Inkassoadresse" type="{urn:omds3CommonServiceTypes-1-1-0}Person_Type"/>
- *         <element name="Zahlweg" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag}Zahlweg_Type"/>
- *         <element name="WirksamtkeitAb" type="{http://www.w3.org/2001/XMLSchema}date"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "objektId",
-    "inkassoadresse",
-    "zahlweg",
-    "wirksamtkeitAb"
-})
-@XmlRootElement(name = "CollectionChangeResponse")
-public class CollectionChangeResponse
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "ObjektId", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected ObjektIdType objektId;
-    @XmlElement(name = "Inkassoadresse")
-    protected PersonType inkassoadresse;
-    @XmlElement(name = "Zahlweg")
-    protected ZahlwegType zahlweg;
-    @XmlElement(name = "WirksamtkeitAb")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar wirksamtkeitAb;
-
-    /**
-     * ObjektId des Vertrags bzw. Polizzennr.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getObjektId() {
-        return objektId;
-    }
-
-    /**
-     * Legt den Wert der objektId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setObjektId(ObjektIdType value) {
-        this.objektId = value;
-    }
-
-    /**
-     * Ruft den Wert der inkassoadresse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PersonType }
-     *     
-     */
-    public PersonType getInkassoadresse() {
-        return inkassoadresse;
-    }
-
-    /**
-     * Legt den Wert der inkassoadresse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PersonType }
-     *     
-     */
-    public void setInkassoadresse(PersonType value) {
-        this.inkassoadresse = value;
-    }
-
-    /**
-     * Ruft den Wert der zahlweg-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ZahlwegType }
-     *     
-     */
-    public ZahlwegType getZahlweg() {
-        return zahlweg;
-    }
-
-    /**
-     * Legt den Wert der zahlweg-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ZahlwegType }
-     *     
-     */
-    public void setZahlweg(ZahlwegType value) {
-        this.zahlweg = value;
-    }
-
-    /**
-     * Ruft den Wert der wirksamtkeitAb-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getWirksamtkeitAb() {
-        return wirksamtkeitAb;
-    }
-
-    /**
-     * Legt den Wert der wirksamtkeitAb-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setWirksamtkeitAb(XMLGregorianCalendar value) {
-        this.wirksamtkeitAb = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionRhythmChangeRequest.java b/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionRhythmChangeRequest.java
deleted file mode 100644
index 0f269760..00000000
--- a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionRhythmChangeRequest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-
-package on3vertrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-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.datatype.XMLGregorianCalendar;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}ObjektId"/>
- *         <element name="Zahlrhythmus" type="{urn:omds20}ZahlRhythmCd_Type"/>
- *         <element name="WirksamtkeitAb" type="{http://www.w3.org/2001/XMLSchema}date"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "objektId",
-    "zahlrhythmus",
-    "wirksamtkeitAb"
-})
-@XmlRootElement(name = "CollectionRhythmChangeRequest")
-public class CollectionRhythmChangeRequest
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "ObjektId", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-    protected ObjektIdType objektId;
-    @XmlElement(name = "Zahlrhythmus", required = true)
-    protected String zahlrhythmus;
-    @XmlElement(name = "WirksamtkeitAb", required = true)
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar wirksamtkeitAb;
-
-    /**
-     * Die Id des Vertrag als ObjektId (VertragsID des OMDS-Datensatzes)
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getObjektId() {
-        return objektId;
-    }
-
-    /**
-     * Legt den Wert der objektId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setObjektId(ObjektIdType value) {
-        this.objektId = value;
-    }
-
-    /**
-     * Ruft den Wert der zahlrhythmus-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getZahlrhythmus() {
-        return zahlrhythmus;
-    }
-
-    /**
-     * Legt den Wert der zahlrhythmus-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setZahlrhythmus(String value) {
-        this.zahlrhythmus = value;
-    }
-
-    /**
-     * Ruft den Wert der wirksamtkeitAb-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getWirksamtkeitAb() {
-        return wirksamtkeitAb;
-    }
-
-    /**
-     * Legt den Wert der wirksamtkeitAb-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setWirksamtkeitAb(XMLGregorianCalendar value) {
-        this.wirksamtkeitAb = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionRhythmChangeResponse.java b/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionRhythmChangeResponse.java
deleted file mode 100644
index 901fc6bb..00000000
--- a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionRhythmChangeResponse.java
+++ /dev/null
@@ -1,183 +0,0 @@
-
-package on3vertrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-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.datatype.XMLGregorianCalendar;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence minOccurs="0">
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}ObjektId"/>
- *         <element name="Zahlrhythmus" type="{urn:omds20}ZahlRhythmCd_Type"/>
- *         <element name="WirksamtkeitAb" type="{http://www.w3.org/2001/XMLSchema}date"/>
- *         <element name="PraemieAlt" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag}PraemienInfo_Type"/>
- *         <element name="PraemieNeu" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag}PraemienInfo_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "objektId",
-    "zahlrhythmus",
-    "wirksamtkeitAb",
-    "praemieAlt",
-    "praemieNeu"
-})
-@XmlRootElement(name = "CollectionRhythmChangeResponse")
-public class CollectionRhythmChangeResponse
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "ObjektId", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected ObjektIdType objektId;
-    @XmlElement(name = "Zahlrhythmus")
-    protected String zahlrhythmus;
-    @XmlElement(name = "WirksamtkeitAb")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar wirksamtkeitAb;
-    @XmlElement(name = "PraemieAlt")
-    protected PraemienInfoType praemieAlt;
-    @XmlElement(name = "PraemieNeu")
-    protected PraemienInfoType praemieNeu;
-
-    /**
-     * ObjektId des Vertrags bzw. Polizzennr.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getObjektId() {
-        return objektId;
-    }
-
-    /**
-     * Legt den Wert der objektId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setObjektId(ObjektIdType value) {
-        this.objektId = value;
-    }
-
-    /**
-     * Ruft den Wert der zahlrhythmus-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getZahlrhythmus() {
-        return zahlrhythmus;
-    }
-
-    /**
-     * Legt den Wert der zahlrhythmus-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setZahlrhythmus(String value) {
-        this.zahlrhythmus = value;
-    }
-
-    /**
-     * Ruft den Wert der wirksamtkeitAb-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getWirksamtkeitAb() {
-        return wirksamtkeitAb;
-    }
-
-    /**
-     * Legt den Wert der wirksamtkeitAb-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setWirksamtkeitAb(XMLGregorianCalendar value) {
-        this.wirksamtkeitAb = value;
-    }
-
-    /**
-     * Ruft den Wert der praemieAlt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PraemienInfoType }
-     *     
-     */
-    public PraemienInfoType getPraemieAlt() {
-        return praemieAlt;
-    }
-
-    /**
-     * Legt den Wert der praemieAlt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PraemienInfoType }
-     *     
-     */
-    public void setPraemieAlt(PraemienInfoType value) {
-        this.praemieAlt = value;
-    }
-
-    /**
-     * Ruft den Wert der praemieNeu-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PraemienInfoType }
-     *     
-     */
-    public PraemienInfoType getPraemieNeu() {
-        return praemieNeu;
-    }
-
-    /**
-     * Legt den Wert der praemieNeu-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PraemienInfoType }
-     *     
-     */
-    public void setPraemieNeu(PraemienInfoType value) {
-        this.praemieNeu = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionRhythmInfoRequest.java b/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionRhythmInfoRequest.java
deleted file mode 100644
index ae1904ab..00000000
--- a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionRhythmInfoRequest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-
-package on3vertrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}ObjektId"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "objektId"
-})
-@XmlRootElement(name = "CollectionRhythmInfoRequest")
-public class CollectionRhythmInfoRequest
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "ObjektId", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-    protected ObjektIdType objektId;
-
-    /**
-     * Die Id des Vertrag als ObjektId (VertragsID des OMDS-Datensatzes)
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getObjektId() {
-        return objektId;
-    }
-
-    /**
-     * Legt den Wert der objektId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setObjektId(ObjektIdType value) {
-        this.objektId = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionRhythmInfoResponse.java b/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionRhythmInfoResponse.java
deleted file mode 100644
index 3a3ed5fc..00000000
--- a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/CollectionRhythmInfoResponse.java
+++ /dev/null
@@ -1,134 +0,0 @@
-
-package on3vertrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-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.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence minOccurs="0">
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}ObjektId"/>
- *         <element name="WirksamtkeitAb" type="{http://www.w3.org/2001/XMLSchema}date"/>
- *         <element name="PraemienZahlrhythmus" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag}PraemienInfo_Type" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "objektId",
-    "wirksamtkeitAb",
-    "praemienZahlrhythmus"
-})
-@XmlRootElement(name = "CollectionRhythmInfoResponse")
-public class CollectionRhythmInfoResponse
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "ObjektId", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected ObjektIdType objektId;
-    @XmlElement(name = "WirksamtkeitAb")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar wirksamtkeitAb;
-    @XmlElement(name = "PraemienZahlrhythmus")
-    protected List praemienZahlrhythmus;
-
-    /**
-     * ObjektId des Vertrags bzw. Polizzennr.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getObjektId() {
-        return objektId;
-    }
-
-    /**
-     * Legt den Wert der objektId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setObjektId(ObjektIdType value) {
-        this.objektId = value;
-    }
-
-    /**
-     * Ruft den Wert der wirksamtkeitAb-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getWirksamtkeitAb() {
-        return wirksamtkeitAb;
-    }
-
-    /**
-     * Legt den Wert der wirksamtkeitAb-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setWirksamtkeitAb(XMLGregorianCalendar value) {
-        this.wirksamtkeitAb = value;
-    }
-
-    /**
-     * Gets the value of the praemienZahlrhythmus property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the praemienZahlrhythmus property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getPraemienZahlrhythmus().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link PraemienInfoType }
-     * 
-     * 
-     */
-    public List getPraemienZahlrhythmus() {
-        if (praemienZahlrhythmus == null) {
-            praemienZahlrhythmus = new ArrayList();
-        }
-        return this.praemienZahlrhythmus;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/GetPoliciesOfPartnerRequestType.java b/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/GetPoliciesOfPartnerRequestType.java
deleted file mode 100644
index 708e6563..00000000
--- a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/GetPoliciesOfPartnerRequestType.java
+++ /dev/null
@@ -1,97 +0,0 @@
-
-package on3vertrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AgentFilterType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-
-
-/**
- * Requesttyp auf die Polizzen, in denen ein Partner in der Rolle VN auftritt
- * 
- * 
Java-Klasse für GetPoliciesOfPartnerRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GetPoliciesOfPartnerRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element name="AuthFilter" type="{urn:omds3CommonServiceTypes-1-1-0}AgentFilter_Type" minOccurs="0"/>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}ObjektId"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GetPoliciesOfPartnerRequest_Type", propOrder = {
-    "authFilter",
-    "objektId"
-})
-public class GetPoliciesOfPartnerRequestType
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "AuthFilter")
-    protected AgentFilterType authFilter;
-    @XmlElement(name = "ObjektId", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-    protected ObjektIdType objektId;
-
-    /**
-     * Ruft den Wert der authFilter-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AgentFilterType }
-     *     
-     */
-    public AgentFilterType getAuthFilter() {
-        return authFilter;
-    }
-
-    /**
-     * Legt den Wert der authFilter-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AgentFilterType }
-     *     
-     */
-    public void setAuthFilter(AgentFilterType value) {
-        this.authFilter = value;
-    }
-
-    /**
-     * Die ObjektId des Partners (enthält die Personennr)
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getObjektId() {
-        return objektId;
-    }
-
-    /**
-     * Legt den Wert der objektId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setObjektId(ObjektIdType value) {
-        this.objektId = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/GetPoliciesOfPartnerResponseType.java b/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/GetPoliciesOfPartnerResponseType.java
deleted file mode 100644
index fa528eb2..00000000
--- a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/GetPoliciesOfPartnerResponseType.java
+++ /dev/null
@@ -1,85 +0,0 @@
-
-package on3vertrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-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.XmlElements;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds2Types.v2_14.VERTRAGType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AdresseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-
-
-/**
- * Responsetyp zu den Polizzen, in denen ein Partner in der Rolle VN auftritt
- * 
- * 
Java-Klasse für GetPoliciesOfPartnerResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GetPoliciesOfPartnerResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence maxOccurs="unbounded" minOccurs="0">
- *         <element name="Vertrag" type="{urn:omds20}VERTRAG_Type"/>
- *         <element name="ObjektId" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
- *         <element name="Zustelladresse" type="{urn:omds3CommonServiceTypes-1-1-0}Adresse_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GetPoliciesOfPartnerResponse_Type", propOrder = {
-    "vertragAndObjektIdAndZustelladresse"
-})
-public class GetPoliciesOfPartnerResponseType
-    extends CommonResponseType
-{
-
-    @XmlElements({
-        @XmlElement(name = "Vertrag", type = VERTRAGType.class),
-        @XmlElement(name = "ObjektId"),
-        @XmlElement(name = "Zustelladresse", type = AdresseType.class)
-    })
-    protected List vertragAndObjektIdAndZustelladresse;
-
-    /**
-     * Gets the value of the vertragAndObjektIdAndZustelladresse property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the vertragAndObjektIdAndZustelladresse property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVertragAndObjektIdAndZustelladresse().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link VERTRAGType }
-     * {@link Object }
-     * {@link AdresseType }
-     * 
-     * 
-     */
-    public List getVertragAndObjektIdAndZustelladresse() {
-        if (vertragAndObjektIdAndZustelladresse == null) {
-            vertragAndObjektIdAndZustelladresse = new ArrayList();
-        }
-        return this.vertragAndObjektIdAndZustelladresse;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/ObjectFactory.java
deleted file mode 100644
index 653e64c1..00000000
--- a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/ObjectFactory.java
+++ /dev/null
@@ -1,187 +0,0 @@
-
-package on3vertrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-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 on3vertrag._0._4.v1.omds3types.types.omds.vvo.at package. 
- * 
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 _GetPoliciesOfPartnerRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag", "GetPoliciesOfPartnerRequest");
-    private final static QName _GetPoliciesOfPartnerResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag", "GetPoliciesOfPartnerResponse");
-    private final static QName _SetMailingAddressRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag", "SetMailingAddressRequest");
-    private final static QName _SetMailingAddressResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag", "SetMailingAddressResponse");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: on3vertrag._0._4.v1.omds3types.types.omds.vvo.at
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link ZahlwegType }
-     * 
-     */
-    public ZahlwegType createZahlwegType() {
-        return new ZahlwegType();
-    }
-
-    /**
-     * Create an instance of {@link GetPoliciesOfPartnerRequestType }
-     * 
-     */
-    public GetPoliciesOfPartnerRequestType createGetPoliciesOfPartnerRequestType() {
-        return new GetPoliciesOfPartnerRequestType();
-    }
-
-    /**
-     * Create an instance of {@link GetPoliciesOfPartnerResponseType }
-     * 
-     */
-    public GetPoliciesOfPartnerResponseType createGetPoliciesOfPartnerResponseType() {
-        return new GetPoliciesOfPartnerResponseType();
-    }
-
-    /**
-     * Create an instance of {@link SetMailingAddressRequestType }
-     * 
-     */
-    public SetMailingAddressRequestType createSetMailingAddressRequestType() {
-        return new SetMailingAddressRequestType();
-    }
-
-    /**
-     * Create an instance of {@link SetMailingAddressResponseType }
-     * 
-     */
-    public SetMailingAddressResponseType createSetMailingAddressResponseType() {
-        return new SetMailingAddressResponseType();
-    }
-
-    /**
-     * Create an instance of {@link CollectionChangeRequest }
-     * 
-     */
-    public CollectionChangeRequest createCollectionChangeRequest() {
-        return new CollectionChangeRequest();
-    }
-
-    /**
-     * Create an instance of {@link CollectionChangeResponse }
-     * 
-     */
-    public CollectionChangeResponse createCollectionChangeResponse() {
-        return new CollectionChangeResponse();
-    }
-
-    /**
-     * Create an instance of {@link CollectionRhythmInfoRequest }
-     * 
-     */
-    public CollectionRhythmInfoRequest createCollectionRhythmInfoRequest() {
-        return new CollectionRhythmInfoRequest();
-    }
-
-    /**
-     * Create an instance of {@link CollectionRhythmInfoResponse }
-     * 
-     */
-    public CollectionRhythmInfoResponse createCollectionRhythmInfoResponse() {
-        return new CollectionRhythmInfoResponse();
-    }
-
-    /**
-     * Create an instance of {@link PraemienInfoType }
-     * 
-     */
-    public PraemienInfoType createPraemienInfoType() {
-        return new PraemienInfoType();
-    }
-
-    /**
-     * Create an instance of {@link CollectionRhythmChangeRequest }
-     * 
-     */
-    public CollectionRhythmChangeRequest createCollectionRhythmChangeRequest() {
-        return new CollectionRhythmChangeRequest();
-    }
-
-    /**
-     * Create an instance of {@link CollectionRhythmChangeResponse }
-     * 
-     */
-    public CollectionRhythmChangeResponse createCollectionRhythmChangeResponse() {
-        return new CollectionRhythmChangeResponse();
-    }
-
-    /**
-     * Create an instance of {@link ZahlwegType.Kundenkonto }
-     * 
-     */
-    public ZahlwegType.Kundenkonto createZahlwegTypeKundenkonto() {
-        return new ZahlwegType.Kundenkonto();
-    }
-
-    /**
-     * Create an instance of {@link ZahlwegType.Kreditkarte }
-     * 
-     */
-    public ZahlwegType.Kreditkarte createZahlwegTypeKreditkarte() {
-        return new ZahlwegType.Kreditkarte();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetPoliciesOfPartnerRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag", name = "GetPoliciesOfPartnerRequest")
-    public JAXBElement createGetPoliciesOfPartnerRequest(GetPoliciesOfPartnerRequestType value) {
-        return new JAXBElement(_GetPoliciesOfPartnerRequest_QNAME, GetPoliciesOfPartnerRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetPoliciesOfPartnerResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag", name = "GetPoliciesOfPartnerResponse")
-    public JAXBElement createGetPoliciesOfPartnerResponse(GetPoliciesOfPartnerResponseType value) {
-        return new JAXBElement(_GetPoliciesOfPartnerResponse_QNAME, GetPoliciesOfPartnerResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SetMailingAddressRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag", name = "SetMailingAddressRequest")
-    public JAXBElement createSetMailingAddressRequest(SetMailingAddressRequestType value) {
-        return new JAXBElement(_SetMailingAddressRequest_QNAME, SetMailingAddressRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SetMailingAddressResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag", name = "SetMailingAddressResponse")
-    public JAXBElement createSetMailingAddressResponse(SetMailingAddressResponseType value) {
-        return new JAXBElement(_SetMailingAddressResponse_QNAME, SetMailingAddressResponseType.class, null, value);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/PraemienInfoType.java b/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/PraemienInfoType.java
deleted file mode 100644
index 11d905cc..00000000
--- a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/PraemienInfoType.java
+++ /dev/null
@@ -1,92 +0,0 @@
-
-package on3vertrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import java.math.BigDecimal;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.PraemieType;
-
-
-/**
- * 
Java-Klasse für PraemienInfo_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="PraemienInfo_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence minOccurs="0">
- *         <element name="JahrespraemieNto" type="{urn:omds20}decimal"/>
- *         <element name="Praemie" type="{urn:omds3CommonServiceTypes-1-1-0}Praemie_Type"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PraemienInfo_Type", propOrder = {
-    "jahrespraemieNto",
-    "praemie"
-})
-public class PraemienInfoType {
-
-    @XmlElement(name = "JahrespraemieNto")
-    protected BigDecimal jahrespraemieNto;
-    @XmlElement(name = "Praemie")
-    protected PraemieType praemie;
-
-    /**
-     * Ruft den Wert der jahrespraemieNto-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getJahrespraemieNto() {
-        return jahrespraemieNto;
-    }
-
-    /**
-     * Legt den Wert der jahrespraemieNto-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setJahrespraemieNto(BigDecimal value) {
-        this.jahrespraemieNto = value;
-    }
-
-    /**
-     * Ruft den Wert der praemie-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PraemieType }
-     *     
-     */
-    public PraemieType getPraemie() {
-        return praemie;
-    }
-
-    /**
-     * Legt den Wert der praemie-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PraemieType }
-     *     
-     */
-    public void setPraemie(PraemieType value) {
-        this.praemie = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/SetMailingAddressRequestType.java b/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/SetMailingAddressRequestType.java
deleted file mode 100644
index 34f66f43..00000000
--- a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/SetMailingAddressRequestType.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package on3vertrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AdresseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-
-
-/**
- * Typ des Requestobjekts für das Setzen einer Zustelladresse
- * 
- * 
Java-Klasse für SetMailingAddressRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SetMailingAddressRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}ObjektId"/>
- *         <element name="Zustelladresse" type="{urn:omds3CommonServiceTypes-1-1-0}Adresse_Type"/>
- *         <element name="WirksamtkeitAb" type="{http://www.w3.org/2001/XMLSchema}date"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SetMailingAddressRequest_Type", propOrder = {
-    "objektId",
-    "zustelladresse",
-    "wirksamtkeitAb"
-})
-public class SetMailingAddressRequestType
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "ObjektId", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-    protected ObjektIdType objektId;
-    @XmlElement(name = "Zustelladresse", required = true)
-    protected AdresseType zustelladresse;
-    @XmlElement(name = "WirksamtkeitAb", required = true)
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar wirksamtkeitAb;
-
-    /**
-     * Die ObjektId des Vertrags
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getObjektId() {
-        return objektId;
-    }
-
-    /**
-     * Legt den Wert der objektId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setObjektId(ObjektIdType value) {
-        this.objektId = value;
-    }
-
-    /**
-     * Ruft den Wert der zustelladresse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AdresseType }
-     *     
-     */
-    public AdresseType getZustelladresse() {
-        return zustelladresse;
-    }
-
-    /**
-     * Legt den Wert der zustelladresse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AdresseType }
-     *     
-     */
-    public void setZustelladresse(AdresseType value) {
-        this.zustelladresse = value;
-    }
-
-    /**
-     * Ruft den Wert der wirksamtkeitAb-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getWirksamtkeitAb() {
-        return wirksamtkeitAb;
-    }
-
-    /**
-     * Legt den Wert der wirksamtkeitAb-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setWirksamtkeitAb(XMLGregorianCalendar value) {
-        this.wirksamtkeitAb = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/SetMailingAddressResponseType.java b/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/SetMailingAddressResponseType.java
deleted file mode 100644
index d7f82bfa..00000000
--- a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/SetMailingAddressResponseType.java
+++ /dev/null
@@ -1,126 +0,0 @@
-
-package on3vertrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds2Types.v2_14.VERTRAGType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AdresseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-
-
-/**
- * Typ des Responseobjekts für das Setzen einer Zustelladresse
- * 
- * 
Java-Klasse für SetMailingAddressResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SetMailingAddressResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence minOccurs="0">
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}ObjektId"/>
- *         <element name="Vertrag" type="{urn:omds20}VERTRAG_Type"/>
- *         <element name="Zustelladresse" type="{urn:omds3CommonServiceTypes-1-1-0}Adresse_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SetMailingAddressResponse_Type", propOrder = {
-    "objektId",
-    "vertrag",
-    "zustelladresse"
-})
-public class SetMailingAddressResponseType
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "ObjektId", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected ObjektIdType objektId;
-    @XmlElement(name = "Vertrag")
-    protected VERTRAGType vertrag;
-    @XmlElement(name = "Zustelladresse")
-    protected AdresseType zustelladresse;
-
-    /**
-     * ObjektId des Vertrags
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getObjektId() {
-        return objektId;
-    }
-
-    /**
-     * Legt den Wert der objektId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setObjektId(ObjektIdType value) {
-        this.objektId = value;
-    }
-
-    /**
-     * Ruft den Wert der vertrag-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VERTRAGType }
-     *     
-     */
-    public VERTRAGType getVertrag() {
-        return vertrag;
-    }
-
-    /**
-     * Legt den Wert der vertrag-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VERTRAGType }
-     *     
-     */
-    public void setVertrag(VERTRAGType value) {
-        this.vertrag = value;
-    }
-
-    /**
-     * Ruft den Wert der zustelladresse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AdresseType }
-     *     
-     */
-    public AdresseType getZustelladresse() {
-        return zustelladresse;
-    }
-
-    /**
-     * Legt den Wert der zustelladresse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AdresseType }
-     *     
-     */
-    public void setZustelladresse(AdresseType value) {
-        this.zustelladresse = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/ZahlwegType.java b/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/ZahlwegType.java
deleted file mode 100644
index 53fe3f49..00000000
--- a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/ZahlwegType.java
+++ /dev/null
@@ -1,418 +0,0 @@
-
-package on3vertrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-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.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.BankverbindungType;
-
-
-/**
- * 
Java-Klasse für Zahlweg_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Zahlweg_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="Zahlungsanweisung" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
- *         <element name="BankverbindungAbbuchung" type="{urn:omds3CommonServiceTypes-1-1-0}Bankverbindung_Type"/>
- *         <element name="Kundenkonto">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="Kundenkontonummer" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="Kreditkarte">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="Gesellschaft" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="Kartennummer" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="Inhaber" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="Pruefziffer" use="required">
- *                   <simpleType>
- *                     <restriction base="{http://www.w3.org/2001/XMLSchema}unsignedInt">
- *                       <totalDigits value="3"/>
- *                     </restriction>
- *                   </simpleType>
- *                 </attribute>
- *                 <attribute name="AblaufMonat" use="required">
- *                   <simpleType>
- *                     <restriction base="{http://www.w3.org/2001/XMLSchema}unsignedByte">
- *                       <totalDigits value="2"/>
- *                     </restriction>
- *                   </simpleType>
- *                 </attribute>
- *                 <attribute name="AblaufJahr" use="required">
- *                   <simpleType>
- *                     <restriction base="{http://www.w3.org/2001/XMLSchema}unsignedByte">
- *                       <totalDigits value="2"/>
- *                     </restriction>
- *                   </simpleType>
- *                 </attribute>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Zahlweg_Type", propOrder = {
-    "zahlungsanweisung",
-    "bankverbindungAbbuchung",
-    "kundenkonto",
-    "kreditkarte"
-})
-public class ZahlwegType {
-
-    @XmlElement(name = "Zahlungsanweisung")
-    protected Object zahlungsanweisung;
-    @XmlElement(name = "BankverbindungAbbuchung")
-    protected BankverbindungType bankverbindungAbbuchung;
-    @XmlElement(name = "Kundenkonto")
-    protected ZahlwegType.Kundenkonto kundenkonto;
-    @XmlElement(name = "Kreditkarte")
-    protected ZahlwegType.Kreditkarte kreditkarte;
-
-    /**
-     * Ruft den Wert der zahlungsanweisung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Object }
-     *     
-     */
-    public Object getZahlungsanweisung() {
-        return zahlungsanweisung;
-    }
-
-    /**
-     * Legt den Wert der zahlungsanweisung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     
-     */
-    public void setZahlungsanweisung(Object value) {
-        this.zahlungsanweisung = value;
-    }
-
-    /**
-     * Ruft den Wert der bankverbindungAbbuchung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BankverbindungType }
-     *     
-     */
-    public BankverbindungType getBankverbindungAbbuchung() {
-        return bankverbindungAbbuchung;
-    }
-
-    /**
-     * Legt den Wert der bankverbindungAbbuchung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BankverbindungType }
-     *     
-     */
-    public void setBankverbindungAbbuchung(BankverbindungType value) {
-        this.bankverbindungAbbuchung = value;
-    }
-
-    /**
-     * Ruft den Wert der kundenkonto-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ZahlwegType.Kundenkonto }
-     *     
-     */
-    public ZahlwegType.Kundenkonto getKundenkonto() {
-        return kundenkonto;
-    }
-
-    /**
-     * Legt den Wert der kundenkonto-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ZahlwegType.Kundenkonto }
-     *     
-     */
-    public void setKundenkonto(ZahlwegType.Kundenkonto value) {
-        this.kundenkonto = value;
-    }
-
-    /**
-     * Ruft den Wert der kreditkarte-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ZahlwegType.Kreditkarte }
-     *     
-     */
-    public ZahlwegType.Kreditkarte getKreditkarte() {
-        return kreditkarte;
-    }
-
-    /**
-     * Legt den Wert der kreditkarte-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ZahlwegType.Kreditkarte }
-     *     
-     */
-    public void setKreditkarte(ZahlwegType.Kreditkarte value) {
-        this.kreditkarte = value;
-    }
-
-
-    /**
-     * 
Java-Klasse für anonymous complex type.
-     * 
-     * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="Gesellschaft" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="Kartennummer" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="Inhaber" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="Pruefziffer" use="required">
-     *         <simpleType>
-     *           <restriction base="{http://www.w3.org/2001/XMLSchema}unsignedInt">
-     *             <totalDigits value="3"/>
-     *           </restriction>
-     *         </simpleType>
-     *       </attribute>
-     *       <attribute name="AblaufMonat" use="required">
-     *         <simpleType>
-     *           <restriction base="{http://www.w3.org/2001/XMLSchema}unsignedByte">
-     *             <totalDigits value="2"/>
-     *           </restriction>
-     *         </simpleType>
-     *       </attribute>
-     *       <attribute name="AblaufJahr" use="required">
-     *         <simpleType>
-     *           <restriction base="{http://www.w3.org/2001/XMLSchema}unsignedByte">
-     *             <totalDigits value="2"/>
-     *           </restriction>
-     *         </simpleType>
-     *       </attribute>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Kreditkarte {
-
-        @XmlAttribute(name = "Gesellschaft", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag", required = true)
-        protected String gesellschaft;
-        @XmlAttribute(name = "Kartennummer", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag", required = true)
-        protected String kartennummer;
-        @XmlAttribute(name = "Inhaber", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag", required = true)
-        protected String inhaber;
-        @XmlAttribute(name = "Pruefziffer", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag", required = true)
-        protected long pruefziffer;
-        @XmlAttribute(name = "AblaufMonat", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag", required = true)
-        protected short ablaufMonat;
-        @XmlAttribute(name = "AblaufJahr", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag", required = true)
-        protected short ablaufJahr;
-
-        /**
-         * Ruft den Wert der gesellschaft-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getGesellschaft() {
-            return gesellschaft;
-        }
-
-        /**
-         * Legt den Wert der gesellschaft-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setGesellschaft(String value) {
-            this.gesellschaft = value;
-        }
-
-        /**
-         * Ruft den Wert der kartennummer-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getKartennummer() {
-            return kartennummer;
-        }
-
-        /**
-         * Legt den Wert der kartennummer-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setKartennummer(String value) {
-            this.kartennummer = value;
-        }
-
-        /**
-         * Ruft den Wert der inhaber-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getInhaber() {
-            return inhaber;
-        }
-
-        /**
-         * Legt den Wert der inhaber-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setInhaber(String value) {
-            this.inhaber = value;
-        }
-
-        /**
-         * Ruft den Wert der pruefziffer-Eigenschaft ab.
-         * 
-         */
-        public long getPruefziffer() {
-            return pruefziffer;
-        }
-
-        /**
-         * Legt den Wert der pruefziffer-Eigenschaft fest.
-         * 
-         */
-        public void setPruefziffer(long value) {
-            this.pruefziffer = value;
-        }
-
-        /**
-         * Ruft den Wert der ablaufMonat-Eigenschaft ab.
-         * 
-         */
-        public short getAblaufMonat() {
-            return ablaufMonat;
-        }
-
-        /**
-         * Legt den Wert der ablaufMonat-Eigenschaft fest.
-         * 
-         */
-        public void setAblaufMonat(short value) {
-            this.ablaufMonat = value;
-        }
-
-        /**
-         * Ruft den Wert der ablaufJahr-Eigenschaft ab.
-         * 
-         */
-        public short getAblaufJahr() {
-            return ablaufJahr;
-        }
-
-        /**
-         * Legt den Wert der ablaufJahr-Eigenschaft fest.
-         * 
-         */
-        public void setAblaufJahr(short value) {
-            this.ablaufJahr = value;
-        }
-
-    }
-
-
-    /**
-     * 
Java-Klasse für anonymous complex type.
-     * 
-     * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="Kundenkontonummer" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Kundenkonto {
-
-        @XmlAttribute(name = "Kundenkontonummer", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag", required = true)
-        protected String kundenkontonummer;
-
-        /**
-         * Ruft den Wert der kundenkontonummer-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getKundenkontonummer() {
-            return kundenkontonummer;
-        }
-
-        /**
-         * Legt den Wert der kundenkontonummer-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setKundenkontonummer(String value) {
-            this.kundenkontonummer = value;
-        }
-
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/package-info.java b/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/package-info.java
deleted file mode 100644
index 168664ab..00000000
--- a/OMDSServiceDefinition/src/main/java/on3vertrag/_0/_4/v1/omds3types/types/omds/vvo/at/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package on3vertrag._0._4.v1.omds3types.types.omds.vvo.at;
diff --git a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/AddCommunicationObjectRequestType.java b/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/AddCommunicationObjectRequestType.java
deleted file mode 100644
index 994a247d..00000000
--- a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/AddCommunicationObjectRequestType.java
+++ /dev/null
@@ -1,143 +0,0 @@
-
-package on4partner._0._4.v1.omds3types.types.omds.vvo.at;
-
-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.XmlElements;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-import at.vvo.omds.types.omds2Types.v2_14.ELKommunikationType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-
-
-/**
- * Typ des Requestobjekts für Neuanlage einer Kommunikationsverbindung
- * 
- * 
Java-Klasse für AddCommunicationObjectRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AddCommunicationObjectRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}ObjektId"/>
- *         <sequence maxOccurs="unbounded">
- *           <element ref="{urn:omds3CommonServiceTypes-1-1-0}OrdnungsbegriffZuordFremd" minOccurs="0"/>
- *           <element name="NeueKommunikationsVerbindung" type="{urn:omds20}EL-Kommunikation_Type"/>
- *         </sequence>
- *         <element name="WirksamtkeitAb" type="{http://www.w3.org/2001/XMLSchema}date"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AddCommunicationObjectRequest_Type", propOrder = {
-    "objektId",
-    "ordnungsbegriffZuordFremdAndNeueKommunikationsVerbindung",
-    "wirksamtkeitAb"
-})
-public class AddCommunicationObjectRequestType
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "ObjektId", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-    protected ObjektIdType objektId;
-    @XmlElements({
-        @XmlElement(name = "OrdnungsbegriffZuordFremd", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true, type = String.class),
-        @XmlElement(name = "NeueKommunikationsVerbindung", required = true, type = ELKommunikationType.class)
-    })
-    protected List ordnungsbegriffZuordFremdAndNeueKommunikationsVerbindung;
-    @XmlElement(name = "WirksamtkeitAb", required = true)
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar wirksamtkeitAb;
-
-    /**
-     * Die Personennr in einer ObjektId
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getObjektId() {
-        return objektId;
-    }
-
-    /**
-     * Legt den Wert der objektId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setObjektId(ObjektIdType value) {
-        this.objektId = value;
-    }
-
-    /**
-     * Gets the value of the ordnungsbegriffZuordFremdAndNeueKommunikationsVerbindung property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the ordnungsbegriffZuordFremdAndNeueKommunikationsVerbindung property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getOrdnungsbegriffZuordFremdAndNeueKommunikationsVerbindung().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * {@link ELKommunikationType }
-     * 
-     * 
-     */
-    public List getOrdnungsbegriffZuordFremdAndNeueKommunikationsVerbindung() {
-        if (ordnungsbegriffZuordFremdAndNeueKommunikationsVerbindung == null) {
-            ordnungsbegriffZuordFremdAndNeueKommunikationsVerbindung = new ArrayList();
-        }
-        return this.ordnungsbegriffZuordFremdAndNeueKommunikationsVerbindung;
-    }
-
-    /**
-     * Ruft den Wert der wirksamtkeitAb-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getWirksamtkeitAb() {
-        return wirksamtkeitAb;
-    }
-
-    /**
-     * Legt den Wert der wirksamtkeitAb-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setWirksamtkeitAb(XMLGregorianCalendar value) {
-        this.wirksamtkeitAb = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/AddCommunicationObjectResponseType.java b/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/AddCommunicationObjectResponseType.java
deleted file mode 100644
index 496e0072..00000000
--- a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/AddCommunicationObjectResponseType.java
+++ /dev/null
@@ -1,68 +0,0 @@
-
-package on4partner._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.PersonType;
-
-
-/**
- * Typ des Response für eine Änderung, Löschung oder Neuanlage einer Kommunikationsverbindung
- * 
- * 
Java-Klasse für AddCommunicationObjectResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="AddCommunicationObjectResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence>
- *         <element name="Person" type="{urn:omds3CommonServiceTypes-1-1-0}Person_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AddCommunicationObjectResponse_Type", propOrder = {
-    "person"
-})
-public class AddCommunicationObjectResponseType
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "Person")
-    protected PersonType person;
-
-    /**
-     * Ruft den Wert der person-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PersonType }
-     *     
-     */
-    public PersonType getPerson() {
-        return person;
-    }
-
-    /**
-     * Legt den Wert der person-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PersonType }
-     *     
-     */
-    public void setPerson(PersonType value) {
-        this.person = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangeCommunicationObjectRequestType.java b/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangeCommunicationObjectRequestType.java
deleted file mode 100644
index 21b8cd78..00000000
--- a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangeCommunicationObjectRequestType.java
+++ /dev/null
@@ -1,184 +0,0 @@
-
-package on4partner._0._4.v1.omds3types.types.omds.vvo.at;
-
-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.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-import at.vvo.omds.types.omds2Types.v2_14.ELKommunikationType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.DateianhangType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-
-
-/**
- * Typ des Requestobjekts für eine Änderung einer bestehenden Kommunikationsverbindung
- * 
- * 
Java-Klasse für ChangeCommunicationObjectRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ChangeCommunicationObjectRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}ObjektId"/>
- *         <sequence maxOccurs="unbounded">
- *           <choice>
- *             <element ref="{urn:omds3CommonServiceTypes-1-1-0}ObjektId"/>
- *             <element name="BisherigeKommunikationsVerbindung" type="{urn:omds20}EL-Kommunikation_Type"/>
- *           </choice>
- *           <element name="GeaenderteKommunikationsVerbindung" type="{urn:omds20}EL-Kommunikation_Type"/>
- *         </sequence>
- *         <element name="WirksamtkeitAb" type="{http://www.w3.org/2001/XMLSchema}date"/>
- *         <element name="Dateianhaenge" type="{urn:omds3CommonServiceTypes-1-1-0}Dateianhang_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ChangeCommunicationObjectRequest_Type", propOrder = {
-    "objektId",
-    "objektIdOrBisherigeKommunikationsVerbindungAndGeaenderteKommunikationsVerbindung",
-    "wirksamtkeitAb",
-    "dateianhaenge"
-})
-public class ChangeCommunicationObjectRequestType
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "ObjektId", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-    protected ObjektIdType objektId;
-    @XmlElementRefs({
-        @XmlElementRef(name = "GeaenderteKommunikationsVerbindung", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", type = JAXBElement.class),
-        @XmlElementRef(name = "BisherigeKommunikationsVerbindung", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", type = JAXBElement.class),
-        @XmlElementRef(name = "ObjektId", namespace = "urn:omds3CommonServiceTypes-1-1-0", type = JAXBElement.class)
-    })
-    protected List> objektIdOrBisherigeKommunikationsVerbindungAndGeaenderteKommunikationsVerbindung;
-    @XmlElement(name = "WirksamtkeitAb", required = true)
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar wirksamtkeitAb;
-    @XmlElement(name = "Dateianhaenge")
-    protected List dateianhaenge;
-
-    /**
-     * Die Personennr als ObjektId
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getObjektId() {
-        return objektId;
-    }
-
-    /**
-     * Legt den Wert der objektId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setObjektId(ObjektIdType value) {
-        this.objektId = value;
-    }
-
-    /**
-     * Gets the value of the objektIdOrBisherigeKommunikationsVerbindungAndGeaenderteKommunikationsVerbindung property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the objektIdOrBisherigeKommunikationsVerbindungAndGeaenderteKommunikationsVerbindung property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getObjektIdOrBisherigeKommunikationsVerbindungAndGeaenderteKommunikationsVerbindung().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link ELKommunikationType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ObjektIdType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ELKommunikationType }{@code >}
-     * 
-     * 
-     */
-    public List> getObjektIdOrBisherigeKommunikationsVerbindungAndGeaenderteKommunikationsVerbindung() {
-        if (objektIdOrBisherigeKommunikationsVerbindungAndGeaenderteKommunikationsVerbindung == null) {
-            objektIdOrBisherigeKommunikationsVerbindungAndGeaenderteKommunikationsVerbindung = new ArrayList>();
-        }
-        return this.objektIdOrBisherigeKommunikationsVerbindungAndGeaenderteKommunikationsVerbindung;
-    }
-
-    /**
-     * Ruft den Wert der wirksamtkeitAb-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getWirksamtkeitAb() {
-        return wirksamtkeitAb;
-    }
-
-    /**
-     * Legt den Wert der wirksamtkeitAb-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setWirksamtkeitAb(XMLGregorianCalendar value) {
-        this.wirksamtkeitAb = value;
-    }
-
-    /**
-     * Gets the value of the dateianhaenge property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the dateianhaenge property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDateianhaenge().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link DateianhangType }
-     * 
-     * 
-     */
-    public List getDateianhaenge() {
-        if (dateianhaenge == null) {
-            dateianhaenge = new ArrayList();
-        }
-        return this.dateianhaenge;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangeCommunicationObjectResponse.java b/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangeCommunicationObjectResponse.java
deleted file mode 100644
index 562e1ce1..00000000
--- a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangeCommunicationObjectResponse.java
+++ /dev/null
@@ -1,34 +0,0 @@
-
-package on4partner._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner}ChangeCommunicationObjectResponse_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "")
-@XmlRootElement(name = "ChangeCommunicationObjectResponse")
-public class ChangeCommunicationObjectResponse
-    extends ChangeCommunicationObjectResponseType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangeCommunicationObjectResponseType.java b/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangeCommunicationObjectResponseType.java
deleted file mode 100644
index ddb83e47..00000000
--- a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangeCommunicationObjectResponseType.java
+++ /dev/null
@@ -1,72 +0,0 @@
-
-package on4partner._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.PersonType;
-
-
-/**
- * Typ des Response für eine Änderung, Löschung oder Neuanlage einer Kommunikationsverbindung
- * 
- * 
Java-Klasse für ChangeCommunicationObjectResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ChangeCommunicationObjectResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence>
- *         <element name="Person" type="{urn:omds3CommonServiceTypes-1-1-0}Person_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ChangeCommunicationObjectResponse_Type", propOrder = {
-    "person"
-})
-@XmlSeeAlso({
-    ChangeCommunicationObjectResponse.class
-})
-public class ChangeCommunicationObjectResponseType
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "Person")
-    protected PersonType person;
-
-    /**
-     * Ruft den Wert der person-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PersonType }
-     *     
-     */
-    public PersonType getPerson() {
-        return person;
-    }
-
-    /**
-     * Legt den Wert der person-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PersonType }
-     *     
-     */
-    public void setPerson(PersonType value) {
-        this.person = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangePartnerMainAddressRequestType.java b/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangePartnerMainAddressRequestType.java
deleted file mode 100644
index 08790022..00000000
--- a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangePartnerMainAddressRequestType.java
+++ /dev/null
@@ -1,341 +0,0 @@
-
-package on4partner._0._4.v1.omds3types.types.omds.vvo.at;
-
-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.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AdresseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.DateianhangType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-
-
-/**
- * Typ des Requestobjekts für eine Änderung einer bestehenden Adresse
- * 
- * 
Java-Klasse für ChangePartnerMainAddressRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ChangePartnerMainAddressRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element name="Personennr" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type"/>
- *         <element name="Hinweistext" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="BisherigeAnschrift" type="{urn:omds3CommonServiceTypes-1-1-0}Adresse_Type"/>
- *         <element name="GeaenderteAnschrift" type="{urn:omds3CommonServiceTypes-1-1-0}Adresse_Type"/>
- *         <element name="WirksamtkeitAb" type="{http://www.w3.org/2001/XMLSchema}date"/>
- *         <element name="Dateianhaenge" type="{urn:omds3CommonServiceTypes-1-1-0}Dateianhang_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="UeberschreibeZustelladresseInVertraegen" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="Polizzennr" use="required" type="{urn:omds20}Polizzennr" />
- *                 <attribute name="VertragsID" type="{urn:omds20}VertragsID" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ChangePartnerMainAddressRequest_Type", propOrder = {
-    "personennr",
-    "hinweistext",
-    "bisherigeAnschrift",
-    "geaenderteAnschrift",
-    "wirksamtkeitAb",
-    "dateianhaenge",
-    "ueberschreibeZustelladresseInVertraegen"
-})
-public class ChangePartnerMainAddressRequestType
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "Personennr", required = true)
-    protected ObjektIdType personennr;
-    @XmlElement(name = "Hinweistext")
-    protected String hinweistext;
-    @XmlElement(name = "BisherigeAnschrift", required = true)
-    protected AdresseType bisherigeAnschrift;
-    @XmlElement(name = "GeaenderteAnschrift", required = true)
-    protected AdresseType geaenderteAnschrift;
-    @XmlElement(name = "WirksamtkeitAb", required = true)
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar wirksamtkeitAb;
-    @XmlElement(name = "Dateianhaenge")
-    protected List dateianhaenge;
-    @XmlElement(name = "UeberschreibeZustelladresseInVertraegen")
-    protected List ueberschreibeZustelladresseInVertraegen;
-
-    /**
-     * Ruft den Wert der personennr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getPersonennr() {
-        return personennr;
-    }
-
-    /**
-     * Legt den Wert der personennr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setPersonennr(ObjektIdType value) {
-        this.personennr = value;
-    }
-
-    /**
-     * Ruft den Wert der hinweistext-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getHinweistext() {
-        return hinweistext;
-    }
-
-    /**
-     * Legt den Wert der hinweistext-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setHinweistext(String value) {
-        this.hinweistext = value;
-    }
-
-    /**
-     * Ruft den Wert der bisherigeAnschrift-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AdresseType }
-     *     
-     */
-    public AdresseType getBisherigeAnschrift() {
-        return bisherigeAnschrift;
-    }
-
-    /**
-     * Legt den Wert der bisherigeAnschrift-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AdresseType }
-     *     
-     */
-    public void setBisherigeAnschrift(AdresseType value) {
-        this.bisherigeAnschrift = value;
-    }
-
-    /**
-     * Ruft den Wert der geaenderteAnschrift-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AdresseType }
-     *     
-     */
-    public AdresseType getGeaenderteAnschrift() {
-        return geaenderteAnschrift;
-    }
-
-    /**
-     * Legt den Wert der geaenderteAnschrift-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AdresseType }
-     *     
-     */
-    public void setGeaenderteAnschrift(AdresseType value) {
-        this.geaenderteAnschrift = value;
-    }
-
-    /**
-     * Ruft den Wert der wirksamtkeitAb-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getWirksamtkeitAb() {
-        return wirksamtkeitAb;
-    }
-
-    /**
-     * Legt den Wert der wirksamtkeitAb-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setWirksamtkeitAb(XMLGregorianCalendar value) {
-        this.wirksamtkeitAb = value;
-    }
-
-    /**
-     * Gets the value of the dateianhaenge property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the dateianhaenge property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDateianhaenge().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link DateianhangType }
-     * 
-     * 
-     */
-    public List getDateianhaenge() {
-        if (dateianhaenge == null) {
-            dateianhaenge = new ArrayList();
-        }
-        return this.dateianhaenge;
-    }
-
-    /**
-     * Gets the value of the ueberschreibeZustelladresseInVertraegen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the ueberschreibeZustelladresseInVertraegen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getUeberschreibeZustelladresseInVertraegen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ChangePartnerMainAddressRequestType.UeberschreibeZustelladresseInVertraegen }
-     * 
-     * 
-     */
-    public List getUeberschreibeZustelladresseInVertraegen() {
-        if (ueberschreibeZustelladresseInVertraegen == null) {
-            ueberschreibeZustelladresseInVertraegen = new ArrayList();
-        }
-        return this.ueberschreibeZustelladresseInVertraegen;
-    }
-
-
-    /**
-     * 
Java-Klasse für anonymous complex type.
-     * 
-     * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="Polizzennr" use="required" type="{urn:omds20}Polizzennr" />
-     *       <attribute name="VertragsID" type="{urn:omds20}VertragsID" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class UeberschreibeZustelladresseInVertraegen {
-
-        @XmlAttribute(name = "Polizzennr", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", required = true)
-        protected String polizzennr;
-        @XmlAttribute(name = "VertragsID", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner")
-        protected String vertragsID;
-
-        /**
-         * Ruft den Wert der polizzennr-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getPolizzennr() {
-            return polizzennr;
-        }
-
-        /**
-         * Legt den Wert der polizzennr-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setPolizzennr(String value) {
-            this.polizzennr = value;
-        }
-
-        /**
-         * Ruft den Wert der vertragsID-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getVertragsID() {
-            return vertragsID;
-        }
-
-        /**
-         * Legt den Wert der vertragsID-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setVertragsID(String value) {
-            this.vertragsID = value;
-        }
-
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangePartnerMainAddressResponseType.java b/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangePartnerMainAddressResponseType.java
deleted file mode 100644
index c1c2ba75..00000000
--- a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangePartnerMainAddressResponseType.java
+++ /dev/null
@@ -1,166 +0,0 @@
-
-package on4partner._0._4.v1.omds3types.types.omds.vvo.at;
-
-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;
-import at.vvo.omds.types.omds2Types.v2_14.VERTRAGType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AdresseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.PersonType;
-
-
-/**
- * Typ des Response für eine Änderung, Löschung oder Neuanlage einer Adresse
- * 
- * 
Java-Klasse für ChangePartnerMainAddressResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ChangePartnerMainAddressResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}Adresse" minOccurs="0"/>
- *         <element name="VertraegeGeaendert" type="{urn:omds20}VERTRAG_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="VertraegeMitUnveraendertenRisikoadressen" type="{urn:omds20}VERTRAG_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="WeiterePersonenAnAdresse" type="{urn:omds3CommonServiceTypes-1-1-0}Person_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ChangePartnerMainAddressResponse_Type", propOrder = {
-    "adresse",
-    "vertraegeGeaendert",
-    "vertraegeMitUnveraendertenRisikoadressen",
-    "weiterePersonenAnAdresse"
-})
-public class ChangePartnerMainAddressResponseType
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "Adresse", namespace = "urn:omds3CommonServiceTypes-1-1-0")
-    protected AdresseType adresse;
-    @XmlElement(name = "VertraegeGeaendert")
-    protected List vertraegeGeaendert;
-    @XmlElement(name = "VertraegeMitUnveraendertenRisikoadressen")
-    protected List vertraegeMitUnveraendertenRisikoadressen;
-    @XmlElement(name = "WeiterePersonenAnAdresse")
-    protected PersonType weiterePersonenAnAdresse;
-
-    /**
-     * Die neue Adresse
-     * 
-     * @return
-     *     possible object is
-     *     {@link AdresseType }
-     *     
-     */
-    public AdresseType getAdresse() {
-        return adresse;
-    }
-
-    /**
-     * Legt den Wert der adresse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AdresseType }
-     *     
-     */
-    public void setAdresse(AdresseType value) {
-        this.adresse = value;
-    }
-
-    /**
-     * Gets the value of the vertraegeGeaendert property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the vertraegeGeaendert property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVertraegeGeaendert().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link VERTRAGType }
-     * 
-     * 
-     */
-    public List getVertraegeGeaendert() {
-        if (vertraegeGeaendert == null) {
-            vertraegeGeaendert = new ArrayList();
-        }
-        return this.vertraegeGeaendert;
-    }
-
-    /**
-     * Gets the value of the vertraegeMitUnveraendertenRisikoadressen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the vertraegeMitUnveraendertenRisikoadressen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVertraegeMitUnveraendertenRisikoadressen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link VERTRAGType }
-     * 
-     * 
-     */
-    public List getVertraegeMitUnveraendertenRisikoadressen() {
-        if (vertraegeMitUnveraendertenRisikoadressen == null) {
-            vertraegeMitUnveraendertenRisikoadressen = new ArrayList();
-        }
-        return this.vertraegeMitUnveraendertenRisikoadressen;
-    }
-
-    /**
-     * Ruft den Wert der weiterePersonenAnAdresse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PersonType }
-     *     
-     */
-    public PersonType getWeiterePersonenAnAdresse() {
-        return weiterePersonenAnAdresse;
-    }
-
-    /**
-     * Legt den Wert der weiterePersonenAnAdresse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PersonType }
-     *     
-     */
-    public void setWeiterePersonenAnAdresse(PersonType value) {
-        this.weiterePersonenAnAdresse = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangePersonDataRequestType.java b/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangePersonDataRequestType.java
deleted file mode 100644
index 7cd82a1f..00000000
--- a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangePersonDataRequestType.java
+++ /dev/null
@@ -1,223 +0,0 @@
-
-package on4partner._0._4.v1.omds3types.types.omds.vvo.at;
-
-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;
-import at.vvo.omds.types.omds2Types.v2_14.NATUERLICHEPERSONType;
-import at.vvo.omds.types.omds2Types.v2_14.SONSTIGEPERSONType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.DateianhangType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-
-
-/**
- * Typ des Requestobjekts für eine Änderung der allgemeinen Personendaten
- * 
- * 
Java-Klasse für ChangePersonDataRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ChangePersonDataRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}ObjektId"/>
- *         <element name="Hinweistext" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <choice>
- *           <element ref="{urn:omds20}NATUERLICHE_PERSON"/>
- *           <element ref="{urn:omds20}SONSTIGE_PERSON"/>
- *         </choice>
- *         <element name="WirksamtkeitAb" type="{http://www.w3.org/2001/XMLSchema}date"/>
- *         <element name="Dateianhaenge" type="{urn:omds3CommonServiceTypes-1-1-0}Dateianhang_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ChangePersonDataRequest_Type", propOrder = {
-    "objektId",
-    "hinweistext",
-    "natuerlicheperson",
-    "sonstigeperson",
-    "wirksamtkeitAb",
-    "dateianhaenge"
-})
-public class ChangePersonDataRequestType
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "ObjektId", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-    protected ObjektIdType objektId;
-    @XmlElement(name = "Hinweistext")
-    protected String hinweistext;
-    @XmlElement(name = "NATUERLICHE_PERSON", namespace = "urn:omds20")
-    protected NATUERLICHEPERSONType natuerlicheperson;
-    @XmlElement(name = "SONSTIGE_PERSON", namespace = "urn:omds20")
-    protected SONSTIGEPERSONType sonstigeperson;
-    @XmlElement(name = "WirksamtkeitAb", required = true)
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar wirksamtkeitAb;
-    @XmlElement(name = "Dateianhaenge")
-    protected List dateianhaenge;
-
-    /**
-     * Personennr als ObjektId
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getObjektId() {
-        return objektId;
-    }
-
-    /**
-     * Legt den Wert der objektId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setObjektId(ObjektIdType value) {
-        this.objektId = value;
-    }
-
-    /**
-     * Ruft den Wert der hinweistext-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getHinweistext() {
-        return hinweistext;
-    }
-
-    /**
-     * Legt den Wert der hinweistext-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setHinweistext(String value) {
-        this.hinweistext = value;
-    }
-
-    /**
-     * Ruft den Wert der natuerlicheperson-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link NATUERLICHEPERSONType }
-     *     
-     */
-    public NATUERLICHEPERSONType getNATUERLICHEPERSON() {
-        return natuerlicheperson;
-    }
-
-    /**
-     * Legt den Wert der natuerlicheperson-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link NATUERLICHEPERSONType }
-     *     
-     */
-    public void setNATUERLICHEPERSON(NATUERLICHEPERSONType value) {
-        this.natuerlicheperson = value;
-    }
-
-    /**
-     * Ruft den Wert der sonstigeperson-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SONSTIGEPERSONType }
-     *     
-     */
-    public SONSTIGEPERSONType getSONSTIGEPERSON() {
-        return sonstigeperson;
-    }
-
-    /**
-     * Legt den Wert der sonstigeperson-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SONSTIGEPERSONType }
-     *     
-     */
-    public void setSONSTIGEPERSON(SONSTIGEPERSONType value) {
-        this.sonstigeperson = value;
-    }
-
-    /**
-     * Ruft den Wert der wirksamtkeitAb-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getWirksamtkeitAb() {
-        return wirksamtkeitAb;
-    }
-
-    /**
-     * Legt den Wert der wirksamtkeitAb-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setWirksamtkeitAb(XMLGregorianCalendar value) {
-        this.wirksamtkeitAb = value;
-    }
-
-    /**
-     * Gets the value of the dateianhaenge property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the dateianhaenge property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDateianhaenge().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link DateianhangType }
-     * 
-     * 
-     */
-    public List getDateianhaenge() {
-        if (dateianhaenge == null) {
-            dateianhaenge = new ArrayList();
-        }
-        return this.dateianhaenge;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangePersonDataResponseType.java b/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangePersonDataResponseType.java
deleted file mode 100644
index 73ceb5cc..00000000
--- a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ChangePersonDataResponseType.java
+++ /dev/null
@@ -1,198 +0,0 @@
-
-package on4partner._0._4.v1.omds3types.types.omds.vvo.at;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.PersonType;
-
-
-/**
- * Typ des Response für eine Änderung der allgemeinen Personendaten
- * 
- * 
Java-Klasse für ChangePersonDataResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ChangePersonDataResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence>
- *         <element name="Person" type="{urn:omds3CommonServiceTypes-1-1-0}Person_Type"/>
- *         <element name="BetroffeneObjekte" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="Art" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
- *                   <element ref="{urn:omds3CommonServiceTypes-1-1-0}ObjektId"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ChangePersonDataResponse_Type", propOrder = {
-    "person",
-    "betroffeneObjekte"
-})
-public class ChangePersonDataResponseType
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "Person", required = true)
-    protected PersonType person;
-    @XmlElement(name = "BetroffeneObjekte")
-    protected List betroffeneObjekte;
-
-    /**
-     * Ruft den Wert der person-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PersonType }
-     *     
-     */
-    public PersonType getPerson() {
-        return person;
-    }
-
-    /**
-     * Legt den Wert der person-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PersonType }
-     *     
-     */
-    public void setPerson(PersonType value) {
-        this.person = value;
-    }
-
-    /**
-     * Gets the value of the betroffeneObjekte property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the betroffeneObjekte property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getBetroffeneObjekte().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ChangePersonDataResponseType.BetroffeneObjekte }
-     * 
-     * 
-     */
-    public List getBetroffeneObjekte() {
-        if (betroffeneObjekte == null) {
-            betroffeneObjekte = new ArrayList();
-        }
-        return this.betroffeneObjekte;
-    }
-
-
-    /**
-     * 
Java-Klasse für anonymous complex type.
-     * 
-     * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="Art" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
-     *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}ObjektId"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "art",
-        "objektId"
-    })
-    public static class BetroffeneObjekte {
-
-        @XmlElement(name = "Art", required = true)
-        protected Object art;
-        @XmlElement(name = "ObjektId", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-        protected ObjektIdType objektId;
-
-        /**
-         * Ruft den Wert der art-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Object }
-         *     
-         */
-        public Object getArt() {
-            return art;
-        }
-
-        /**
-         * Legt den Wert der art-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Object }
-         *     
-         */
-        public void setArt(Object value) {
-            this.art = value;
-        }
-
-        /**
-         * Ruft den Wert der objektId-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link ObjektIdType }
-         *     
-         */
-        public ObjektIdType getObjektId() {
-            return objektId;
-        }
-
-        /**
-         * Legt den Wert der objektId-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link ObjektIdType }
-         *     
-         */
-        public void setObjektId(ObjektIdType value) {
-            this.objektId = value;
-        }
-
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/CheckAddressRequestType.java b/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/CheckAddressRequestType.java
deleted file mode 100644
index 655b6665..00000000
--- a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/CheckAddressRequestType.java
+++ /dev/null
@@ -1,68 +0,0 @@
-
-package on4partner._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds2Types.v2_14.ADRESSEType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-
-
-/**
- * Requesttyp um eine Adresse zu ueberprüfen
- * 
- * 
Java-Klasse für CheckAddressRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CheckAddressRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element name="Adresse" type="{urn:omds20}ADRESSE_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CheckAddressRequest_Type", propOrder = {
-    "adresse"
-})
-public class CheckAddressRequestType
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "Adresse", required = true)
-    protected ADRESSEType adresse;
-
-    /**
-     * Ruft den Wert der adresse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ADRESSEType }
-     *     
-     */
-    public ADRESSEType getAdresse() {
-        return adresse;
-    }
-
-    /**
-     * Legt den Wert der adresse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ADRESSEType }
-     *     
-     */
-    public void setAdresse(ADRESSEType value) {
-        this.adresse = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/CheckAddressResponseType.java b/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/CheckAddressResponseType.java
deleted file mode 100644
index 48a444d4..00000000
--- a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/CheckAddressResponseType.java
+++ /dev/null
@@ -1,103 +0,0 @@
-
-package on4partner._0._4.v1.omds3types.types.omds.vvo.at;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AdresseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-
-
-/**
- * Responsetyp der Überprüfung einer Adresse
- * 
- * 
Java-Klasse für CheckAddressResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CheckAddressResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence>
- *         <element name="Adresse" type="{urn:omds3CommonServiceTypes-1-1-0}Adresse_Type" minOccurs="0"/>
- *         <element name="AlternativeAdressen" type="{urn:omds3CommonServiceTypes-1-1-0}Adresse_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CheckAddressResponse_Type", propOrder = {
-    "adresse",
-    "alternativeAdressen"
-})
-public class CheckAddressResponseType
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "Adresse")
-    protected AdresseType adresse;
-    @XmlElement(name = "AlternativeAdressen")
-    protected List alternativeAdressen;
-
-    /**
-     * Ruft den Wert der adresse-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AdresseType }
-     *     
-     */
-    public AdresseType getAdresse() {
-        return adresse;
-    }
-
-    /**
-     * Legt den Wert der adresse-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AdresseType }
-     *     
-     */
-    public void setAdresse(AdresseType value) {
-        this.adresse = value;
-    }
-
-    /**
-     * Gets the value of the alternativeAdressen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the alternativeAdressen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getAlternativeAdressen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link AdresseType }
-     * 
-     * 
-     */
-    public List getAlternativeAdressen() {
-        if (alternativeAdressen == null) {
-            alternativeAdressen = new ArrayList();
-        }
-        return this.alternativeAdressen;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/DeleteCommunicationObjectRequestType.java b/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/DeleteCommunicationObjectRequestType.java
deleted file mode 100644
index 2c131169..00000000
--- a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/DeleteCommunicationObjectRequestType.java
+++ /dev/null
@@ -1,143 +0,0 @@
-
-package on4partner._0._4.v1.omds3types.types.omds.vvo.at;
-
-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.XmlElements;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-import at.vvo.omds.types.omds2Types.v2_14.ELKommunikationType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-
-
-/**
- * Typ des Requestobjekts für die Löschung einer Kommunikationsverbindung
- * 
- * 
Java-Klasse für DeleteCommunicationObjectRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="DeleteCommunicationObjectRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}ObjektId"/>
- *         <choice maxOccurs="unbounded">
- *           <element ref="{urn:omds3CommonServiceTypes-1-1-0}ObjektId"/>
- *           <element name="KommunikationsVerbindung" type="{urn:omds20}EL-Kommunikation_Type"/>
- *         </choice>
- *         <element name="WirksamtkeitAb" type="{http://www.w3.org/2001/XMLSchema}date"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DeleteCommunicationObjectRequest_Type", propOrder = {
-    "objektId",
-    "objektIdOrKommunikationsVerbindung",
-    "wirksamtkeitAb"
-})
-public class DeleteCommunicationObjectRequestType
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "ObjektId", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-    protected ObjektIdType objektId;
-    @XmlElements({
-        @XmlElement(name = "ObjektId", namespace = "urn:omds3CommonServiceTypes-1-1-0", type = ObjektIdType.class),
-        @XmlElement(name = "KommunikationsVerbindung", type = ELKommunikationType.class)
-    })
-    protected List objektIdOrKommunikationsVerbindung;
-    @XmlElement(name = "WirksamtkeitAb", required = true)
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar wirksamtkeitAb;
-
-    /**
-     * Die Personennr als ObjektId
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getObjektId() {
-        return objektId;
-    }
-
-    /**
-     * Legt den Wert der objektId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setObjektId(ObjektIdType value) {
-        this.objektId = value;
-    }
-
-    /**
-     * Gets the value of the objektIdOrKommunikationsVerbindung property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the objektIdOrKommunikationsVerbindung property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getObjektIdOrKommunikationsVerbindung().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ObjektIdType }
-     * {@link ELKommunikationType }
-     * 
-     * 
-     */
-    public List getObjektIdOrKommunikationsVerbindung() {
-        if (objektIdOrKommunikationsVerbindung == null) {
-            objektIdOrKommunikationsVerbindung = new ArrayList();
-        }
-        return this.objektIdOrKommunikationsVerbindung;
-    }
-
-    /**
-     * Ruft den Wert der wirksamtkeitAb-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getWirksamtkeitAb() {
-        return wirksamtkeitAb;
-    }
-
-    /**
-     * Legt den Wert der wirksamtkeitAb-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setWirksamtkeitAb(XMLGregorianCalendar value) {
-        this.wirksamtkeitAb = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/DeleteCommunicationObjectResponseType.java b/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/DeleteCommunicationObjectResponseType.java
deleted file mode 100644
index 3953860e..00000000
--- a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/DeleteCommunicationObjectResponseType.java
+++ /dev/null
@@ -1,68 +0,0 @@
-
-package on4partner._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.PersonType;
-
-
-/**
- * Typ des Response für eine Löschung einer Kommunikationsverbindung
- * 
- * 
Java-Klasse für DeleteCommunicationObjectResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="DeleteCommunicationObjectResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence>
- *         <element name="Person" type="{urn:omds3CommonServiceTypes-1-1-0}Person_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DeleteCommunicationObjectResponse_Type", propOrder = {
-    "person"
-})
-public class DeleteCommunicationObjectResponseType
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "Person")
-    protected PersonType person;
-
-    /**
-     * Ruft den Wert der person-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PersonType }
-     *     
-     */
-    public PersonType getPerson() {
-        return person;
-    }
-
-    /**
-     * Legt den Wert der person-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PersonType }
-     *     
-     */
-    public void setPerson(PersonType value) {
-        this.person = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/GetPartnerRequestType.java b/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/GetPartnerRequestType.java
deleted file mode 100644
index d3a8538a..00000000
--- a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/GetPartnerRequestType.java
+++ /dev/null
@@ -1,97 +0,0 @@
-
-package on4partner._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AgentFilterType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ObjektIdType;
-
-
-/**
- * Requesttyp um aktuelle Partnerdaten zu beziehen
- * 
- * 
Java-Klasse für GetPartnerRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GetPartnerRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element name="AuthFilter" type="{urn:omds3CommonServiceTypes-1-1-0}AgentFilter_Type" minOccurs="0"/>
- *         <element ref="{urn:omds3CommonServiceTypes-1-1-0}ObjektId"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GetPartnerRequest_Type", propOrder = {
-    "authFilter",
-    "objektId"
-})
-public class GetPartnerRequestType
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "AuthFilter")
-    protected AgentFilterType authFilter;
-    @XmlElement(name = "ObjektId", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
-    protected ObjektIdType objektId;
-
-    /**
-     * Ruft den Wert der authFilter-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AgentFilterType }
-     *     
-     */
-    public AgentFilterType getAuthFilter() {
-        return authFilter;
-    }
-
-    /**
-     * Legt den Wert der authFilter-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AgentFilterType }
-     *     
-     */
-    public void setAuthFilter(AgentFilterType value) {
-        this.authFilter = value;
-    }
-
-    /**
-     * Die Id der Person
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public ObjektIdType getObjektId() {
-        return objektId;
-    }
-
-    /**
-     * Legt den Wert der objektId-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObjektIdType }
-     *     
-     */
-    public void setObjektId(ObjektIdType value) {
-        this.objektId = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/GetPartnerResponseType.java b/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/GetPartnerResponseType.java
deleted file mode 100644
index 3e0fffc2..00000000
--- a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/GetPartnerResponseType.java
+++ /dev/null
@@ -1,68 +0,0 @@
-
-package on4partner._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.PersonType;
-
-
-/**
- * Responsetyp um aktuelle Partnerdaten zu beziehen
- * 
- * 
Java-Klasse für GetPartnerResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="GetPartnerResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence>
- *         <element name="Person" type="{urn:omds3CommonServiceTypes-1-1-0}Person_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GetPartnerResponse_Type", propOrder = {
-    "person"
-})
-public class GetPartnerResponseType
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "Person")
-    protected PersonType person;
-
-    /**
-     * Ruft den Wert der person-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PersonType }
-     *     
-     */
-    public PersonType getPerson() {
-        return person;
-    }
-
-    /**
-     * Legt den Wert der person-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PersonType }
-     *     
-     */
-    public void setPerson(PersonType value) {
-        this.person = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ObjectFactory.java
deleted file mode 100644
index 435837dc..00000000
--- a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/ObjectFactory.java
+++ /dev/null
@@ -1,322 +0,0 @@
-
-package on4partner._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-import at.vvo.omds.types.omds2Types.v2_14.ELKommunikationType;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the on4partner._0._4.v1.omds3types.types.omds.vvo.at package. 
- * 
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 _GetPartnerRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", "GetPartnerRequest");
-    private final static QName _GetPartnerResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", "GetPartnerResponse");
-    private final static QName _CheckAddressRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", "CheckAddressRequest");
-    private final static QName _CheckAddressResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", "CheckAddressResponse");
-    private final static QName _ChangePartnerMainAddressRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", "ChangePartnerMainAddressRequest");
-    private final static QName _ChangePartnerMainAddressResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", "ChangePartnerMainAddressResponse");
-    private final static QName _ChangePersonDataRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", "ChangePersonDataRequest");
-    private final static QName _ChangePersonDataResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", "ChangePersonDataResponse");
-    private final static QName _ChangeCommunicationObjectRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", "ChangeCommunicationObjectRequest");
-    private final static QName _AddCommunicationObjectRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", "AddCommunicationObjectRequest");
-    private final static QName _AddCommunicationObjectResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", "AddCommunicationObjectResponse");
-    private final static QName _DeleteCommunicationObjectRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", "DeleteCommunicationObjectRequest");
-    private final static QName _DeleteCommunicationObjectResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", "DeleteCommunicationObjectResponse");
-    private final static QName _ChangeCommunicationObjectRequestTypeBisherigeKommunikationsVerbindung_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", "BisherigeKommunikationsVerbindung");
-    private final static QName _ChangeCommunicationObjectRequestTypeGeaenderteKommunikationsVerbindung_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", "GeaenderteKommunikationsVerbindung");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: on4partner._0._4.v1.omds3types.types.omds.vvo.at
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link ChangePersonDataResponseType }
-     * 
-     */
-    public ChangePersonDataResponseType createChangePersonDataResponseType() {
-        return new ChangePersonDataResponseType();
-    }
-
-    /**
-     * Create an instance of {@link ChangePartnerMainAddressRequestType }
-     * 
-     */
-    public ChangePartnerMainAddressRequestType createChangePartnerMainAddressRequestType() {
-        return new ChangePartnerMainAddressRequestType();
-    }
-
-    /**
-     * Create an instance of {@link GetPartnerRequestType }
-     * 
-     */
-    public GetPartnerRequestType createGetPartnerRequestType() {
-        return new GetPartnerRequestType();
-    }
-
-    /**
-     * Create an instance of {@link GetPartnerResponseType }
-     * 
-     */
-    public GetPartnerResponseType createGetPartnerResponseType() {
-        return new GetPartnerResponseType();
-    }
-
-    /**
-     * Create an instance of {@link CheckAddressRequestType }
-     * 
-     */
-    public CheckAddressRequestType createCheckAddressRequestType() {
-        return new CheckAddressRequestType();
-    }
-
-    /**
-     * Create an instance of {@link CheckAddressResponseType }
-     * 
-     */
-    public CheckAddressResponseType createCheckAddressResponseType() {
-        return new CheckAddressResponseType();
-    }
-
-    /**
-     * Create an instance of {@link ChangePartnerMainAddressResponseType }
-     * 
-     */
-    public ChangePartnerMainAddressResponseType createChangePartnerMainAddressResponseType() {
-        return new ChangePartnerMainAddressResponseType();
-    }
-
-    /**
-     * Create an instance of {@link ChangePersonDataRequestType }
-     * 
-     */
-    public ChangePersonDataRequestType createChangePersonDataRequestType() {
-        return new ChangePersonDataRequestType();
-    }
-
-    /**
-     * Create an instance of {@link ChangeCommunicationObjectRequestType }
-     * 
-     */
-    public ChangeCommunicationObjectRequestType createChangeCommunicationObjectRequestType() {
-        return new ChangeCommunicationObjectRequestType();
-    }
-
-    /**
-     * Create an instance of {@link ChangeCommunicationObjectResponse }
-     * 
-     */
-    public ChangeCommunicationObjectResponse createChangeCommunicationObjectResponse() {
-        return new ChangeCommunicationObjectResponse();
-    }
-
-    /**
-     * Create an instance of {@link ChangeCommunicationObjectResponseType }
-     * 
-     */
-    public ChangeCommunicationObjectResponseType createChangeCommunicationObjectResponseType() {
-        return new ChangeCommunicationObjectResponseType();
-    }
-
-    /**
-     * Create an instance of {@link AddCommunicationObjectRequestType }
-     * 
-     */
-    public AddCommunicationObjectRequestType createAddCommunicationObjectRequestType() {
-        return new AddCommunicationObjectRequestType();
-    }
-
-    /**
-     * Create an instance of {@link AddCommunicationObjectResponseType }
-     * 
-     */
-    public AddCommunicationObjectResponseType createAddCommunicationObjectResponseType() {
-        return new AddCommunicationObjectResponseType();
-    }
-
-    /**
-     * Create an instance of {@link DeleteCommunicationObjectRequestType }
-     * 
-     */
-    public DeleteCommunicationObjectRequestType createDeleteCommunicationObjectRequestType() {
-        return new DeleteCommunicationObjectRequestType();
-    }
-
-    /**
-     * Create an instance of {@link DeleteCommunicationObjectResponseType }
-     * 
-     */
-    public DeleteCommunicationObjectResponseType createDeleteCommunicationObjectResponseType() {
-        return new DeleteCommunicationObjectResponseType();
-    }
-
-    /**
-     * Create an instance of {@link ChangePersonDataResponseType.BetroffeneObjekte }
-     * 
-     */
-    public ChangePersonDataResponseType.BetroffeneObjekte createChangePersonDataResponseTypeBetroffeneObjekte() {
-        return new ChangePersonDataResponseType.BetroffeneObjekte();
-    }
-
-    /**
-     * Create an instance of {@link ChangePartnerMainAddressRequestType.UeberschreibeZustelladresseInVertraegen }
-     * 
-     */
-    public ChangePartnerMainAddressRequestType.UeberschreibeZustelladresseInVertraegen createChangePartnerMainAddressRequestTypeUeberschreibeZustelladresseInVertraegen() {
-        return new ChangePartnerMainAddressRequestType.UeberschreibeZustelladresseInVertraegen();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetPartnerRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", name = "GetPartnerRequest")
-    public JAXBElement createGetPartnerRequest(GetPartnerRequestType value) {
-        return new JAXBElement(_GetPartnerRequest_QNAME, GetPartnerRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GetPartnerResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", name = "GetPartnerResponse")
-    public JAXBElement createGetPartnerResponse(GetPartnerResponseType value) {
-        return new JAXBElement(_GetPartnerResponse_QNAME, GetPartnerResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CheckAddressRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", name = "CheckAddressRequest")
-    public JAXBElement createCheckAddressRequest(CheckAddressRequestType value) {
-        return new JAXBElement(_CheckAddressRequest_QNAME, CheckAddressRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CheckAddressResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", name = "CheckAddressResponse")
-    public JAXBElement createCheckAddressResponse(CheckAddressResponseType value) {
-        return new JAXBElement(_CheckAddressResponse_QNAME, CheckAddressResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ChangePartnerMainAddressRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", name = "ChangePartnerMainAddressRequest")
-    public JAXBElement createChangePartnerMainAddressRequest(ChangePartnerMainAddressRequestType value) {
-        return new JAXBElement(_ChangePartnerMainAddressRequest_QNAME, ChangePartnerMainAddressRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ChangePartnerMainAddressResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", name = "ChangePartnerMainAddressResponse")
-    public JAXBElement createChangePartnerMainAddressResponse(ChangePartnerMainAddressResponseType value) {
-        return new JAXBElement(_ChangePartnerMainAddressResponse_QNAME, ChangePartnerMainAddressResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ChangePersonDataRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", name = "ChangePersonDataRequest")
-    public JAXBElement createChangePersonDataRequest(ChangePersonDataRequestType value) {
-        return new JAXBElement(_ChangePersonDataRequest_QNAME, ChangePersonDataRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ChangePersonDataResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", name = "ChangePersonDataResponse")
-    public JAXBElement createChangePersonDataResponse(ChangePersonDataResponseType value) {
-        return new JAXBElement(_ChangePersonDataResponse_QNAME, ChangePersonDataResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ChangeCommunicationObjectRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", name = "ChangeCommunicationObjectRequest")
-    public JAXBElement createChangeCommunicationObjectRequest(ChangeCommunicationObjectRequestType value) {
-        return new JAXBElement(_ChangeCommunicationObjectRequest_QNAME, ChangeCommunicationObjectRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AddCommunicationObjectRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", name = "AddCommunicationObjectRequest")
-    public JAXBElement createAddCommunicationObjectRequest(AddCommunicationObjectRequestType value) {
-        return new JAXBElement(_AddCommunicationObjectRequest_QNAME, AddCommunicationObjectRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AddCommunicationObjectResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", name = "AddCommunicationObjectResponse")
-    public JAXBElement createAddCommunicationObjectResponse(AddCommunicationObjectResponseType value) {
-        return new JAXBElement(_AddCommunicationObjectResponse_QNAME, AddCommunicationObjectResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeleteCommunicationObjectRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", name = "DeleteCommunicationObjectRequest")
-    public JAXBElement createDeleteCommunicationObjectRequest(DeleteCommunicationObjectRequestType value) {
-        return new JAXBElement(_DeleteCommunicationObjectRequest_QNAME, DeleteCommunicationObjectRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeleteCommunicationObjectResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", name = "DeleteCommunicationObjectResponse")
-    public JAXBElement createDeleteCommunicationObjectResponse(DeleteCommunicationObjectResponseType value) {
-        return new JAXBElement(_DeleteCommunicationObjectResponse_QNAME, DeleteCommunicationObjectResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELKommunikationType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", name = "BisherigeKommunikationsVerbindung", scope = ChangeCommunicationObjectRequestType.class)
-    public JAXBElement createChangeCommunicationObjectRequestTypeBisherigeKommunikationsVerbindung(ELKommunikationType value) {
-        return new JAXBElement(_ChangeCommunicationObjectRequestTypeBisherigeKommunikationsVerbindung_QNAME, ELKommunikationType.class, ChangeCommunicationObjectRequestType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ELKommunikationType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", name = "GeaenderteKommunikationsVerbindung", scope = ChangeCommunicationObjectRequestType.class)
-    public JAXBElement createChangeCommunicationObjectRequestTypeGeaenderteKommunikationsVerbindung(ELKommunikationType value) {
-        return new JAXBElement(_ChangeCommunicationObjectRequestTypeGeaenderteKommunikationsVerbindung_QNAME, ELKommunikationType.class, ChangeCommunicationObjectRequestType.class, value);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/package-info.java b/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/package-info.java
deleted file mode 100644
index 8bde2275..00000000
--- a/OMDSServiceDefinition/src/main/java/on4partner/_0/_4/v1/omds3types/types/omds/vvo/at/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package on4partner._0._4.v1.omds3types.types.omds.vvo.at;
diff --git a/OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/FinderRequestType.java b/OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/FinderRequestType.java
deleted file mode 100644
index f7b21b36..00000000
--- a/OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/FinderRequestType.java
+++ /dev/null
@@ -1,103 +0,0 @@
-
-package produktfinder.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.AuthorizationFilter;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonRequestType;
-
-
-/**
- * Basistyp des Requestobjekts
- * 
- * 
Java-Klasse für FinderRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="FinderRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element name="AuthFilter" type="{urn:omds3CommonServiceTypes-1-1-0}AuthorizationFilter" minOccurs="0"/>
- *         <element name="Versicherungsbeginn" type="{http://www.w3.org/2001/XMLSchema}date"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FinderRequest_Type", propOrder = {
-    "authFilter",
-    "versicherungsbeginn"
-})
-@XmlSeeAlso({
-    VerkaufsproduktFinderRequestType.class
-})
-public class FinderRequestType
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "AuthFilter")
-    protected AuthorizationFilter authFilter;
-    @XmlElement(name = "Versicherungsbeginn", required = true)
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar versicherungsbeginn;
-
-    /**
-     * Ruft den Wert der authFilter-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public AuthorizationFilter getAuthFilter() {
-        return authFilter;
-    }
-
-    /**
-     * Legt den Wert der authFilter-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthorizationFilter }
-     *     
-     */
-    public void setAuthFilter(AuthorizationFilter value) {
-        this.authFilter = value;
-    }
-
-    /**
-     * Ruft den Wert der versicherungsbeginn-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getVersicherungsbeginn() {
-        return versicherungsbeginn;
-    }
-
-    /**
-     * Legt den Wert der versicherungsbeginn-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setVersicherungsbeginn(XMLGregorianCalendar value) {
-        this.versicherungsbeginn = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/FinderResponseType.java b/OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/FinderResponseType.java
deleted file mode 100644
index 179f3951..00000000
--- a/OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/FinderResponseType.java
+++ /dev/null
@@ -1,39 +0,0 @@
-
-package produktfinder.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.CommonResponseType;
-
-
-/**
- * Basistyp des Responseobjekts
- * 
- * 
Java-Klasse für FinderResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="FinderResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FinderResponse_Type")
-@XmlSeeAlso({
-    VerkaufsproduktFinderResponseType.class
-})
-public class FinderResponseType
-    extends CommonResponseType
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/ObjectFactory.java
deleted file mode 100644
index 641595aa..00000000
--- a/OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/ObjectFactory.java
+++ /dev/null
@@ -1,103 +0,0 @@
-
-package produktfinder.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
-
-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 produktfinder.on2antrag._0._6.v1.omds3types.types.omds.vvo.at package. 
- * 
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 _VerkaufsproduktfinderRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.produktfinder", "VerkaufsproduktfinderRequest");
-    private final static QName _VerkaufsproduktfinderResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.produktfinder", "VerkaufsproduktfinderResponse");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: produktfinder.on2antrag._0._6.v1.omds3types.types.omds.vvo.at
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link VerkaufsproduktFinderResponseType }
-     * 
-     */
-    public VerkaufsproduktFinderResponseType createVerkaufsproduktFinderResponseType() {
-        return new VerkaufsproduktFinderResponseType();
-    }
-
-    /**
-     * Create an instance of {@link VerkaufsproduktFinderRequestType }
-     * 
-     */
-    public VerkaufsproduktFinderRequestType createVerkaufsproduktFinderRequestType() {
-        return new VerkaufsproduktFinderRequestType();
-    }
-
-    /**
-     * Create an instance of {@link FinderRequestType }
-     * 
-     */
-    public FinderRequestType createFinderRequestType() {
-        return new FinderRequestType();
-    }
-
-    /**
-     * Create an instance of {@link FinderResponseType }
-     * 
-     */
-    public FinderResponseType createFinderResponseType() {
-        return new FinderResponseType();
-    }
-
-    /**
-     * Create an instance of {@link ProduktFinderResponseType }
-     * 
-     */
-    public ProduktFinderResponseType createProduktFinderResponseType() {
-        return new ProduktFinderResponseType();
-    }
-
-    /**
-     * Create an instance of {@link VerkaufsproduktFinderResponseType.Verkaufsprodukte }
-     * 
-     */
-    public VerkaufsproduktFinderResponseType.Verkaufsprodukte createVerkaufsproduktFinderResponseTypeVerkaufsprodukte() {
-        return new VerkaufsproduktFinderResponseType.Verkaufsprodukte();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link VerkaufsproduktFinderRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.produktfinder", name = "VerkaufsproduktfinderRequest")
-    public JAXBElement createVerkaufsproduktfinderRequest(VerkaufsproduktFinderRequestType value) {
-        return new JAXBElement(_VerkaufsproduktfinderRequest_QNAME, VerkaufsproduktFinderRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link VerkaufsproduktFinderResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.produktfinder", name = "VerkaufsproduktfinderResponse")
-    public JAXBElement createVerkaufsproduktfinderResponse(VerkaufsproduktFinderResponseType value) {
-        return new JAXBElement(_VerkaufsproduktfinderResponse_QNAME, VerkaufsproduktFinderResponseType.class, null, value);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/ProduktFinderResponseType.java b/OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/ProduktFinderResponseType.java
deleted file mode 100644
index 357fadd6..00000000
--- a/OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/ProduktFinderResponseType.java
+++ /dev/null
@@ -1,211 +0,0 @@
-
-package produktfinder.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
-
-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;
-
-
-/**
- * Informationen zu einem Produkt
- * 
- * 
Java-Klasse für ProduktFinderResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProduktFinderResponse_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Bezeichnung" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Produktgeneration" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Bedingungen" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="VerkaufsoffenVon" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
- *         <element name="VerkaufsoffenBis" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProduktFinderResponse_Type", propOrder = {
-    "id",
-    "bezeichnung",
-    "produktgeneration",
-    "bedingungen",
-    "verkaufsoffenVon",
-    "verkaufsoffenBis"
-})
-public class ProduktFinderResponseType {
-
-    @XmlElement(name = "Id")
-    protected String id;
-    @XmlElement(name = "Bezeichnung")
-    protected String bezeichnung;
-    @XmlElement(name = "Produktgeneration")
-    protected String produktgeneration;
-    @XmlElement(name = "Bedingungen")
-    protected List bedingungen;
-    @XmlElement(name = "VerkaufsoffenVon", required = true)
-    protected Object verkaufsoffenVon;
-    @XmlElement(name = "VerkaufsoffenBis")
-    protected Object verkaufsoffenBis;
-
-    /**
-     * Ruft den Wert der id-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Legt den Wert der id-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    /**
-     * Ruft den Wert der bezeichnung-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBezeichnung() {
-        return bezeichnung;
-    }
-
-    /**
-     * Legt den Wert der bezeichnung-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBezeichnung(String value) {
-        this.bezeichnung = value;
-    }
-
-    /**
-     * Ruft den Wert der produktgeneration-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getProduktgeneration() {
-        return produktgeneration;
-    }
-
-    /**
-     * Legt den Wert der produktgeneration-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setProduktgeneration(String value) {
-        this.produktgeneration = value;
-    }
-
-    /**
-     * Gets the value of the bedingungen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the bedingungen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getBedingungen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List getBedingungen() {
-        if (bedingungen == null) {
-            bedingungen = new ArrayList();
-        }
-        return this.bedingungen;
-    }
-
-    /**
-     * Ruft den Wert der verkaufsoffenVon-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Object }
-     *     
-     */
-    public Object getVerkaufsoffenVon() {
-        return verkaufsoffenVon;
-    }
-
-    /**
-     * Legt den Wert der verkaufsoffenVon-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     
-     */
-    public void setVerkaufsoffenVon(Object value) {
-        this.verkaufsoffenVon = value;
-    }
-
-    /**
-     * Ruft den Wert der verkaufsoffenBis-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Object }
-     *     
-     */
-    public Object getVerkaufsoffenBis() {
-        return verkaufsoffenBis;
-    }
-
-    /**
-     * Legt den Wert der verkaufsoffenBis-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     
-     */
-    public void setVerkaufsoffenBis(Object value) {
-        this.verkaufsoffenBis = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/VerkaufsproduktFinderRequestType.java b/OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/VerkaufsproduktFinderRequestType.java
deleted file mode 100644
index 218afc27..00000000
--- a/OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/VerkaufsproduktFinderRequestType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-
-package produktfinder.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Typ des Requestobjekts für den Verkaufsproduktfinder
- * 
- * 
Java-Klasse für VerkaufsproduktFinderRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VerkaufsproduktFinderRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.produktfinder}FinderRequest_Type">
- *       <sequence>
- *         <element name="Sparte" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VerkaufsproduktFinderRequest_Type", propOrder = {
-    "sparte"
-})
-public class VerkaufsproduktFinderRequestType
-    extends FinderRequestType
-{
-
-    @XmlElement(name = "Sparte", required = true)
-    protected String sparte;
-
-    /**
-     * Ruft den Wert der sparte-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSparte() {
-        return sparte;
-    }
-
-    /**
-     * Legt den Wert der sparte-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSparte(String value) {
-        this.sparte = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/VerkaufsproduktFinderResponseType.java b/OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/VerkaufsproduktFinderResponseType.java
deleted file mode 100644
index 6e237536..00000000
--- a/OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/VerkaufsproduktFinderResponseType.java
+++ /dev/null
@@ -1,350 +0,0 @@
-
-package produktfinder.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
-
-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;
-
-
-/**
- * Typ des Responseobjekts für den Verkaufsproduktfinder
- * 
- * 
Java-Klasse für VerkaufsproduktFinderResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VerkaufsproduktFinderResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.produktfinder}FinderResponse_Type">
- *       <sequence>
- *         <element name="Sparte" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Verkaufsprodukte" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="Id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *                   <element name="Bezeichnung" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *                   <element name="Verkaufsproduktgeneration" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *                   <element name="Bedingungen" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *                   <element name="VerkaufsoffenVon" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
- *                   <element name="VerkaufsoffenBis" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/>
- *                   <element name="Produkte" type="{urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.produktfinder}ProduktFinderResponse_Type" maxOccurs="unbounded" minOccurs="0"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VerkaufsproduktFinderResponse_Type", propOrder = {
-    "sparte",
-    "verkaufsprodukte"
-})
-public class VerkaufsproduktFinderResponseType
-    extends FinderResponseType
-{
-
-    @XmlElement(name = "Sparte", required = true)
-    protected String sparte;
-    @XmlElement(name = "Verkaufsprodukte")
-    protected List verkaufsprodukte;
-
-    /**
-     * Ruft den Wert der sparte-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSparte() {
-        return sparte;
-    }
-
-    /**
-     * Legt den Wert der sparte-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSparte(String value) {
-        this.sparte = value;
-    }
-
-    /**
-     * Gets the value of the verkaufsprodukte property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the verkaufsprodukte property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVerkaufsprodukte().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link VerkaufsproduktFinderResponseType.Verkaufsprodukte }
-     * 
-     * 
-     */
-    public List getVerkaufsprodukte() {
-        if (verkaufsprodukte == null) {
-            verkaufsprodukte = new ArrayList();
-        }
-        return this.verkaufsprodukte;
-    }
-
-
-    /**
-     * 
Java-Klasse für anonymous complex type.
-     * 
-     * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="Id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-     *         <element name="Bezeichnung" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-     *         <element name="Verkaufsproduktgeneration" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-     *         <element name="Bedingungen" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
-     *         <element name="VerkaufsoffenVon" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
-     *         <element name="VerkaufsoffenBis" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/>
-     *         <element name="Produkte" type="{urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.produktfinder}ProduktFinderResponse_Type" maxOccurs="unbounded" minOccurs="0"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "id",
-        "bezeichnung",
-        "verkaufsproduktgeneration",
-        "bedingungen",
-        "verkaufsoffenVon",
-        "verkaufsoffenBis",
-        "produkte"
-    })
-    public static class Verkaufsprodukte {
-
-        @XmlElement(name = "Id")
-        protected String id;
-        @XmlElement(name = "Bezeichnung")
-        protected String bezeichnung;
-        @XmlElement(name = "Verkaufsproduktgeneration")
-        protected String verkaufsproduktgeneration;
-        @XmlElement(name = "Bedingungen")
-        protected List bedingungen;
-        @XmlElement(name = "VerkaufsoffenVon", required = true)
-        protected Object verkaufsoffenVon;
-        @XmlElement(name = "VerkaufsoffenBis")
-        protected Object verkaufsoffenBis;
-        @XmlElement(name = "Produkte")
-        protected List produkte;
-
-        /**
-         * Ruft den Wert der id-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getId() {
-            return id;
-        }
-
-        /**
-         * Legt den Wert der id-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setId(String value) {
-            this.id = value;
-        }
-
-        /**
-         * Ruft den Wert der bezeichnung-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getBezeichnung() {
-            return bezeichnung;
-        }
-
-        /**
-         * Legt den Wert der bezeichnung-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setBezeichnung(String value) {
-            this.bezeichnung = value;
-        }
-
-        /**
-         * Ruft den Wert der verkaufsproduktgeneration-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getVerkaufsproduktgeneration() {
-            return verkaufsproduktgeneration;
-        }
-
-        /**
-         * Legt den Wert der verkaufsproduktgeneration-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setVerkaufsproduktgeneration(String value) {
-            this.verkaufsproduktgeneration = value;
-        }
-
-        /**
-         * Gets the value of the bedingungen property.
-         * 
-         * 

-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a set method for the bedingungen property.
-         * 
-         * 

-         * For example, to add a new item, do as follows:
-         * 
-         *    getBedingungen().add(newItem);
-         * 

-         * 
-         * 
-         * 

-         * Objects of the following type(s) are allowed in the list
-         * {@link String }
-         * 
-         * 
-         */
-        public List getBedingungen() {
-            if (bedingungen == null) {
-                bedingungen = new ArrayList();
-            }
-            return this.bedingungen;
-        }
-
-        /**
-         * Ruft den Wert der verkaufsoffenVon-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Object }
-         *     
-         */
-        public Object getVerkaufsoffenVon() {
-            return verkaufsoffenVon;
-        }
-
-        /**
-         * Legt den Wert der verkaufsoffenVon-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Object }
-         *     
-         */
-        public void setVerkaufsoffenVon(Object value) {
-            this.verkaufsoffenVon = value;
-        }
-
-        /**
-         * Ruft den Wert der verkaufsoffenBis-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Object }
-         *     
-         */
-        public Object getVerkaufsoffenBis() {
-            return verkaufsoffenBis;
-        }
-
-        /**
-         * Legt den Wert der verkaufsoffenBis-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Object }
-         *     
-         */
-        public void setVerkaufsoffenBis(Object value) {
-            this.verkaufsoffenBis = value;
-        }
-
-        /**
-         * Gets the value of the produkte property.
-         * 
-         * 

-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a set method for the produkte property.
-         * 
-         * 

-         * For example, to add a new item, do as follows:
-         * 
-         *    getProdukte().add(newItem);
-         * 

-         * 
-         * 
-         * 

-         * Objects of the following type(s) are allowed in the list
-         * {@link ProduktFinderResponseType }
-         * 
-         * 
-         */
-        public List getProdukte() {
-            if (produkte == null) {
-                produkte = new ArrayList();
-            }
-            return this.produkte;
-        }
-
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/package-info.java b/OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/package-info.java
deleted file mode 100644
index 4aca1469..00000000
--- a/OMDSServiceDefinition/src/main/java/produktfinder/on2antrag/_0/_6/v1/omds3types/types/omds/vvo/at/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.produktfinder", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package produktfinder.on2antrag._0._6.v1.omds3types.types.omds.vvo.at;
diff --git a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CalculateRechtsschutzRequest.java b/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CalculateRechtsschutzRequest.java
deleted file mode 100644
index ddd505ce..00000000
--- a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CalculateRechtsschutzRequest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CalculateRequestGenType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CalculateRequestGen_Type">
- *       <sequence>
- *         <element name="Berechnungsanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs}SpezBerechnungRechtsschutz_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "berechnungsanfrage"
-})
-@XmlRootElement(name = "CalculateRechtsschutzRequest")
-public class CalculateRechtsschutzRequest
-    extends CalculateRequestGenType
-{
-
-    @XmlElement(name = "Berechnungsanfrage", required = true)
-    protected SpezBerechnungRechtsschutzType berechnungsanfrage;
-
-    /**
-     * Ruft den Wert der berechnungsanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezBerechnungRechtsschutzType }
-     *     
-     */
-    public SpezBerechnungRechtsschutzType getBerechnungsanfrage() {
-        return berechnungsanfrage;
-    }
-
-    /**
-     * Legt den Wert der berechnungsanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezBerechnungRechtsschutzType }
-     *     
-     */
-    public void setBerechnungsanfrage(SpezBerechnungRechtsschutzType value) {
-        this.berechnungsanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CalculateRechtsschutzResponse.java b/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CalculateRechtsschutzResponse.java
deleted file mode 100644
index 60f0dc91..00000000
--- a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CalculateRechtsschutzResponse.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CalculateResponseGenType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CalculateResponseGen_Type">
- *       <sequence>
- *         <element name="Berechnungsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs}SpezBerechnungRechtsschutz_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "berechnungsantwort"
-})
-@XmlRootElement(name = "CalculateRechtsschutzResponse")
-public class CalculateRechtsschutzResponse
-    extends CalculateResponseGenType
-{
-
-    @XmlElement(name = "Berechnungsantwort", required = true)
-    protected SpezBerechnungRechtsschutzType berechnungsantwort;
-
-    /**
-     * Ruft den Wert der berechnungsantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezBerechnungRechtsschutzType }
-     *     
-     */
-    public SpezBerechnungRechtsschutzType getBerechnungsantwort() {
-        return berechnungsantwort;
-    }
-
-    /**
-     * Legt den Wert der berechnungsantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezBerechnungRechtsschutzType }
-     *     
-     */
-    public void setBerechnungsantwort(SpezBerechnungRechtsschutzType value) {
-        this.berechnungsantwort = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateApplicationRechtsschutzRequest.java b/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateApplicationRechtsschutzRequest.java
deleted file mode 100644
index 70a1854a..00000000
--- a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateApplicationRechtsschutzRequest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateApplicationRequestGenType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateApplicationRequestGen_Type">
- *       <sequence>
- *         <element name="Antragsanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs}SpezAntragRechtsschutz_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "antragsanfrage"
-})
-@XmlRootElement(name = "CreateApplicationRechtsschutzRequest")
-public class CreateApplicationRechtsschutzRequest
-    extends CreateApplicationRequestGenType
-{
-
-    @XmlElement(name = "Antragsanfrage", required = true)
-    protected SpezAntragRechtsschutzType antragsanfrage;
-
-    /**
-     * Ruft den Wert der antragsanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezAntragRechtsschutzType }
-     *     
-     */
-    public SpezAntragRechtsschutzType getAntragsanfrage() {
-        return antragsanfrage;
-    }
-
-    /**
-     * Legt den Wert der antragsanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezAntragRechtsschutzType }
-     *     
-     */
-    public void setAntragsanfrage(SpezAntragRechtsschutzType value) {
-        this.antragsanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateApplicationRechtsschutzResponse.java b/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateApplicationRechtsschutzResponse.java
deleted file mode 100644
index cd4957c1..00000000
--- a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateApplicationRechtsschutzResponse.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateApplicationResponseGenType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateApplicationResponseGen_Type">
- *       <sequence>
- *         <element name="Antragsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs}SpezAntragRechtsschutz_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "antragsantwort"
-})
-@XmlRootElement(name = "CreateApplicationRechtsschutzResponse")
-public class CreateApplicationRechtsschutzResponse
-    extends CreateApplicationResponseGenType
-{
-
-    @XmlElement(name = "Antragsantwort", required = true)
-    protected SpezAntragRechtsschutzType antragsantwort;
-
-    /**
-     * Ruft den Wert der antragsantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezAntragRechtsschutzType }
-     *     
-     */
-    public SpezAntragRechtsschutzType getAntragsantwort() {
-        return antragsantwort;
-    }
-
-    /**
-     * Legt den Wert der antragsantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezAntragRechtsschutzType }
-     *     
-     */
-    public void setAntragsantwort(SpezAntragRechtsschutzType value) {
-        this.antragsantwort = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateOfferRechtsschutzRequest.java b/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateOfferRechtsschutzRequest.java
deleted file mode 100644
index 68dfcb10..00000000
--- a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateOfferRechtsschutzRequest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateOfferRequestGenType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateOfferRequestGen_Type">
- *       <sequence>
- *         <element name="Offertanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs}SpezOffertRechtsschutz_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "offertanfrage"
-})
-@XmlRootElement(name = "CreateOfferRechtsschutzRequest")
-public class CreateOfferRechtsschutzRequest
-    extends CreateOfferRequestGenType
-{
-
-    @XmlElement(name = "Offertanfrage", required = true)
-    protected SpezOffertRechtsschutzType offertanfrage;
-
-    /**
-     * Ruft den Wert der offertanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezOffertRechtsschutzType }
-     *     
-     */
-    public SpezOffertRechtsschutzType getOffertanfrage() {
-        return offertanfrage;
-    }
-
-    /**
-     * Legt den Wert der offertanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezOffertRechtsschutzType }
-     *     
-     */
-    public void setOffertanfrage(SpezOffertRechtsschutzType value) {
-        this.offertanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateOfferRechtsschutzResponse.java b/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateOfferRechtsschutzResponse.java
deleted file mode 100644
index 53a92204..00000000
--- a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateOfferRechtsschutzResponse.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateOfferResponseGenType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateOfferResponseGen_Type">
- *       <sequence>
- *         <element name="Offertantwort" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs}SpezOffertRechtsschutz_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "offertantwort"
-})
-@XmlRootElement(name = "CreateOfferRechtsschutzResponse")
-public class CreateOfferRechtsschutzResponse
-    extends CreateOfferResponseGenType
-{
-
-    @XmlElement(name = "Offertantwort", required = true)
-    protected SpezOffertRechtsschutzType offertantwort;
-
-    /**
-     * Ruft den Wert der offertantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezOffertRechtsschutzType }
-     *     
-     */
-    public SpezOffertRechtsschutzType getOffertantwort() {
-        return offertantwort;
-    }
-
-    /**
-     * Legt den Wert der offertantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezOffertRechtsschutzType }
-     *     
-     */
-    public void setOffertantwort(SpezOffertRechtsschutzType value) {
-        this.offertantwort = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/ElementarproduktRechtsschutzType.java b/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/ElementarproduktRechtsschutzType.java
deleted file mode 100644
index 4c57c41c..00000000
--- a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/ElementarproduktRechtsschutzType.java
+++ /dev/null
@@ -1,76 +0,0 @@
-
-package rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-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 at.vvo.omds.types.omds3Types.r1_7_0.common.ElementarproduktGenerischType;
-
-
-/**
- * Typ für ein Elementarprodukt in der Sparte Rechtsschutz. Von diesem Typ werden etwaige Standard-Deckungen abgeleitet, siehe Vertragsrechtsschutz_Type. Von diesem Typ können einzelne VUs aber auch ihre eigenen Elementarprodukte ableiten, wenn sie möchten.
- * 
- * 
Java-Klasse für ElementarproduktRechtsschutz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ElementarproduktRechtsschutz_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ElementarproduktGenerisch_Type">
- *       <sequence>
- *         <element name="VersInteressenRefLfNr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ElementarproduktRechtsschutz_Type", propOrder = {
-    "versInteressenRefLfNr"
-})
-public class ElementarproduktRechtsschutzType
-    extends ElementarproduktGenerischType
-{
-
-    @XmlElement(name = "VersInteressenRefLfNr", type = Integer.class)
-    @XmlSchemaType(name = "unsignedShort")
-    protected List versInteressenRefLfNr;
-
-    /**
-     * Gets the value of the versInteressenRefLfNr property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the versInteressenRefLfNr property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVersInteressenRefLfNr().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link Integer }
-     * 
-     * 
-     */
-    public List getVersInteressenRefLfNr() {
-        if (versInteressenRefLfNr == null) {
-            versInteressenRefLfNr = new ArrayList();
-        }
-        return this.versInteressenRefLfNr;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/ObjectFactory.java
deleted file mode 100644
index 7e751e94..00000000
--- a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/ObjectFactory.java
+++ /dev/null
@@ -1,144 +0,0 @@
-
-package rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at package. 
- * 
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 {
-
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link CalculateRechtsschutzRequest }
-     * 
-     */
-    public CalculateRechtsschutzRequest createCalculateRechtsschutzRequest() {
-        return new CalculateRechtsschutzRequest();
-    }
-
-    /**
-     * Create an instance of {@link SpezBerechnungRechtsschutzType }
-     * 
-     */
-    public SpezBerechnungRechtsschutzType createSpezBerechnungRechtsschutzType() {
-        return new SpezBerechnungRechtsschutzType();
-    }
-
-    /**
-     * Create an instance of {@link CalculateRechtsschutzResponse }
-     * 
-     */
-    public CalculateRechtsschutzResponse createCalculateRechtsschutzResponse() {
-        return new CalculateRechtsschutzResponse();
-    }
-
-    /**
-     * Create an instance of {@link CreateOfferRechtsschutzRequest }
-     * 
-     */
-    public CreateOfferRechtsschutzRequest createCreateOfferRechtsschutzRequest() {
-        return new CreateOfferRechtsschutzRequest();
-    }
-
-    /**
-     * Create an instance of {@link SpezOffertRechtsschutzType }
-     * 
-     */
-    public SpezOffertRechtsschutzType createSpezOffertRechtsschutzType() {
-        return new SpezOffertRechtsschutzType();
-    }
-
-    /**
-     * Create an instance of {@link CreateOfferRechtsschutzResponse }
-     * 
-     */
-    public CreateOfferRechtsschutzResponse createCreateOfferRechtsschutzResponse() {
-        return new CreateOfferRechtsschutzResponse();
-    }
-
-    /**
-     * Create an instance of {@link CreateApplicationRechtsschutzRequest }
-     * 
-     */
-    public CreateApplicationRechtsschutzRequest createCreateApplicationRechtsschutzRequest() {
-        return new CreateApplicationRechtsschutzRequest();
-    }
-
-    /**
-     * Create an instance of {@link SpezAntragRechtsschutzType }
-     * 
-     */
-    public SpezAntragRechtsschutzType createSpezAntragRechtsschutzType() {
-        return new SpezAntragRechtsschutzType();
-    }
-
-    /**
-     * Create an instance of {@link CreateApplicationRechtsschutzResponse }
-     * 
-     */
-    public CreateApplicationRechtsschutzResponse createCreateApplicationRechtsschutzResponse() {
-        return new CreateApplicationRechtsschutzResponse();
-    }
-
-    /**
-     * Create an instance of {@link SubmitApplicationRechtsschutzRequest }
-     * 
-     */
-    public SubmitApplicationRechtsschutzRequest createSubmitApplicationRechtsschutzRequest() {
-        return new SubmitApplicationRechtsschutzRequest();
-    }
-
-    /**
-     * Create an instance of {@link SubmitApplicationRechtsschutzResponse }
-     * 
-     */
-    public SubmitApplicationRechtsschutzResponse createSubmitApplicationRechtsschutzResponse() {
-        return new SubmitApplicationRechtsschutzResponse();
-    }
-
-    /**
-     * Create an instance of {@link VerkaufsproduktRechtsschutzType }
-     * 
-     */
-    public VerkaufsproduktRechtsschutzType createVerkaufsproduktRechtsschutzType() {
-        return new VerkaufsproduktRechtsschutzType();
-    }
-
-    /**
-     * Create an instance of {@link ProduktRechtsschutzType }
-     * 
-     */
-    public ProduktRechtsschutzType createProduktRechtsschutzType() {
-        return new ProduktRechtsschutzType();
-    }
-
-    /**
-     * Create an instance of {@link ElementarproduktRechtsschutzType }
-     * 
-     */
-    public ElementarproduktRechtsschutzType createElementarproduktRechtsschutzType() {
-        return new ElementarproduktRechtsschutzType();
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/ProduktRechtsschutzType.java b/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/ProduktRechtsschutzType.java
deleted file mode 100644
index fde0fb51..00000000
--- a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/ProduktRechtsschutzType.java
+++ /dev/null
@@ -1,109 +0,0 @@
-
-package rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-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 at.vvo.omds.types.omds3Types.r1_7_0.common.ProduktGenerischType;
-
-
-/**
- * Typ für ein Produkt in der Sparte Rechtsschutz. Von diesem Typ können einzelne VUs ihre eigenen Produkte ableiten, wenn sie möchten.
- * 
- * 
Java-Klasse für ProduktRechtsschutz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProduktRechtsschutz_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ProduktGenerisch_Type">
- *       <sequence>
- *         <element name="ElementarprodukteRechtsschutz" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs}ElementarproduktRechtsschutz_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="VersInteressenRefLfNr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProduktRechtsschutz_Type", propOrder = {
-    "elementarprodukteRechtsschutz",
-    "versInteressenRefLfNr"
-})
-public class ProduktRechtsschutzType
-    extends ProduktGenerischType
-{
-
-    @XmlElement(name = "ElementarprodukteRechtsschutz")
-    protected List elementarprodukteRechtsschutz;
-    @XmlElement(name = "VersInteressenRefLfNr", type = Integer.class)
-    @XmlSchemaType(name = "unsignedShort")
-    protected List versInteressenRefLfNr;
-
-    /**
-     * Gets the value of the elementarprodukteRechtsschutz property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the elementarprodukteRechtsschutz property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getElementarprodukteRechtsschutz().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ElementarproduktRechtsschutzType }
-     * 
-     * 
-     */
-    public List getElementarprodukteRechtsschutz() {
-        if (elementarprodukteRechtsschutz == null) {
-            elementarprodukteRechtsschutz = new ArrayList();
-        }
-        return this.elementarprodukteRechtsschutz;
-    }
-
-    /**
-     * Gets the value of the versInteressenRefLfNr property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the versInteressenRefLfNr property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVersInteressenRefLfNr().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link Integer }
-     * 
-     * 
-     */
-    public List getVersInteressenRefLfNr() {
-        if (versInteressenRefLfNr == null) {
-            versInteressenRefLfNr = new ArrayList();
-        }
-        return this.versInteressenRefLfNr;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezAntragRechtsschutzType.java b/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezAntragRechtsschutzType.java
deleted file mode 100644
index b5c82fa9..00000000
--- a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezAntragRechtsschutzType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SpezAntragType;
-
-
-/**
- * Typ für den Schritt Antrags-Erzeugung
- * 
- * 
Java-Klasse für SpezAntragRechtsschutz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezAntragRechtsschutz_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezAntrag_Type">
- *       <sequence>
- *         <element name="Verkaufsprodukt" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs}VerkaufsproduktRechtsschutz_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezAntragRechtsschutz_Type", propOrder = {
-    "verkaufsprodukt"
-})
-public class SpezAntragRechtsschutzType
-    extends SpezAntragType
-{
-
-    @XmlElement(name = "Verkaufsprodukt", required = true)
-    protected VerkaufsproduktRechtsschutzType verkaufsprodukt;
-
-    /**
-     * Ruft den Wert der verkaufsprodukt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VerkaufsproduktRechtsschutzType }
-     *     
-     */
-    public VerkaufsproduktRechtsschutzType getVerkaufsprodukt() {
-        return verkaufsprodukt;
-    }
-
-    /**
-     * Legt den Wert der verkaufsprodukt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VerkaufsproduktRechtsschutzType }
-     *     
-     */
-    public void setVerkaufsprodukt(VerkaufsproduktRechtsschutzType value) {
-        this.verkaufsprodukt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezBerechnungRechtsschutzType.java b/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezBerechnungRechtsschutzType.java
deleted file mode 100644
index 40f2511e..00000000
--- a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezBerechnungRechtsschutzType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SpezBerechnungType;
-
-
-/**
- * Typ für den Schritt Berechnung
- * 
- * 
Java-Klasse für SpezBerechnungRechtsschutz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezBerechnungRechtsschutz_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezBerechnung_Type">
- *       <sequence>
- *         <element name="Verkaufsprodukt" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs}VerkaufsproduktRechtsschutz_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezBerechnungRechtsschutz_Type", propOrder = {
-    "verkaufsprodukt"
-})
-public class SpezBerechnungRechtsschutzType
-    extends SpezBerechnungType
-{
-
-    @XmlElement(name = "Verkaufsprodukt", required = true)
-    protected VerkaufsproduktRechtsschutzType verkaufsprodukt;
-
-    /**
-     * Ruft den Wert der verkaufsprodukt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VerkaufsproduktRechtsschutzType }
-     *     
-     */
-    public VerkaufsproduktRechtsschutzType getVerkaufsprodukt() {
-        return verkaufsprodukt;
-    }
-
-    /**
-     * Legt den Wert der verkaufsprodukt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VerkaufsproduktRechtsschutzType }
-     *     
-     */
-    public void setVerkaufsprodukt(VerkaufsproduktRechtsschutzType value) {
-        this.verkaufsprodukt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezOffertRechtsschutzType.java b/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezOffertRechtsschutzType.java
deleted file mode 100644
index 8805b2ac..00000000
--- a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezOffertRechtsschutzType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SpezOffertType;
-
-
-/**
- * Typ für den Schritt Offert-Erzeugung
- * 
- * 
Java-Klasse für SpezOffertRechtsschutz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezOffertRechtsschutz_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezOffert_Type">
- *       <sequence>
- *         <element name="Verkaufsprodukt" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs}VerkaufsproduktRechtsschutz_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezOffertRechtsschutz_Type", propOrder = {
-    "verkaufsprodukt"
-})
-public class SpezOffertRechtsschutzType
-    extends SpezOffertType
-{
-
-    @XmlElement(name = "Verkaufsprodukt", required = true)
-    protected VerkaufsproduktRechtsschutzType verkaufsprodukt;
-
-    /**
-     * Ruft den Wert der verkaufsprodukt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VerkaufsproduktRechtsschutzType }
-     *     
-     */
-    public VerkaufsproduktRechtsschutzType getVerkaufsprodukt() {
-        return verkaufsprodukt;
-    }
-
-    /**
-     * Legt den Wert der verkaufsprodukt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VerkaufsproduktRechtsschutzType }
-     *     
-     */
-    public void setVerkaufsprodukt(VerkaufsproduktRechtsschutzType value) {
-        this.verkaufsprodukt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SubmitApplicationRechtsschutzRequest.java b/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SubmitApplicationRechtsschutzRequest.java
deleted file mode 100644
index e3438d4a..00000000
--- a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SubmitApplicationRechtsschutzRequest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SubmitApplicationRequestGenType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SubmitApplicationRequestGen_Type">
- *       <sequence>
- *         <element name="Antragsanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs}SpezAntragRechtsschutz_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "antragsanfrage"
-})
-@XmlRootElement(name = "SubmitApplicationRechtsschutzRequest")
-public class SubmitApplicationRechtsschutzRequest
-    extends SubmitApplicationRequestGenType
-{
-
-    @XmlElement(name = "Antragsanfrage", required = true)
-    protected SpezAntragRechtsschutzType antragsanfrage;
-
-    /**
-     * Ruft den Wert der antragsanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezAntragRechtsschutzType }
-     *     
-     */
-    public SpezAntragRechtsschutzType getAntragsanfrage() {
-        return antragsanfrage;
-    }
-
-    /**
-     * Legt den Wert der antragsanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezAntragRechtsschutzType }
-     *     
-     */
-    public void setAntragsanfrage(SpezAntragRechtsschutzType value) {
-        this.antragsanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SubmitApplicationRechtsschutzResponse.java b/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SubmitApplicationRechtsschutzResponse.java
deleted file mode 100644
index d26f731d..00000000
--- a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SubmitApplicationRechtsschutzResponse.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SubmitApplicationResponseGenType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SubmitApplicationResponseGen_Type">
- *       <sequence>
- *         <element name="Antragsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs}SpezAntragRechtsschutz_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "antragsantwort"
-})
-@XmlRootElement(name = "SubmitApplicationRechtsschutzResponse")
-public class SubmitApplicationRechtsschutzResponse
-    extends SubmitApplicationResponseGenType
-{
-
-    @XmlElement(name = "Antragsantwort", required = true)
-    protected SpezAntragRechtsschutzType antragsantwort;
-
-    /**
-     * Ruft den Wert der antragsantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezAntragRechtsschutzType }
-     *     
-     */
-    public SpezAntragRechtsschutzType getAntragsantwort() {
-        return antragsantwort;
-    }
-
-    /**
-     * Legt den Wert der antragsantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezAntragRechtsschutzType }
-     *     
-     */
-    public void setAntragsantwort(SpezAntragRechtsschutzType value) {
-        this.antragsantwort = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/VerkaufsproduktRechtsschutzType.java b/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/VerkaufsproduktRechtsschutzType.java
deleted file mode 100644
index 03d94fe1..00000000
--- a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/VerkaufsproduktRechtsschutzType.java
+++ /dev/null
@@ -1,142 +0,0 @@
-
-package rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ProduktGenerischType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VerkaufsproduktGenerischType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VersichertesInteresseType;
-
-
-/**
- * Typ für ein Verkaufsprodukt in der Sparte Rechtsschutz
- * 
- * 
Java-Klasse für VerkaufsproduktRechtsschutz_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VerkaufsproduktRechtsschutz_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}VerkaufsproduktGenerisch_Type">
- *       <sequence>
- *         <element name="Produkte" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs}ProduktRechtsschutz_Type" maxOccurs="unbounded"/>
- *         <element name="Zusatzprodukte" type="{urn:omds3CommonServiceTypes-1-1-0}ProduktGenerisch_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="VersicherteInteressen" type="{urn:omds3CommonServiceTypes-1-1-0}VersichertesInteresse_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VerkaufsproduktRechtsschutz_Type", propOrder = {
-    "produkte",
-    "zusatzprodukte",
-    "versicherteInteressen"
-})
-public class VerkaufsproduktRechtsschutzType
-    extends VerkaufsproduktGenerischType
-{
-
-    @XmlElement(name = "Produkte", required = true)
-    protected List produkte;
-    @XmlElement(name = "Zusatzprodukte")
-    protected List zusatzprodukte;
-    @XmlElement(name = "VersicherteInteressen")
-    protected List versicherteInteressen;
-
-    /**
-     * Gets the value of the produkte property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the produkte property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getProdukte().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ProduktRechtsschutzType }
-     * 
-     * 
-     */
-    public List getProdukte() {
-        if (produkte == null) {
-            produkte = new ArrayList();
-        }
-        return this.produkte;
-    }
-
-    /**
-     * Gets the value of the zusatzprodukte property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zusatzprodukte property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZusatzprodukte().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ProduktGenerischType }
-     * 
-     * 
-     */
-    public List getZusatzprodukte() {
-        if (zusatzprodukte == null) {
-            zusatzprodukte = new ArrayList();
-        }
-        return this.zusatzprodukte;
-    }
-
-    /**
-     * Gets the value of the versicherteInteressen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the versicherteInteressen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVersicherteInteressen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link VersichertesInteresseType }
-     * 
-     * 
-     */
-    public List getVersicherteInteressen() {
-        if (versicherteInteressen == null) {
-            versicherteInteressen = new ArrayList();
-        }
-        return this.versicherteInteressen;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/package-info.java b/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/package-info.java
deleted file mode 100644
index 8fbef67a..00000000
--- a/OMDSServiceDefinition/src/main/java/rs/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package rs.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
diff --git a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CalculateUnfallRequestType.java b/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CalculateUnfallRequestType.java
deleted file mode 100644
index de6c3964..00000000
--- a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CalculateUnfallRequestType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CalculateRequestGenType;
-
-
-/**
- * Typ des Requestobjekts für eine Berechnung Unfall
- * 
- * 
Java-Klasse für CalculateUnfallRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CalculateUnfallRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CalculateRequestGen_Type">
- *       <sequence>
- *         <element name="Berechnungsanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall}SpezBerechnungUnfall_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CalculateUnfallRequest_Type", propOrder = {
-    "berechnungsanfrage"
-})
-public class CalculateUnfallRequestType
-    extends CalculateRequestGenType
-{
-
-    @XmlElement(name = "Berechnungsanfrage", required = true)
-    protected SpezBerechnungUnfallType berechnungsanfrage;
-
-    /**
-     * Ruft den Wert der berechnungsanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezBerechnungUnfallType }
-     *     
-     */
-    public SpezBerechnungUnfallType getBerechnungsanfrage() {
-        return berechnungsanfrage;
-    }
-
-    /**
-     * Legt den Wert der berechnungsanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezBerechnungUnfallType }
-     *     
-     */
-    public void setBerechnungsanfrage(SpezBerechnungUnfallType value) {
-        this.berechnungsanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CalculateUnfallResponseType.java b/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CalculateUnfallResponseType.java
deleted file mode 100644
index c42e04e0..00000000
--- a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CalculateUnfallResponseType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CalculateResponseGenType;
-
-
-/**
- * Typ des Responseobjekts für eine Unfall-Berechnung
- * 
- * 
Java-Klasse für CalculateUnfallResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CalculateUnfallResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CalculateResponseGen_Type">
- *       <sequence>
- *         <element name="Berechnungsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall}SpezBerechnungUnfall_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CalculateUnfallResponse_Type", propOrder = {
-    "berechnungsantwort"
-})
-public class CalculateUnfallResponseType
-    extends CalculateResponseGenType
-{
-
-    @XmlElement(name = "Berechnungsantwort", required = true)
-    protected SpezBerechnungUnfallType berechnungsantwort;
-
-    /**
-     * Ruft den Wert der berechnungsantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezBerechnungUnfallType }
-     *     
-     */
-    public SpezBerechnungUnfallType getBerechnungsantwort() {
-        return berechnungsantwort;
-    }
-
-    /**
-     * Legt den Wert der berechnungsantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezBerechnungUnfallType }
-     *     
-     */
-    public void setBerechnungsantwort(SpezBerechnungUnfallType value) {
-        this.berechnungsantwort = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateApplicationUnfallRequestType.java b/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateApplicationUnfallRequestType.java
deleted file mode 100644
index 857ac758..00000000
--- a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateApplicationUnfallRequestType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateApplicationRequestGenType;
-
-
-/**
- * Type des Requestobjekts für die Erstellung eines Unfallantrags
- * 
- * 
Java-Klasse für CreateApplicationUnfallRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateApplicationUnfallRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateApplicationRequestGen_Type">
- *       <sequence>
- *         <element name="Antragsanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall}SpezAntragUnfall_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateApplicationUnfallRequest_Type", propOrder = {
-    "antragsanfrage"
-})
-public class CreateApplicationUnfallRequestType
-    extends CreateApplicationRequestGenType
-{
-
-    @XmlElement(name = "Antragsanfrage", required = true)
-    protected SpezAntragUnfallType antragsanfrage;
-
-    /**
-     * Ruft den Wert der antragsanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezAntragUnfallType }
-     *     
-     */
-    public SpezAntragUnfallType getAntragsanfrage() {
-        return antragsanfrage;
-    }
-
-    /**
-     * Legt den Wert der antragsanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezAntragUnfallType }
-     *     
-     */
-    public void setAntragsanfrage(SpezAntragUnfallType value) {
-        this.antragsanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateApplicationUnfallResponseType.java b/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateApplicationUnfallResponseType.java
deleted file mode 100644
index 6d719477..00000000
--- a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateApplicationUnfallResponseType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateApplicationResponseGenType;
-
-
-/**
- * Type des Responseobjekts für die Erstellung eines Unfallantrags
- * 
- * 
Java-Klasse für CreateApplicationUnfallResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateApplicationUnfallResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateApplicationResponseGen_Type">
- *       <sequence>
- *         <element name="Antragsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall}SpezAntragUnfall_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateApplicationUnfallResponse_Type", propOrder = {
-    "antragsantwort"
-})
-public class CreateApplicationUnfallResponseType
-    extends CreateApplicationResponseGenType
-{
-
-    @XmlElement(name = "Antragsantwort", required = true)
-    protected SpezAntragUnfallType antragsantwort;
-
-    /**
-     * Ruft den Wert der antragsantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezAntragUnfallType }
-     *     
-     */
-    public SpezAntragUnfallType getAntragsantwort() {
-        return antragsantwort;
-    }
-
-    /**
-     * Legt den Wert der antragsantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezAntragUnfallType }
-     *     
-     */
-    public void setAntragsantwort(SpezAntragUnfallType value) {
-        this.antragsantwort = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateOfferUnfallRequestType.java b/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateOfferUnfallRequestType.java
deleted file mode 100644
index 1a74d06a..00000000
--- a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateOfferUnfallRequestType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateOfferRequestGenType;
-
-
-/**
- * Typ des Requestobjekts für eine Erstellung eines Unfall-Offerts
- * 
- * 
Java-Klasse für CreateOfferUnfallRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateOfferUnfallRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateOfferRequestGen_Type">
- *       <sequence>
- *         <element name="Offertanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall}SpezOffertUnfall_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateOfferUnfallRequest_Type", propOrder = {
-    "offertanfrage"
-})
-public class CreateOfferUnfallRequestType
-    extends CreateOfferRequestGenType
-{
-
-    @XmlElement(name = "Offertanfrage", required = true)
-    protected SpezOffertUnfallType offertanfrage;
-
-    /**
-     * Ruft den Wert der offertanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezOffertUnfallType }
-     *     
-     */
-    public SpezOffertUnfallType getOffertanfrage() {
-        return offertanfrage;
-    }
-
-    /**
-     * Legt den Wert der offertanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezOffertUnfallType }
-     *     
-     */
-    public void setOffertanfrage(SpezOffertUnfallType value) {
-        this.offertanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateOfferUnfallResponseType.java b/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateOfferUnfallResponseType.java
deleted file mode 100644
index 89ed4777..00000000
--- a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/CreateOfferUnfallResponseType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.CreateOfferResponseGenType;
-
-
-/**
- * Type des Responseobjekts für eine Erstellung eines Unfall-Offerts
- * 
- * 
Java-Klasse für CreateOfferUnfallResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="CreateOfferUnfallResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateOfferResponseGen_Type">
- *       <sequence>
- *         <element name="Offertantwort" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall}SpezOffertUnfall_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CreateOfferUnfallResponse_Type", propOrder = {
-    "offertantwort"
-})
-public class CreateOfferUnfallResponseType
-    extends CreateOfferResponseGenType
-{
-
-    @XmlElement(name = "Offertantwort", required = true)
-    protected SpezOffertUnfallType offertantwort;
-
-    /**
-     * Ruft den Wert der offertantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezOffertUnfallType }
-     *     
-     */
-    public SpezOffertUnfallType getOffertantwort() {
-        return offertantwort;
-    }
-
-    /**
-     * Legt den Wert der offertantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezOffertUnfallType }
-     *     
-     */
-    public void setOffertantwort(SpezOffertUnfallType value) {
-        this.offertantwort = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/LeistungsartUnfallType.java b/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/LeistungsartUnfallType.java
deleted file mode 100644
index 1a588444..00000000
--- a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/LeistungsartUnfallType.java
+++ /dev/null
@@ -1,68 +0,0 @@
-
-package unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ElementarproduktGenerischType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.SelbstbehaltType;
-
-
-/**
- * Typ für ein Elementarprodukt in der Sparte Unfall. Von diesem Typ werden etwaige unternehmesspezifische Deckungen oder potentielle Standard-Deckungen abgeleitet.
- * 
- * 
Java-Klasse für LeistungsartUnfall_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="LeistungsartUnfall_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ElementarproduktGenerisch_Type">
- *       <sequence>
- *         <element name="Selbstbehalt" type="{urn:omds3CommonServiceTypes-1-1-0}Selbstbehalt_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "LeistungsartUnfall_Type", propOrder = {
-    "selbstbehalt"
-})
-public class LeistungsartUnfallType
-    extends ElementarproduktGenerischType
-{
-
-    @XmlElement(name = "Selbstbehalt")
-    protected SelbstbehaltType selbstbehalt;
-
-    /**
-     * Ruft den Wert der selbstbehalt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SelbstbehaltType }
-     *     
-     */
-    public SelbstbehaltType getSelbstbehalt() {
-        return selbstbehalt;
-    }
-
-    /**
-     * Legt den Wert der selbstbehalt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SelbstbehaltType }
-     *     
-     */
-    public void setSelbstbehalt(SelbstbehaltType value) {
-        this.selbstbehalt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/ObjectFactory.java
deleted file mode 100644
index 993e15f8..00000000
--- a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/ObjectFactory.java
+++ /dev/null
@@ -1,227 +0,0 @@
-
-package unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-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 unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at package. 
- * 
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 _CalculateUnfallRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", "CalculateUnfallRequest");
-    private final static QName _CalculateUnfallResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", "CalculateUnfallResponse");
-    private final static QName _CreateOfferUnfallRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", "CreateOfferUnfallRequest");
-    private final static QName _CreateOfferUnfallResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", "CreateOfferUnfallResponse");
-    private final static QName _CreateApplicationUnfallRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", "CreateApplicationUnfallRequest");
-    private final static QName _CreateApplicationUnfallResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", "CreateApplicationUnfallResponse");
-    private final static QName _SubmitApplicationUnfallRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", "SubmitApplicationUnfallRequest");
-    private final static QName _SubmitApplicationUnfallResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", "SubmitApplicationUnfallResponse");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link CalculateUnfallRequestType }
-     * 
-     */
-    public CalculateUnfallRequestType createCalculateUnfallRequestType() {
-        return new CalculateUnfallRequestType();
-    }
-
-    /**
-     * Create an instance of {@link CalculateUnfallResponseType }
-     * 
-     */
-    public CalculateUnfallResponseType createCalculateUnfallResponseType() {
-        return new CalculateUnfallResponseType();
-    }
-
-    /**
-     * Create an instance of {@link CreateOfferUnfallRequestType }
-     * 
-     */
-    public CreateOfferUnfallRequestType createCreateOfferUnfallRequestType() {
-        return new CreateOfferUnfallRequestType();
-    }
-
-    /**
-     * Create an instance of {@link CreateOfferUnfallResponseType }
-     * 
-     */
-    public CreateOfferUnfallResponseType createCreateOfferUnfallResponseType() {
-        return new CreateOfferUnfallResponseType();
-    }
-
-    /**
-     * Create an instance of {@link CreateApplicationUnfallRequestType }
-     * 
-     */
-    public CreateApplicationUnfallRequestType createCreateApplicationUnfallRequestType() {
-        return new CreateApplicationUnfallRequestType();
-    }
-
-    /**
-     * Create an instance of {@link CreateApplicationUnfallResponseType }
-     * 
-     */
-    public CreateApplicationUnfallResponseType createCreateApplicationUnfallResponseType() {
-        return new CreateApplicationUnfallResponseType();
-    }
-
-    /**
-     * Create an instance of {@link SubmitApplicationUnfallRequestType }
-     * 
-     */
-    public SubmitApplicationUnfallRequestType createSubmitApplicationUnfallRequestType() {
-        return new SubmitApplicationUnfallRequestType();
-    }
-
-    /**
-     * Create an instance of {@link SubmitApplicationUnfallResponseType }
-     * 
-     */
-    public SubmitApplicationUnfallResponseType createSubmitApplicationUnfallResponseType() {
-        return new SubmitApplicationUnfallResponseType();
-    }
-
-    /**
-     * Create an instance of {@link VerkaufsproduktUnfallType }
-     * 
-     */
-    public VerkaufsproduktUnfallType createVerkaufsproduktUnfallType() {
-        return new VerkaufsproduktUnfallType();
-    }
-
-    /**
-     * Create an instance of {@link ProduktUnfallType }
-     * 
-     */
-    public ProduktUnfallType createProduktUnfallType() {
-        return new ProduktUnfallType();
-    }
-
-    /**
-     * Create an instance of {@link LeistungsartUnfallType }
-     * 
-     */
-    public LeistungsartUnfallType createLeistungsartUnfallType() {
-        return new LeistungsartUnfallType();
-    }
-
-    /**
-     * Create an instance of {@link SpezBerechnungUnfallType }
-     * 
-     */
-    public SpezBerechnungUnfallType createSpezBerechnungUnfallType() {
-        return new SpezBerechnungUnfallType();
-    }
-
-    /**
-     * Create an instance of {@link SpezOffertUnfallType }
-     * 
-     */
-    public SpezOffertUnfallType createSpezOffertUnfallType() {
-        return new SpezOffertUnfallType();
-    }
-
-    /**
-     * Create an instance of {@link SpezAntragUnfallType }
-     * 
-     */
-    public SpezAntragUnfallType createSpezAntragUnfallType() {
-        return new SpezAntragUnfallType();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CalculateUnfallRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", name = "CalculateUnfallRequest")
-    public JAXBElement createCalculateUnfallRequest(CalculateUnfallRequestType value) {
-        return new JAXBElement(_CalculateUnfallRequest_QNAME, CalculateUnfallRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CalculateUnfallResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", name = "CalculateUnfallResponse")
-    public JAXBElement createCalculateUnfallResponse(CalculateUnfallResponseType value) {
-        return new JAXBElement(_CalculateUnfallResponse_QNAME, CalculateUnfallResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateOfferUnfallRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", name = "CreateOfferUnfallRequest")
-    public JAXBElement createCreateOfferUnfallRequest(CreateOfferUnfallRequestType value) {
-        return new JAXBElement(_CreateOfferUnfallRequest_QNAME, CreateOfferUnfallRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateOfferUnfallResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", name = "CreateOfferUnfallResponse")
-    public JAXBElement createCreateOfferUnfallResponse(CreateOfferUnfallResponseType value) {
-        return new JAXBElement(_CreateOfferUnfallResponse_QNAME, CreateOfferUnfallResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateApplicationUnfallRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", name = "CreateApplicationUnfallRequest")
-    public JAXBElement createCreateApplicationUnfallRequest(CreateApplicationUnfallRequestType value) {
-        return new JAXBElement(_CreateApplicationUnfallRequest_QNAME, CreateApplicationUnfallRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateApplicationUnfallResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", name = "CreateApplicationUnfallResponse")
-    public JAXBElement createCreateApplicationUnfallResponse(CreateApplicationUnfallResponseType value) {
-        return new JAXBElement(_CreateApplicationUnfallResponse_QNAME, CreateApplicationUnfallResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SubmitApplicationUnfallRequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", name = "SubmitApplicationUnfallRequest")
-    public JAXBElement createSubmitApplicationUnfallRequest(SubmitApplicationUnfallRequestType value) {
-        return new JAXBElement(_SubmitApplicationUnfallRequest_QNAME, SubmitApplicationUnfallRequestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SubmitApplicationUnfallResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", name = "SubmitApplicationUnfallResponse")
-    public JAXBElement createSubmitApplicationUnfallResponse(SubmitApplicationUnfallResponseType value) {
-        return new JAXBElement(_SubmitApplicationUnfallResponse_QNAME, SubmitApplicationUnfallResponseType.class, null, value);
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/ProduktUnfallType.java b/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/ProduktUnfallType.java
deleted file mode 100644
index c9bec926..00000000
--- a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/ProduktUnfallType.java
+++ /dev/null
@@ -1,103 +0,0 @@
-
-package unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-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;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.ProduktMitVpType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.SelbstbehaltType;
-
-
-/**
- * Typ für ein Produkt in der Sparte Unfall. Von diesem Typ können einzelne VUs ihre eigenen Produkte ableiten, wenn sie möchten.
- * 
- * 
Java-Klasse für ProduktUnfall_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="ProduktUnfall_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}ProduktMitVp_Type">
- *       <sequence>
- *         <element name="Leistungsarten" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall}LeistungsartUnfall_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Selbstbehalt" type="{urn:omds3CommonServiceTypes-1-1-0}Selbstbehalt_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProduktUnfall_Type", propOrder = {
-    "leistungsarten",
-    "selbstbehalt"
-})
-public class ProduktUnfallType
-    extends ProduktMitVpType
-{
-
-    @XmlElement(name = "Leistungsarten")
-    protected List leistungsarten;
-    @XmlElement(name = "Selbstbehalt")
-    protected SelbstbehaltType selbstbehalt;
-
-    /**
-     * Gets the value of the leistungsarten property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the leistungsarten property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getLeistungsarten().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link LeistungsartUnfallType }
-     * 
-     * 
-     */
-    public List getLeistungsarten() {
-        if (leistungsarten == null) {
-            leistungsarten = new ArrayList();
-        }
-        return this.leistungsarten;
-    }
-
-    /**
-     * Ruft den Wert der selbstbehalt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SelbstbehaltType }
-     *     
-     */
-    public SelbstbehaltType getSelbstbehalt() {
-        return selbstbehalt;
-    }
-
-    /**
-     * Legt den Wert der selbstbehalt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SelbstbehaltType }
-     *     
-     */
-    public void setSelbstbehalt(SelbstbehaltType value) {
-        this.selbstbehalt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezAntragUnfallType.java b/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezAntragUnfallType.java
deleted file mode 100644
index 995338ac..00000000
--- a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezAntragUnfallType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SpezAntragType;
-
-
-/**
- * Typ für den Schritt Antrags-Erzeugung
- * 
- * 
Java-Klasse für SpezAntragUnfall_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezAntragUnfall_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezAntrag_Type">
- *       <sequence>
- *         <element name="Verkaufsprodukt" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall}VerkaufsproduktUnfall_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezAntragUnfall_Type", propOrder = {
-    "verkaufsprodukt"
-})
-public class SpezAntragUnfallType
-    extends SpezAntragType
-{
-
-    @XmlElement(name = "Verkaufsprodukt", required = true)
-    protected VerkaufsproduktUnfallType verkaufsprodukt;
-
-    /**
-     * Ruft den Wert der verkaufsprodukt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VerkaufsproduktUnfallType }
-     *     
-     */
-    public VerkaufsproduktUnfallType getVerkaufsprodukt() {
-        return verkaufsprodukt;
-    }
-
-    /**
-     * Legt den Wert der verkaufsprodukt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VerkaufsproduktUnfallType }
-     *     
-     */
-    public void setVerkaufsprodukt(VerkaufsproduktUnfallType value) {
-        this.verkaufsprodukt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezBerechnungUnfallType.java b/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezBerechnungUnfallType.java
deleted file mode 100644
index d20c7ebd..00000000
--- a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezBerechnungUnfallType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SpezBerechnungType;
-
-
-/**
- * Typ für den Schritt Berechnung
- * 
- * 
Java-Klasse für SpezBerechnungUnfall_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezBerechnungUnfall_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezBerechnung_Type">
- *       <sequence>
- *         <element name="Verkaufsprodukt" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall}VerkaufsproduktUnfall_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezBerechnungUnfall_Type", propOrder = {
-    "verkaufsprodukt"
-})
-public class SpezBerechnungUnfallType
-    extends SpezBerechnungType
-{
-
-    @XmlElement(name = "Verkaufsprodukt", required = true)
-    protected VerkaufsproduktUnfallType verkaufsprodukt;
-
-    /**
-     * Ruft den Wert der verkaufsprodukt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VerkaufsproduktUnfallType }
-     *     
-     */
-    public VerkaufsproduktUnfallType getVerkaufsprodukt() {
-        return verkaufsprodukt;
-    }
-
-    /**
-     * Legt den Wert der verkaufsprodukt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VerkaufsproduktUnfallType }
-     *     
-     */
-    public void setVerkaufsprodukt(VerkaufsproduktUnfallType value) {
-        this.verkaufsprodukt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezOffertUnfallType.java b/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezOffertUnfallType.java
deleted file mode 100644
index b3644a62..00000000
--- a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SpezOffertUnfallType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SpezOffertType;
-
-
-/**
- * Typ für den Schritt Offert-Erzeugung
- * 
- * 
Java-Klasse für SpezOffertUnfall_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SpezOffertUnfall_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezOffert_Type">
- *       <sequence>
- *         <element name="Verkaufsprodukt" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall}VerkaufsproduktUnfall_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SpezOffertUnfall_Type", propOrder = {
-    "verkaufsprodukt"
-})
-public class SpezOffertUnfallType
-    extends SpezOffertType
-{
-
-    @XmlElement(name = "Verkaufsprodukt", required = true)
-    protected VerkaufsproduktUnfallType verkaufsprodukt;
-
-    /**
-     * Ruft den Wert der verkaufsprodukt-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VerkaufsproduktUnfallType }
-     *     
-     */
-    public VerkaufsproduktUnfallType getVerkaufsprodukt() {
-        return verkaufsprodukt;
-    }
-
-    /**
-     * Legt den Wert der verkaufsprodukt-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VerkaufsproduktUnfallType }
-     *     
-     */
-    public void setVerkaufsprodukt(VerkaufsproduktUnfallType value) {
-        this.verkaufsprodukt = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SubmitApplicationUnfallRequestType.java b/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SubmitApplicationUnfallRequestType.java
deleted file mode 100644
index 38136326..00000000
--- a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SubmitApplicationUnfallRequestType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SubmitApplicationRequestGenType;
-
-
-/**
- * Type des Requests, um den Antrag einzureichen
- * 
- * 
Java-Klasse für SubmitApplicationUnfallRequest_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SubmitApplicationUnfallRequest_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SubmitApplicationRequestGen_Type">
- *       <sequence>
- *         <element name="Antragsanfrage" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall}SpezAntragUnfall_Type" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SubmitApplicationUnfallRequest_Type", propOrder = {
-    "antragsanfrage"
-})
-public class SubmitApplicationUnfallRequestType
-    extends SubmitApplicationRequestGenType
-{
-
-    @XmlElement(name = "Antragsanfrage")
-    protected SpezAntragUnfallType antragsanfrage;
-
-    /**
-     * Ruft den Wert der antragsanfrage-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezAntragUnfallType }
-     *     
-     */
-    public SpezAntragUnfallType getAntragsanfrage() {
-        return antragsanfrage;
-    }
-
-    /**
-     * Legt den Wert der antragsanfrage-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezAntragUnfallType }
-     *     
-     */
-    public void setAntragsanfrage(SpezAntragUnfallType value) {
-        this.antragsanfrage = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SubmitApplicationUnfallResponseType.java b/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SubmitApplicationUnfallResponseType.java
deleted file mode 100644
index c151d14b..00000000
--- a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/SubmitApplicationUnfallResponseType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_7_0.on2antrag.common.SubmitApplicationResponseGenType;
-
-
-/**
- * Type des Response, um den Antrag einzureichen
- * 
- * 
Java-Klasse für SubmitApplicationUnfallResponse_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="SubmitApplicationUnfallResponse_Type">
- *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SubmitApplicationResponseGen_Type">
- *       <sequence>
- *         <element name="Antragsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall}SpezAntragUnfall_Type"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SubmitApplicationUnfallResponse_Type", propOrder = {
-    "antragsantwort"
-})
-public class SubmitApplicationUnfallResponseType
-    extends SubmitApplicationResponseGenType
-{
-
-    @XmlElement(name = "Antragsantwort", required = true)
-    protected SpezAntragUnfallType antragsantwort;
-
-    /**
-     * Ruft den Wert der antragsantwort-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezAntragUnfallType }
-     *     
-     */
-    public SpezAntragUnfallType getAntragsantwort() {
-        return antragsantwort;
-    }
-
-    /**
-     * Legt den Wert der antragsantwort-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezAntragUnfallType }
-     *     
-     */
-    public void setAntragsantwort(SpezAntragUnfallType value) {
-        this.antragsantwort = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/VerkaufsproduktUnfallType.java b/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/VerkaufsproduktUnfallType.java
deleted file mode 100644
index c37b7d75..00000000
--- a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/VerkaufsproduktUnfallType.java
+++ /dev/null
@@ -1,172 +0,0 @@
-
-package unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
-
-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 at.vvo.omds.types.omds3Types.r1_7_0.common.ProduktGenerischType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VerkaufsproduktGenerischType;
-import at.vvo.omds.types.omds3Types.r1_7_0.common.VersichertePersonType;
-
-
-/**
- * Typ für ein Verkaufsprodukt in der Sparte Unfall
- * 
- * 
Java-Klasse für VerkaufsproduktUnfall_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="VerkaufsproduktUnfall_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}VerkaufsproduktGenerisch_Type">
- *       <sequence>
- *         <element name="Unfallprodukte" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall}ProduktUnfall_Type" maxOccurs="unbounded"/>
- *         <element name="Zusatzprodukte" type="{urn:omds3CommonServiceTypes-1-1-0}ProduktGenerisch_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="VersichertePersonen" type="{urn:omds3CommonServiceTypes-1-1-0}VersichertePerson_Type" maxOccurs="unbounded"/>
- *         <element name="RefSicherstellungLfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "VerkaufsproduktUnfall_Type", propOrder = {
-    "unfallprodukte",
-    "zusatzprodukte",
-    "versichertePersonen",
-    "refSicherstellungLfnr"
-})
-public class VerkaufsproduktUnfallType
-    extends VerkaufsproduktGenerischType
-{
-
-    @XmlElement(name = "Unfallprodukte", required = true)
-    protected List unfallprodukte;
-    @XmlElement(name = "Zusatzprodukte")
-    protected List zusatzprodukte;
-    @XmlElement(name = "VersichertePersonen", required = true)
-    protected List versichertePersonen;
-    @XmlElement(name = "RefSicherstellungLfnr")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer refSicherstellungLfnr;
-
-    /**
-     * Gets the value of the unfallprodukte property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the unfallprodukte property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getUnfallprodukte().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ProduktUnfallType }
-     * 
-     * 
-     */
-    public List getUnfallprodukte() {
-        if (unfallprodukte == null) {
-            unfallprodukte = new ArrayList();
-        }
-        return this.unfallprodukte;
-    }
-
-    /**
-     * Gets the value of the zusatzprodukte property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the zusatzprodukte property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getZusatzprodukte().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ProduktGenerischType }
-     * 
-     * 
-     */
-    public List getZusatzprodukte() {
-        if (zusatzprodukte == null) {
-            zusatzprodukte = new ArrayList();
-        }
-        return this.zusatzprodukte;
-    }
-
-    /**
-     * Gets the value of the versichertePersonen property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the versichertePersonen property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVersichertePersonen().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link VersichertePersonType }
-     * 
-     * 
-     */
-    public List getVersichertePersonen() {
-        if (versichertePersonen == null) {
-            versichertePersonen = new ArrayList();
-        }
-        return this.versichertePersonen;
-    }
-
-    /**
-     * Ruft den Wert der refSicherstellungLfnr-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getRefSicherstellungLfnr() {
-        return refSicherstellungLfnr;
-    }
-
-    /**
-     * Legt den Wert der refSicherstellungLfnr-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setRefSicherstellungLfnr(Integer value) {
-        this.refSicherstellungLfnr = value;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/package-info.java b/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/package-info.java
deleted file mode 100644
index 62cb6d41..00000000
--- a/OMDSServiceDefinition/src/main/java/unfall/on2antrag/_0/_4/v1/omds3types/types/omds/vvo/at/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package unfall.on2antrag._0._4.v1.omds3types.types.omds.vvo.at;
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/ReleaseNotes-1-7-0.txt b/OMDSServiceDefinition/src/main/resources/def/r1_7_0/ReleaseNotes-1-7-0.txt
index 3e8d86e6..ab928a34 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/ReleaseNotes-1-7-0.txt
+++ b/OMDSServiceDefinition/src/main/resources/def/r1_7_0/ReleaseNotes-1-7-0.txt
@@ -1,4 +1,12 @@
-
+=============
+Version 1.7.0
+=============
+
+Was ist neu oder anders in Version 1.7.0 im Vergleich zur Version 1.6.0?
+=====================================================================================
+1. Version 1.7.0 ist abwärtskompatibel zur Version 1.6.0
+1. Berechnung-Offert-Antrag wurde für die Sparten Unfall und Leben neu angelegt
+3. Neue Dokumentenarten
 
 
 
@@ -8,9 +16,8 @@ Version 1.6.0
 
 Was ist neu oder anders in Version 1.6.0 im Vergleich zur Version 1.5.0?
 =====================================================================================
-1. Sparten Unfall und Leben wurden neu angelegt
-2. Aufnahme Verkaufsproduktfinder?
-3. Neue Dokumentenarten
+1. Version 1.6.0 ist abwärtskompatibel zur Version 1.5.0
+
 3. Verwendet OMDS 2.14-00 statt 2.11-00:
    - neue Vertragsrollen: AZ - Abweichender Zulassungsbesitzer, FI - Firmeninhaber, ZB - Zustellbevollmächtigter
    - neues Feld GesFormCdType in Sonst-Person
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3CommonServiceTypes.xsd b/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3CommonServiceTypes.xsd
index ca4c92af..3f5ba586 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3CommonServiceTypes.xsd
+++ b/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3CommonServiceTypes.xsd
@@ -1,5 +1,4 @@
 
-
 
 	
 	
@@ -1973,7 +1972,7 @@
 			Typ für Ersatzpolizzen
 		
 		
-			
+			
 			
 			
 		
@@ -2403,16 +2402,6 @@
 			VU-spezifische Erweiterungsmöglichkeit für Personendaten
 		
 	
-	
-		
-			Versicherte Veranstaltung basierend auf VersichertesInteresse_Type
-		
-		
-			
-				
-			
-		
-	
 	
 		
 			Basisklasse für alle Fahrzeuge in der Kfz-Versicherung
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3Services.wsdl b/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3Services.wsdl
index ca7f92b5..67bfd622 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3Services.wsdl
+++ b/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3Services.wsdl
@@ -7,13 +7,8 @@ xmlns:cst="urn:omds3CommonServiceTypes-1-1-0"
 xmlns:b="urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen"
 xmlns:boak="urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz"
 xmlns:boaSp="urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat"
-xmlns:boaRs="urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs"
 xmlns:boaU="urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall"
 xmlns:boaL="urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben"
-xmlns:boaKr="urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken"
-xmlns:boaPf="urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.produktfinder"
-xmlns:v="urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag"
-xmlns:p="urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner"
 xmlns:sch="urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden"
 xmlns="http://schemas.xmlsoap.org/wsdl/"
 xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
@@ -29,15 +24,9 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 			
 			
 			
-            
 			
-			
 			
-			
-			
-			
 			
-
 		
 	
 	
@@ -162,18 +151,6 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 	
 		
 	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
 
 	
 	
@@ -227,32 +204,6 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 		
 	
 
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
 	
 	
 		
@@ -279,32 +230,7 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 		
 	
 
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
+
 	
 	
 		
@@ -332,87 +258,13 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 	
 
 	
-	
-		
-	
-	
-		
-	
 	
 		
 	
 	
 		
 	
-	
-		
-	
-	
-		
-	
 
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
 	
 	
 		
@@ -523,16 +375,6 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 			
 			
 		
-		
-			
-			
-			
-		
-		
-			
-			
-			
-		
 
 		
 			
@@ -576,27 +418,6 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 			
 		
 
-		
-			
-			
-			
-		
-		
-			
-			
-			
-		
-		
-			
-			
-			
-		
-		
-			
-			
-			
-		
-		
 		
 			
 			
@@ -618,27 +439,6 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 			
 		
 
-		
-			
-			
-			
-		
-		
-			
-			
-			
-		
-		
-			
-			
-			
-		
-		
-			
-			
-			
-		
-
 		
 			
 			
@@ -660,74 +460,11 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 			
 		
 
-		
-			
-			
-			
-		
 		
 			
 			
 			
 		
-		
-			
-			
-			
-		
-
-
-		
-			
-			
-			
-		
-		
-			
-			
-			
-		
-		
-			
-			
-			
-		
-		
-			
-			
-			
-		
-		
-			
-			
-			
-		
-		
-			
-			
-			
-		
-		
-			
-			
-			
-		
-		
-			
-			
-			
-		
-		
-			
-			
-			
-		
-		
-			
-			
-			
-		
-
 	
 
 	
@@ -979,32 +716,6 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 			
 		
 
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-
 		
 		
 			
@@ -1106,57 +817,6 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 		
 
 
-		
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-
-
 		
 		
 			
@@ -1207,56 +867,6 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 			
 		
 
-		
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-		
 
 		
 		
@@ -1308,19 +918,6 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 			
 		
 
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-
 		
 			
 			
@@ -1333,142 +930,6 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 				
 			
 		
-
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-
-
-		
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
 	
 
 	
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3ServicesBroker.wsdl b/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3ServicesBroker.wsdl
deleted file mode 100644
index 53f1dbdd..00000000
--- a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3ServicesBroker.wsdl
+++ /dev/null
@@ -1,174 +0,0 @@
-
-
-
-	
-	
-	
-	
-		
-			
-			
-		
-	
-	
-	
-
-	
-	
-		
-	
-	
-		
-	
-
-	
-		
-	
-	
-		
-	
-
-	
-
-	
-		
-	
-		
-	
-	
-	
-	
-	
-		
-		
-			
-			
-            
-        
-
-		
-			
-			
-            
-        
-        
-
-	
-
-	
-		
-
-		
- 		
-
-		
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-				
-			
-	
-	
-	
-		
-			
-		
-	
-		
-	
-	  
-		  
-			
-			
-				
-					
-						
-							
-						
-					
-				
-			
-			
-			
-			  
-				
-				  
-					
-				  
-				
-			  
-			
-
-		  
-		
-	
-  
-
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Common.xsd b/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Common.xsd
index 44587b74..08ac31f3 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Common.xsd
+++ b/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Common.xsd
@@ -546,77 +546,4 @@
 			Element um Offert- und Antragsdokumente zurückzugeben
 		
 	
-	
-		
-			Request um Daten eines Vertrags anzufordern
-		
-		
-			
-				
-					
-						
-							Die Polizzennummer der gesuchten Polizze
-						
-					
-					
-						
-							Die OMDS VertragsID der gesuchten Polizze
-						
-					
-				
-			
-		
-	
-	
-		
-			Response, der Daten zu einem Vertrag enthält
-		
-		
-			
-				
-					
-						
-							Hier werden die Daten des Vertrags zur Verfügung gestellt, wenn er identifiziert werden konnte.
-						
-					
-				
-			
-		
-	
-	
-		
-			Request um einen oder mehrere Verträge zu konvertieren
-		
-		
-			
-				
-					
-						
-							
-								Angabe auf welchem Vertrag oder welchen Verträgen der neue Vertrag aufgebaut werden soll
-							
-						
-					
-				
-			
-		
-	
-	
-		
-			Response um einen oder mehrere Verträge zu konvertieren
-		
-		
-			
-				
-					
-						
-							
-								Hier werden die Daten des Vertrags zur Verfügung gestellt, wenn er identifiziert werden konnte.
-							
-						
-					
-				
-			
-		
-	
 
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Kfz.xsd b/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Kfz.xsd
index 46bbce60..3afab50f 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Kfz.xsd
+++ b/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Kfz.xsd
@@ -409,29 +409,6 @@
 	
 		Konkrete Services (Request- und Responseobjekte) Kfz
 	
-	
-		
-			Requestobjekt um einen Vertrag zu laden
-		
-	
-	
-		
-			Responseobjekt beim Laden eines Vertrags
-		
-		
-			
-				
-					
-						
-							
-								Hier werden die Daten des Vertrags zur Verfügung gestellt
-							
-						
-					
-				
-			
-		
-	
 	
 		
 			Requestobjekt für eine Kfz Berechnung
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Kranken.xsd b/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Kranken.xsd
deleted file mode 100644
index e1b51b1a..00000000
--- a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Kranken.xsd
+++ /dev/null
@@ -1,245 +0,0 @@
-
-
-
-	
-	
-	
-	
-		
-			Typ für ein Verkaufsprodukt in der Sparte Krankenversicherung
-		
-		
-			
-				
-					
-						
-							Liste von Produkten
-						
-					
-					
-						
-							Möglichkeit Kranken-fremde Bausteine einzugliedern.
-						
-					
-					
-						
-							Die Risikodaten der versicherten Interessen. In der Regel sind dies Versicherte Personen, die im Produktbaum referenziert werden.
-						
-					
-					
-						
-							Referenz auf eine Gruppe
-						
-					
-				
-			
-		
-	
-	
-		
-			Typ für ein Produkt in der Sparte Kranken. Von diesem Typ können einzelne VUs ihre eigenen Produkte ableiten, wenn sie möchten.
-		
-		
-			
-				
-					
-						
-							Liste der Elementarprodukte
-						
-					
-					
-						
-							Selbstbehalt über alle Elementarprodukte einheitlich.
-						
-					
-				
-			
-		
-	
-	
-		
-			Typ für ein Elementarprodukt in der Sparte Kranken. Von diesem Typ werden etwaige unternehmesspezifische Deckungen oder potentielle Standard-Deckungen abgeleitet.
-		
-		
-			
-				
-					
-				
-			
-		
-	
-	
-	
-		
-			Typ für den Schritt Berechnung
-		
-		
-			
-				
-					
-				
-			
-		
-	
-	
-		
-			Typ für den Schritt Offert-Erzeugung
-		
-		
-			
-				
-					
-				
-			
-		
-	
-	
-		
-			Typ für den Schritt Antrags-Erzeugung
-		
-		
-			
-				
-					
-				
-			
-		
-	
-	
-	
-		
-			Requestobjekt für die Berechnung Kranken
-		
-		
-			
-				Typ des Requestobjekts für eine Berechnung Kranken
-			
-			
-				
-					
-						
-					
-				
-			
-		
-	
-	
-		
-			Responseobjekt für die Berechnung Kranken
-		
-		
-			
-				Typ des Responseobjekts für eine Kranken-Berechnung
-			
-			
-				
-					
-						
-					
-				
-			
-		
-	
-	
-		
-			Requestobjekt für die Offerterstellung Kranken
-		
-		
-			
-				Typ des Requestobjekts für eine Erstellung eines Kranken-Offerts
-			
-			
-				
-					
-						
-					
-				
-			
-		
-	
-	
-		
-			Responseobjekt für die Offerterstellung Kranken
-		
-		
-			
-				Type des Responseobjekts für eine Erstellung eines Kranken-Offerts
-			
-			
-				
-					
-						
-					
-				
-			
-		
-	
-	
-		
-			Requestobjekt für die Antragserzeugung Kranken
-		
-		
-			
-				Type des Requestobjekts für die Erstellung eines Krankenantrags
-			
-			
-				
-					
-						
-					
-				
-			
-		
-	
-	
-		
-			Responseobjekt für die Antragserzeugung Kranken
-		
-		
-			
-				Type des Responseobjekts für die Erstellung eines Krankenantrags
-			
-			
-				
-					
-						
-					
-				
-			
-		
-	
-	
-		
-			Requestobjekt für die Antragsüberleitung Kranken
-		
-		
-			
-				Type des Requests, um den Antrag einzureichen
-			
-			
-				
-					
-						
-					
-				
-			
-		
-	
-	
-		
-			Responseobjekt für die Antragsüberleitung Kranken
-		
-		
-			
-				Type des Response, um den Antrag einzureichen
-			
-			
-				
-					
-						
-					
-				
-			
-		
-	
-
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Produktfinder.xsd b/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Produktfinder.xsd
deleted file mode 100644
index 7179a4b7..00000000
--- a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Produktfinder.xsd
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-	
-	
-	
-		
-			Basistyp des Requestobjekts
-		
-		
-			
-				
-					
-					
-				
-			
-		
-	
-	
-		
-			Typ des Requestobjekts für den Verkaufsproduktfinder
-		
-		
-			
-				
-					
-				
-			
-		
-	
-	
-		
-			Basistyp des Responseobjekts
-		
-		
-			
-		
-	
-	
-		
-			Typ des Responseobjekts für den Verkaufsproduktfinder
-		
-		
-			
-				
-					
-					
-						
-							
-								
-									
-										Schluessel der Tarifkomponente
-									
-								
-								
-									
-										Eine menschenverständliche Bezeichnung. Ist kein Eingabewert,wird von der VU gesetzt
-									
-								
-								
-								
-									
-										Verweise auf Bedingungswerke
-									
-								
-								
-								
-								
-									
-										Optional die Liste möglicher Produkte
-									
-								
-							
-						
-					
-				
-			
-		
-	
-	
-		
-			Informationen zu einem Produkt
-		
-		
-			
-				
-					Schluessel der Tarifkomponente
-				
-			
-			
-				
-					Eine menschenverständliche Bezeichnung. Ist kein Eingabewert,wird von der VU gesetzt
-				
-			
-			
-			
-				
-					Verweise auf Bedingungswerke
-				
-			
-			
-			
-		
-	
-	
-		
-			Requestobjekt Verkaufsproduktfinder
-		
-	
-	
-		
-			Responseobjekt Verkaufsproduktfinder
-		
-	
-
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Rechtsschutz.xsd b/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Rechtsschutz.xsd
deleted file mode 100644
index 17f1418b..00000000
--- a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Rechtsschutz.xsd
+++ /dev/null
@@ -1,240 +0,0 @@
-
-
-	
-	
-	
-	
-		
-			Typ für ein Verkaufsprodukt in der Sparte Rechtsschutz
-		
-		
-			
-				
-					
-					
-					
-						
-							Liste der versicherten Interessen, wobei hier nur ein abstrakter Typ vorgegeben ist. Die einzelnen versicherten Interessen können dann über die laufende Nummer referenziert werden.
-						
-					
-				
-			
-		
-	
-	
-		
-			Typ für ein Produkt in der Sparte Rechtsschutz. Von diesem Typ können einzelne VUs ihre eigenen Produkte ableiten, wenn sie möchten.
-		
-		
-			
-				
-					
-					
-						
-							Bezug auf versicherte Interessen
-						
-					
-				
-			
-		
-	
-	
-		
-			Typ für ein Elementarprodukt in der Sparte Rechtsschutz. Von diesem Typ werden etwaige Standard-Deckungen abgeleitet, siehe Vertragsrechtsschutz_Type. Von diesem Typ können einzelne VUs aber auch ihre eigenen Elementarprodukte ableiten, wenn sie möchten.
-		
-		
-			
-				
-					
-						
-							Bezug auf versicherte Interessen
-						
-					
-				
-			
-		
-	
-	
-	
-		
-			Code für den örtlichen Geltungsbereichs
-		
-		
-			
-				
-					Österreich
-				
-			
-			
-				
-					EU
-				
-			
-			
-				
-					Europa geographisch
-				
-			
-			
-				
-					EWR
-				
-			
-			
-				
-					weltweit
-				
-			
-		
-	
-	
-	
-		
-			Typ für den Schritt Berechnung
-		
-		
-			
-				
-					
-				
-			
-		
-	
-	
-		
-			Typ für den Schritt Offert-Erzeugung
-		
-		
-			
-				
-					
-				
-			
-		
-	
-	
-		
-			Typ für den Schritt Antrags-Erzeugung
-		
-		
-			
-				
-					
-				
-			
-		
-	
-	
-	
-		
-			Requestobjekt für eine Berechnung Rechtsschutz
-		
-		
-			
-				
-					
-						
-					
-				
-			
-		
-	
-	
-		
-			Responseobjekt bei der Rechtsschutz-Berechnung
-		
-		
-			
-				
-					
-						
-					
-				
-			
-		
-	
-	
-		
-			Requestobjekt für eine Erstellung eines Rechstsschutz-Offerts
-		
-		
-			
-				
-					
-						
-					
-				
-			
-		
-	
-	
-		
-			Responseobjekt bei der Erstellung eines Rechtsschutz-Offerts
-		
-		
-			
-				
-					
-						
-					
-				
-			
-		
-	
-	
-		
-			Requestobjekt für die Erstellung eines Rechtsschutzantrags
-		
-		
-			
-				
-					
-						
-					
-				
-			
-		
-	
-	
-		
-			Responseobjekt bei der Erstellung eines Rechtsschutzantrags
-		
-		
-			
-				
-					
-						
-					
-				
-			
-		
-	
-	
-		
-			Requests, um den Antrag einzureichen
-		
-		
-			
-				
-					
-						
-					
-				
-			
-		
-	
-	
-		
-			Response nach dem Einreichen des Antrags
-		
-		
-			
-				
-					
-						
-					
-				
-			
-		
-	
-
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON3_Vertrag.xsd b/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON3_Vertrag.xsd
deleted file mode 100644
index 60cf5a43..00000000
--- a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON3_Vertrag.xsd
+++ /dev/null
@@ -1,296 +0,0 @@
-
-
-	
-	
-	
-		
-			Request auf die Polizzen, in denen ein Partner in der Rolle VN auftritt
-		
-	
-	
-		
-			Response zu den Polizzen, in denen ein Partner in der Rolle VN auftritt
-		
-	
-	
-		
-			Requesttyp auf die Polizzen, in denen ein Partner in der Rolle VN auftritt
-		
-		
-			
-				
-					
-					
-						
-							Die ObjektId des Partners (enthält die Personennr)
-						
-					
-				
-			
-		
-	
-	
-		
-			Responsetyp zu den Polizzen, in denen ein Partner in der Rolle VN auftritt
-		
-		
-			
-				
-					
-						
-							Ein Vertrag, wie er im OMDS-Datensatz definiert ist.
-						
-					
-					
-						
-							Die ObjektId des Vertrags, enthält die Polizzennr
-						
-					
-					
-						
-							Optional eine abweichende Zustelladresse
-						
-					
-				
-			
-		
-	
-	
-		
-			Typ des Requestobjekts für das Setzen einer Zustelladresse
-		
-		
-			
-				
-					
-						
-							Die ObjektId des Vertrags
-						
-					
-					
-						
-							Die neue Zustelladresse für den Vertrag
-						
-					
-					
-				
-			
-		
-	
-	
-		
-			Typ des Responseobjekts für das Setzen einer Zustelladresse
-		
-		
-			
-				
-					
-						
-							ObjektId des Vertrags
-						
-					
-					
-						
-							Die Daten des Vertrags
-						
-					
-					
-				
-			
-		
-	
-	
-		
-			Requestobjekt für das Setzen einer Zustelladresse
-		
-	
-	
-		
-			Responseobjekt für das Setzen einer Zustelladresse
-		
-	
-	
-		
-			Requestobjekt für die Änderungen von Inkassodaten
-		
-		
-			
-				
-					
-						
-							
-								Die Id des Vertrag als ObjektId (VertragsID des OMDS-Datensatzes)
-							
-						
-						
-						
-						
-						
-					
-				
-			
-		
-	
-	
-		
-			Responseobjekt für die Änderungen von Inkassodaten
-		
-		
-			
-				
-					
-						
-							
-								ObjektId des Vertrags bzw. Polizzennr.
-							
-						
-						
-						
-						
-					
-				
-			
-		
-	
-	
-		
-			Typ des Requestobjekts für eine Änderung von Inkassodaten
-		
-		
-			
-				
-					
-						
-							
-								Die Id des Vertrag als ObjektId (VertragsID des OMDS-Datensatzes)
-							
-						
-					
-				
-			
-		
-	
-	
-		
-			Typ des Response für eine Änderung von Inkassodaten
-		
-		
-			
-				
-					
-						
-							
-								ObjektId des Vertrags bzw. Polizzennr.
-							
-						
-						
-						
-							
-								Prämien die für diesen Produktbaustein verlangt werden
-							
-						
-					
-				
-			
-		
-	
-	
-		
-			Typ des Requestobjekts für eine Änderung von Inkassodaten
-		
-		
-			
-				
-					
-						
-							
-								Die Id des Vertrag als ObjektId (VertragsID des OMDS-Datensatzes)
-							
-						
-						
-						
-					
-				
-			
-		
-	
-	
-		
-			Typ des Response für eine Änderung von Inkassodaten
-		
-		
-			
-				
-					
-						
-							
-								ObjektId des Vertrags bzw. Polizzennr.
-							
-						
-						
-						
-						
-							
-								Prämien die für diesen Produktbaustein verlangt werden
-							
-						
-						
-							
-								Prämien die für diesen Produktbaustein verlangt werden
-							
-						
-					
-				
-			
-		
-	
-	
-		
-			
-			
-				
-					Prämie nach Zahlweise, die für diesen Vertrag verlangt werden
-				
-			
-		
-	
-	
-		
-			
-			
-			
-				
-					
-				
-			
-			
-				
-					
-					
-					
-					
-						
-							
-								
-							
-						
-					
-					
-						
-							
-								
-							
-						
-					
-					
-						
-							
-								
-							
-						
-					
-				
-			
-		
-	
-
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON4_Partner.xsd b/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON4_Partner.xsd
deleted file mode 100644
index 068032ca..00000000
--- a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON4_Partner.xsd
+++ /dev/null
@@ -1,377 +0,0 @@
-
-
-	
-	
-	
-	
-		
-			Requesttyp um aktuelle Partnerdaten zu beziehen
-		
-		
-			
-				
-					
-					
-						
-							Die Id der Person
-						
-					
-				
-			
-		
-	
-	
-		
-			Responsetyp um aktuelle Partnerdaten zu beziehen
-		
-		
-			
-				
-					
-				
-			
-		
-	
-	
-		
-			Request um aktuelle Partnerdaten zu beziehen
-		
-	
-	
-		
-			Response um aktuelle Partnerdaten zu beziehen
-		
-	
-	
-		
-			Request bei der Überprüfung einer Adresse
-		
-	
-	
-		
-			Response bei der Überprüfung einer Adresse
-		
-	
-	
-		
-			Requesttyp um eine Adresse zu ueberprüfen
-		
-		
-			
-				
-					
-				
-			
-		
-	
-	
-		
-			Responsetyp der Überprüfung einer Adresse
-		
-		
-			
-				
-					
-					
-				
-			
-		
-	
-	
-		
-			Requestobjekt für die Änderungen von Adressen
-		
-	
-	
-		
-			für die Änderungen von Adressen
-		
-	
-	
-		
-			Typ des Requestobjekts für eine Änderung einer bestehenden Adresse
-		
-		
-			
-				
-					
-						
-							Die Id des Partners. Sie kann die Personennr aus OMDS-Datensatz enthalten aber zusätzlich auf einen Ordnungsbegriff des Aufrufers und einer Referenz auf die Version
-						
-					
-					
-						
-							Optionaler Hinweistext mit Anmerkungen für den Sachbearbeiter
-						
-					
-					
-					
-					
-					
-					
-						
-							Verträge in denen die abweichende Zustelladresse entfernt bzw. mit der neuen Adresse des Partners überschrieben werden soll.
-						
-						
-							
-							
-						
-					
-				
-			
-		
-	
-	
-		
-			Typ des Response für eine Änderung, Löschung oder Neuanlage einer Adresse
-		
-		
-			
-				
-					
-						
-							Die neue Adresse
-						
-					
-					
-						
-							Liste der Vertäge, in denen der Partner in einer beliebigen Rolle enthalten ist und die von der Änderung der Partneradresse betroffen sind. Hier sind auch Verträge enthalten, deren abweichende Zustelladresse überschrieben wurde.
-						
-					
-					
-						
-							Verträge, in denen die alte Adresse als Risikoadresse enthalten ist und die nicht geändert wurden.
-						
-					
-					
-						
-							Weitere Personen, die an dieser Adresse vorhanden sind
-						
-					
-				
-			
-		
-	
-	
-		
-			Requestobjekt für die Änderungen von allgemeinen Personendaten
-		
-	
-	
-		
-			für die Änderungen von allgemeinen Personendaten
-		
-	
-	
-		
-			Typ des Requestobjekts für eine Änderung der allgemeinen Personendaten
-		
-		
-			
-				
-					
-						
-							Personennr als ObjektId
-						
-					
-					
-						
-							Optionaler Hinweistext mit Anmerkungen für den Sachbearbeiter
-						
-					
-					
-						
-						
-					
-					
-					
-				
-			
-		
-	
-	
-		
-			Typ des Response für eine Änderung der allgemeinen Personendaten
-		
-		
-			
-				
-					
-						
-							Die geänderte Person
-						
-					
-					
-						
-							Die durch die Änderung der Person betroffenen Entitäten
-						
-						
-							
-								
-								
-							
-						
-					
-				
-			
-		
-	
-	
-		
-			Requestobjekt für die Änderungen von Kommunikationsverbindungen
-		
-	
-	
-		
-			Responseobjekte für die Änderungen von Kommunikationsverbindungen
-		
-		
-			
-				
-			
-		
-	
-	
-		
-			Typ des Requestobjekts für eine Änderung einer bestehenden Kommunikationsverbindung
-		
-		
-			
-				
-					
-						
-							Die Personennr als ObjektId
-						
-					
-					
-						
-							
-								
-									ObjektId der bisherigen Kommunikationsverbindung
-								
-							
-							
-						
-						
-					
-					
-					
-				
-			
-		
-	
-	
-		
-			Typ des Response für eine Änderung, Löschung oder Neuanlage einer Kommunikationsverbindung
-		
-		
-			
-				
-					
-						
-							Die geänderte Person
-						
-					
-				
-			
-		
-	
-	
-		
-			Requestobjekt für die Neuanlage von Kommunikationsverbindungen
-		
-	
-	
-		
-			für die Neuanlage von Kommunikationsverbindungen
-		
-	
-	
-		
-			Typ des Requestobjekts für Neuanlage einer Kommunikationsverbindung
-		
-		
-			
-				
-					
-						
-							Die Personennr in einer ObjektId
-						
-					
-					
-						
-						
-					
-					
-				
-			
-		
-	
-	
-		
-			Typ des Response für eine Änderung, Löschung oder Neuanlage einer Kommunikationsverbindung
-		
-		
-			
-				
-					
-						
-							Die Person nach hinzufügen der Kommunikationsverbindung
-						
-					
-				
-			
-		
-	
-	
-		
-			Requestobjekt für die Löschung von Kommunikationsverbindungen
-		
-	
-	
-		
-			Reponseobjekt für die Löschung von Kommunikationsverbindungen
-		
-	
-	
-		
-			Typ des Requestobjekts für die Löschung einer Kommunikationsverbindung
-		
-		
-			
-				
-					
-						
-							Die Personennr als ObjektId
-						
-					
-					
-						
-							
-								Die ObjektId der zu löschenden Kommunikationsverbindung
-							
-						
-						
-							
-								Die Daten der zu löschenden Kommunikationsverbindung
-							
-						
-					
-					
-				
-			
-		
-	
-	
-		
-			Typ des Response für eine Löschung einer Kommunikationsverbindung
-		
-		
-			
-				
-					
-				
-			
-		
-	
-
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON7_Schaden.xsd b/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON7_Schaden.xsd
index 40c0000f..e7714d7d 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON7_Schaden.xsd
+++ b/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON7_Schaden.xsd
@@ -1,5 +1,4 @@
 
-
 
 	
 	
@@ -760,16 +759,6 @@
 			Abstrakter Typ fuer die Erweiterung von Rollen um Elemente, die nicht im Standard enthalten sind
 		
 	
-	
-		
-			Abstrakter Typ fuer die Erweiterung von Anfragen zu Deckungsauskünften mit Datentypen, die nicht im Standard halten sind
-		
-	
-	
-		
-			Abstrakter Typ fuer die Erweiterung des Service zur Belegeinreichung mit Datentypen, die nicht im Standard halten sind
-		
-	
 	
 		
 			Typ für die Übermittlung von Kontaktdaten eines Sachbearbeiters
@@ -787,139 +776,4 @@
 		
 		
 	
-	
-		
-			Request zum Einholen einer Deckungsauskunft
-		
-		
-			
-				
-					
-						
-							
-								Angaben zum Versicherungsnehmer
-							
-						
-						
-							
-								Die Polizzennummmer
-							
-						
-						
-							
-								Die OMDS VertragsID der zu ersetzenden Polizze
-							
-						
-						
-							
-								Angaben zum Versicherten Interesse, z.B. die FIN eines Kfz.
-							
-						
-						
-							
-								Ein Code für die Eigenschaft, die abgefragt werden soll.
-							
-						
-						
-					
-				
-			
-		
-	
-	
-		
-			Response einer Deckungsauskunft
-		
-		
-			
-				
-					
-						
-							
-								Angaben zum Versicherungsnehmer
-							
-						
-						
-							
-								Die Polizzennummmer
-							
-						
-						
-							
-								Die OMDS VertragsID der zu ersetzenden Polizze
-							
-						
-						
-							
-								Angaben zum Versicherten Interesse, z.B. die FIN eines Kfz.
-							
-						
-						
-						
-							
-								
-									
-									
-								
-							
-						
-					
-				
-			
-		
-	
-	
-		
-			Request zur Einreichung eines Belegs
-		
-		
-			
-				
-					
-						
-							
-								Die Polizzennr des Vertrags, auf dessen Grundlage der Betrag erstattet werden soll.
-							
-						
-						
-							
-								Optional die OMDS VertragsID der zu ersetzenden Polizze
-							
-						
-						
-							
-								Ein Betrag, der erstattet werden soll
-							
-						
-						
-							
-								Optional ein Grund oder eine Zuatzinformation als Text
-							
-						
-						
-							
-								Die Beschreibung des Zahlwegs
-							
-						
-						
-							
-								Ein oder mehrere Dokumente als Beleg
-							
-						
-						
-					
-				
-			
-		
-	
-	
-		
-			Response einer Belegeinreichung
-		
-		
-			
-				
-			
-		
-	
 
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON7_SchadenErg.xsd b/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON7_SchadenErg.xsd
deleted file mode 100644
index a8c54e7c..00000000
--- a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON7_SchadenErg.xsd
+++ /dev/null
@@ -1,308 +0,0 @@
-
-
-	
-	
-	
-	
-	
-		
-			Requestobjekt einer einfachen Schadenmeldung.
-		
-	
-	
-		
-			Typ für die Durchführung einer einfachen Schadenmeldung
-		
-		
-			
-				
-					
-					
-						
-							Die Polizzennummer ist ein Kernelemet der Schadenmeldung. Sie kann sich aber auch aus dem Kontext ergeben, z.B. aus den beteiligten Personen und		der Art des Schadens.
-						
-					
-					
-					
-						
-							Der Zeitpunkt als Datum-Zeit-Objekt
-						
-					
-					
-						
-							Die Beschreibung des Schadenereignis als Text
-						
-					
-					
-					
-						
-							Hier wird bewusst nicht das OMDS-Objekt Schadenbeteiligter verwendet, da es bei der Meldung möglich sein muss, die Personendaten anzugeben und nicht nur auf Personen zu referenzieren.
-						
-					
-					
-					
-						
-							Der Schadenmelder ist hier ein wesentliches Merkmal für die fachliche Zuordnung des Schadens
-						
-					
-					
-					
-				
-			
-		
-	
-	
-		
-			Rückgabeobjekt bei einfacher Schadenmeldung
-		
-	
-	
-		
-			Anworttyp beim Erzeugen einer einfachen Schadenmeldung
-		
-		
-			
-				
-					
-						
-							Wenn kein Fehler aufgetreten ist, ist dieses Element vorhanden und enthält zumindest eine GeschäftsfallId. 
-						
-					
-				
-			
-		
-	
-	
-		Beobachtung Zustand Schadenmeldung
-	
-	
-		
-			Request um alle geänderten Schäden eines Zeitraums zu erhalten
-		
-	
-	
-		
-			Typ für Request um Liste mit Änderungen an Schäden zu erhalten
-		
-		
-			
-			
-			
-				
-					Zeitraum in welchem das Schadensereignis eingetreten ist.
-				
-			
-			
-				
-					Maximale Anzahl von Ergebnissen, die zurück gegeben werden sollen
-				
-			
-			
-				
-					Offset in der Ergebnisliste
-				
-			
-			
-				
-					
-						
-					
-				
-			
-		
-	
-	
-		
-			Response mit einer Liste von Schaeden, die sich im abgefragten Zeitraum geändert haben
-		
-	
-	
-		
-			Typ für Response mit einer Liste von geänderten Schäden für einen bestimmten Zeitraum
-		
-		
-			
-			
-		
-	
-	
-		
-			
-				
-					Der Offset in der Ergebnisliste
-				
-			
-			
-				
-					Tatsächliche Maximalanzahl der Ergebnisse, die der Provider auf eine Anfrage zurück gibt. Beispiel: Consumer fordert 1000 Ergebnisse an, Provider liefert aber maximal 100 zurück. In diesem Fall würde hier 100 zurückgegeben. 
-				
-			
-			
-				
-					Gesamtzahl der Elemente in der Ergebnisliste unter dem gewählten Filter
-				
-			
-			
-		
-	
-	
-		
-			Objekt, welches GeschäftsfallId und Schadennummer sowie den Bearbeitungsstand enthält
-		
-		
-			
-				
-					
-					
-					
-						
-							Ordnungsbegriff des Schadenmelders auf Ebene des Schadenereignis
-						
-					
-					
-				
-			
-		
-	
-	
-		
-			
-			
-			
-			
-				
-					Anhand der Schadenzuordnung kann man erkennen, um welche Schadensparte es sich handelt.
-				
-			
-			
-		
-	
-	
-		
-			Request um eine Liste mit Schadenevents eines Zeitraums zu erhalten
-		
-	
-	
-		
-			Typ für Request um Liste mit Schadens-Events zu erhalten
-		
-		
-			
-			
-			
-				
-					Mögliche Einschränkung auf  Polizzennummern
-				
-			
-			
-				
-					Zeitraum in welchem das Schadensereignis eingetreten ist.
-				
-			
-			
-				
-					Maximale Anzahl von Ergebnissen, die zurück gegeben werden sollen
-				
-			
-			
-				
-					Offset in der Ergebnisliste
-				
-			
-			
-				
-					
-						
-					
-				
-			
-		
-	
-	
-		
-			Response mit eine Liste von Schadens-Events für einen bestimmten Zeitraum
-		
-	
-	
-		
-			Typ für Response mit einer Liste von Schadensevents für einen bestimmten Zeitraum
-		
-		
-			
-			
-		
-	
-	
-		
-			
-				
-					Der Offset in der Ergebnisliste
-				
-			
-			
-				
-					Tatsächliche Maximalanzahl der Ergebnisse, die der Provider auf eine Anfrage zurück gibt. Beispiel: Consumer fordert 1000 Ergebnisse an, Provider liefert aber maximal 100 zurück. In diesem Fall würde hier 100 zurückgegeben. 
-				
-			
-			
-				
-					Gesamtzahl der Elemente in der Ergebnisliste unter dem gewählten Filter
-				
-			
-			
-		
-	
-	
-	
-		
-			Requestobjekt, welches die Zusammenlegung von Schadenfällen bekannt gibt
-		
-	
-	
-		
-			Typ des Request, wenn die Zusammenlegung von Schadenfällen bekanntgegeben wird
-		
-		
-			
-			
-		
-	
-	
-		
-			Responseobjekt, wenn die Veränderung des Status von Schadenereignissen bekanntgegeben wurde
-		
-	
-	
-		
-			Typ des Response, wenn die Zusammenlegung von Schadenfällen bekanntgegeben wurde
-		
-	
-	
-		
-			Requestobjekt, welches den Eintritt eines Schadenereignisses kommuniziert
-		
-	
-	
-		
-			Objekttyp mit welchem der Eintritt eines Schadenereignisses kommuniziert wird
-		
-		
-			
-			
-			
-			
-		
-	
-	
-		
-			Responseobjekt, wenn der Eintritt eines Schadenereignisses kommuniziert wurde
-		
-	
-	
-		
-			Typ des Response, wenn der Eintritt eines Schadenereignisses kommuniziert wurde
-		
-	
-