add UR Client version 5

remove UR Client version 1
change egovutils version to 1.0.5

118 files changed, 9682 insertions, 2770 deletions

diff --git a/src/main/java/at/gv/util/client/ur/URClient.java b/src/main/java/at/gv/util/client/ur/URClient.java
deleted file mode 100644
index 4988a0f..0000000
--- a/src/main/java/at/gv/util/client/ur/URClient.java
+++ /dev/null
@@ -1,307 +0,0 @@
-package at.gv.util.client.ur;
-
-import java.math.BigInteger;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-import javax.net.ssl.SSLContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.Handler;
-
-import org.apache.commons.lang.RandomStringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-import at.gv.util.xsd.ur.xmlsw.ResultCriteriaType;
-import at.gv.util.xsd.ur.xmlsw.ResultRecord;
-import at.gv.util.xsd.ur.xmlsw.SearchByExampleType;
-import at.gv.util.xsd.ur.xmlsw.SearchCriteriaType;
-import at.gv.util.xsd.ur.xmlsw.SearchResponseType;
-import at.gv.util.DOMUtils;
-import at.gv.util.LaxHostNameVerifier;
-import at.gv.util.LoggingHandler;
-import at.gv.util.MiscUtil;
-import at.gv.util.client.szr.SZRSOAPHandler;
-import at.gv.util.config.EgovUtilConfiguration;
-import at.gv.util.ex.EgovUtilException;
-import at.gv.util.wsdl.ur.URSuche;
-import at.gv.util.wsdl.ur.URSucheService;
-import at.gv.util.xsd.szr.pvp.PvpTokenType;
-import at.gv.util.xsd.ur.pd.IdentificationType;
-import at.gv.util.xsd.ur.pd.NichtNatuerlichePersonTyp;
-import at.gv.util.xsd.ur.pd.PersonenDatenTyp;
-import at.gv.util.xsd.ur.search.Funktion;
-import at.gv.util.xsd.ur.search.ObjectFactory;
-import at.gv.util.xsd.ur.search.SucheUnternehmenNachBpkRequest;
-import at.gv.util.xsd.ur.search.SucheUnternehmenNachIdsRequest;
-import at.gv.util.xsd.ur.search.SucheUnternehmenRequest;
-import at.gv.util.xsd.ur.search.SucheUnternehmensdaten;
-
-import com.sun.xml.ws.developer.JAXWSProperties;
-
-public class URClient {
-
-	@Resource
-  WebServiceContext wsContext;
-
-	private EgovUtilConfiguration config = null;
-	private Logger log = LoggerFactory.getLogger(URClient.class);
-	private boolean logEnabled = true;
-	private boolean evbCheck = true;
-	
-	private URSuche urSuche = null;
-	
-	private final static String version = "V2.0";
-	private List<String> allowedKeys = null;
-	
-	private final static String EVB = "einzelvertretungsbefugt";
-	
-	public URClient(EgovUtilConfiguration config, List<String> allowedKeys, boolean evbCheck, boolean logEnabled) throws EgovUtilException {
-		MiscUtil.assertNotNull(config, "config");
-		this.config = config;
-		this.allowedKeys = allowedKeys;
-		this.logEnabled = logEnabled;
-		this.evbCheck = evbCheck;
-		initialize();
-	}
-
-	public List<NichtNatuerlichePersonTyp> searchByBpk(String vzbpk) throws URClientException {
-		SucheUnternehmenNachBpkRequest request = new SucheUnternehmenNachBpkRequest();
-		ObjectFactory of = new ObjectFactory();
-		request.setVersion(version);
-		request.setBpkWTUREncoded(vzbpk);
-		List<ResultRecord> results = searchByExample(of.createSucheUnternehmenNachBpkRequest(request), -1);
-		return getNichtNatuerlichePersonen(results);
-	}
-
-	public List<NichtNatuerlichePersonTyp> searchByRegisterNumber(String number, String type, int maxResults) throws URClientException {
-		SucheUnternehmenRequest request = new SucheUnternehmenRequest();
-		ObjectFactory of = new ObjectFactory();
-		request.setVersion(version);
-		SucheUnternehmensdaten sud = new SucheUnternehmensdaten();
-		sud.setId(number);
-		sud.setIdArt(type);
-		request.setUnternehmensdaten(sud);
-		List<ResultRecord> results = searchByExample(of.createSucheUnternehmenRequest(request), maxResults);
-		return getNichtNatuerlichePersonen(results);
-	}
-	
-	public List<NichtNatuerlichePersonTyp> searchByName(String name, String plz, int maxResults) throws URClientException {
-		SucheUnternehmenRequest request = new SucheUnternehmenRequest();
-		ObjectFactory of = new ObjectFactory();
-		request.setVersion(version);
-		SucheUnternehmensdaten sud = new SucheUnternehmensdaten();
-		sud.setUntName(name);
-		if (MiscUtil.isNotEmpty(plz)) {
-			sud.setPlz(plz);
-		}
-		request.setUnternehmensdaten(sud);
-		List<ResultRecord> results = searchByExample(of.createSucheUnternehmenRequest(request), maxResults);
-		return getNichtNatuerlichePersonen(results);
-	}
-
-	@SuppressWarnings("unchecked")
-  private List<NichtNatuerlichePersonTyp> getNichtNatuerlichePersonen(List<ResultRecord> records) throws URClientException {
-		
-		if (records == null || records.size() == 0) {
-			return new ArrayList<NichtNatuerlichePersonTyp>();
-		}
-		List<String> kurs = new ArrayList<String>();
-		for (ResultRecord rr : records) {
-			PersonenDatenTyp pdt = ((JAXBElement<PersonenDatenTyp>) rr.getAny().get(0)).getValue();
-			NichtNatuerlichePersonTyp nnpt = ((JAXBElement<NichtNatuerlichePersonTyp>) pdt.getPerson()).getValue();
-			for (IdentificationType idt : nnpt.getIdentification()) {
-				if ("KUR".equals(idt.getType())) {
-					
-					// check evb
-					if (this.evbCheck) {
-						if (isEVB(pdt)) {
-							kurs.add(idt.getValue().getValue());
-							log.debug("EVB found for " + nnpt.getVollerName());
-						} else {
-							log.debug("Not EVB for " + nnpt.getVollerName());
-						}
-					} else {
-						kurs.add(idt.getValue().getValue());
-					}
-				}
-			}
-		}
-		return getNichtNatuerlichePerson(kurs);
-	}
-	
-	// check if person is einzelvertretungsbefugt
-	public static boolean isEVB(PersonenDatenTyp pdt) {
-		boolean isEVB = false;
-		for (Object content : pdt.getZusatzdaten().getContent()) {
-			if (content instanceof JAXBElement) {
-				JAXBElement jxb = (JAXBElement) content;
-				if (jxb.getDeclaredType().equals(PersonenDatenTyp.class)) {
-					PersonenDatenTyp pd = (PersonenDatenTyp) jxb.getValue();
-					if (pd.getZusatzdaten() != null) {
-						for (Object c2 : pd.getZusatzdaten().getContent()) {
-							
-							if (c2 instanceof Element) {
-								Element fktElement = (Element) c2;
-								if ("Funktion".equals(fktElement.getLocalName())) {
-									NodeList nl = fktElement.getElementsByTagNameNS("http://statistik.at/namespace/ur/stammdaten/1#", "Vertretungsbefugnis");
-									if (nl.getLength() > 0) {
-										String vbt = DOMUtils.getText(nl.item(0)); 
-										if (EVB.equals(vbt)) {
-											return true;
-										}
-									}
-								}
-							} else if (c2 instanceof JAXBElement) {
-								JAXBElement jxb2= (JAXBElement) c2;
-								if (jxb2.getDeclaredType().equals(Funktion.class)) {
-									Funktion fkt = (Funktion) jxb2.getValue();
-									if (EVB.equals(fkt.getVertretungsbefugnis())) {
-										return true;
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		return false;
-	}
-	
-	// get list of legal persons
-	@SuppressWarnings("unchecked")
-  public List<NichtNatuerlichePersonTyp> getNichtNatuerlichePerson(List<String> ids) throws URClientException {
-		SucheUnternehmenNachIdsRequest request = new SucheUnternehmenNachIdsRequest();
-		ObjectFactory of = new ObjectFactory();
-		request.getKur().addAll(ids);
-		List<ResultRecord> results = searchByExample(of.createSucheUnternehmenNachIdsRequest(request), -1);
-		if (results.size() == 0) {
-			return new ArrayList<NichtNatuerlichePersonTyp>();
-		}
-		List<NichtNatuerlichePersonTyp> result = new ArrayList<NichtNatuerlichePersonTyp>();
-		for (ResultRecord rr : results) {
-			PersonenDatenTyp pdt = ((JAXBElement<PersonenDatenTyp>)rr.getAny().get(0)).getValue();
-			
-			NichtNatuerlichePersonTyp nnpt = ((JAXBElement<NichtNatuerlichePersonTyp>) pdt.getPerson()).getValue();
-			
-			// check if we have to filter out
-			if (this.allowedKeys == null || this.allowedKeys.size() == 0) {
-				result.add(nnpt);
-			} else {
-				boolean hasKey = false;
-				for (IdentificationType idt : nnpt.getIdentification()) {
-					if (this.allowedKeys.contains(idt.getType())) {
-						hasKey = true;
-					}
-				}
-				if (hasKey) {
-					result.add(nnpt);
-				}
-			}
-			
-		}
-		return result;
-	}
-	
-	// search by example
-	public List<ResultRecord> searchByExample(Object request, int maxResults) throws URClientException {
-		SearchByExampleType body = new SearchByExampleType();
-		body.setSearchRequestId(createURSearchId());
-		ResultCriteriaType rc = new ResultCriteriaType();
-		// set only value of max results if > 0
-		if (maxResults > 0) {
-			rc.setMaxRecords(BigInteger.valueOf(maxResults));
-		}
-		body.setResultCriteria(rc);
-		SearchCriteriaType sct = new SearchCriteriaType();
-		sct.getAny().add(request);
-		body.setSearchCriteria(sct);
-		SearchResponseType srt = this.urSuche.searchByExample(body);
-		
-		// check number of records found
-//		int numFound = 0;
-//		if (srt.getResultInfo() != null) {
-//			numFound = srt.getResultInfo().getReturnedRecords().intValue();
-//		}
-		// check whether we have an error message
-		if (srt.getMessage() != null) {
-			if (srt.getMessage().getCode().intValue() != 2040) { // 2040 = no records found
-				throw new URClientException(srt.getMessage().getReason().get(0), srt.getMessage().getCode().intValue());
-			}
-		}
-		if (srt.getResultRecords() == null || srt.getResultRecords().getResultRecord() == null) {
-			return new ArrayList<ResultRecord>();
-		}
-		return srt.getResultRecords().getResultRecord();	
-	}
-	
-  @SuppressWarnings({ "rawtypes", "unchecked" })
-	private void initialize() throws EgovUtilException {
-		URL url = URClient.class.getResource("/wsdl/ur/URSucheService.wsdl");
-		URSucheService urService = null;
-		String urURL = null;
-		urService = new URSucheService(url, new QName("urn:at:statistik:udb:ws", "URSucheService"));
-		urSuche = urService.getURSucheService();
-		if (config.isURTestEnvironment()) {
-			log.trace("Initializing UR test configuration.");
-			urURL = config.getURTestEnvironmentURL(); 
-		} else {
-			log.trace("Initializing UR productive configuration.");
-			urURL = config.getURProductionEnvironmentURL();
-		}
-		
-		log.trace("UR connection URL: " + urURL);
-		BindingProvider bindingProvider = (BindingProvider) urSuche;
-		Map<String, Object> requestContext = bindingProvider.getRequestContext();
-  	requestContext.put(
-        BindingProvider.ENDPOINT_ADDRESS_PROPERTY, urURL);
-		
-		log.trace("Adding JAX-WS request/response trace handler.");
-  	List<Handler> handlerList = bindingProvider.getBinding().getHandlerChain();
-  	if (handlerList == null) {
-      handlerList = new ArrayList();
-    }
-    LoggingHandler loggingHandler = new LoggingHandler();
-    if (this.logEnabled) {
-    	handlerList.add(loggingHandler);
-    }
-    log.trace("Adding WS-Security Header handler.");
-    PvpTokenType pvpToken = config.getURPVPToken();
-	  SZRSOAPHandler szrSOAPHandler = new SZRSOAPHandler();
-    szrSOAPHandler.configure(pvpToken);
-    handlerList.add(szrSOAPHandler);
-    bindingProvider.getBinding().setHandlerChain(handlerList);
-
-    // check for ssl
-		if (urURL.toLowerCase().startsWith("https")) {
-    	log.trace("Using ssl for SZR client request.");
-    	SSLContext sslContext = this.config.getURsslConfiguration().getSSLContext(false);
-    	if (sslContext == null) {
-				throw new EgovUtilException("SSL context from configuration is empty. Please configure an SSL context in the configuration first.");
-			}
-			requestContext.put(JAXWSProperties.SSL_SOCKET_FACTORY, sslContext.getSocketFactory());
-			
-			// check for lax hostname
-      if (this.config.getURsslConfiguration().useLaxHostNameVerifier()) {
-      	log.trace("LaxHostnameVerifier enabled. This setting is not recommended to use.");
-      	requestContext.put(JAXWSProperties.HOSTNAME_VERIFIER, new LaxHostNameVerifier());
-      }
-    }
-	}
-  
-  private String createURSearchId() {
-  	return RandomStringUtils.randomAlphanumeric(8) + "-" + 
-  			RandomStringUtils.randomAlphanumeric(4) + "-" + RandomStringUtils.randomAlphanumeric(4) + "-" + 
-  			RandomStringUtils.randomAlphanumeric(12);
-  }
-  
-}
diff --git a/src/main/java/at/gv/util/client/ur_V5/URClient.java b/src/main/java/at/gv/util/client/ur_V5/URClient.java
new file mode 100644
index 0000000..e39b18d
--- /dev/null
+++ b/src/main/java/at/gv/util/client/ur_V5/URClient.java
@@ -0,0 +1,519 @@
+package at.gv.util.client.ur_V5;
+
+import java.math.BigInteger;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.GregorianCalendar;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.Resource;
+import javax.net.ssl.SSLContext;
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeConstants;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.Handler;
+
+import org.apache.commons.lang.RandomStringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import at.gv.util.xsd.ur_V5.xmlsw.ExtraResultCriteria;
+import at.gv.util.xsd.ur_V5.xmlsw.ResultCriteriaType;
+import at.gv.util.xsd.ur_V5.xmlsw.ResultRecord;
+import at.gv.util.xsd.ur_V5.xmlsw.SearchByExampleType;
+import at.gv.util.xsd.ur_V5.xmlsw.SearchCriteriaType;
+import at.gv.util.xsd.ur_V5.xmlsw.SearchResponseType;
+import at.gv.util.LaxHostNameVerifier;
+import at.gv.util.LoggingHandler;
+import at.gv.util.MiscUtil;
+import at.gv.util.client.szr.SZRSOAPHandler;
+import at.gv.util.config.EgovUtilConfiguration;
+import at.gv.util.ex.EgovUtilException;
+import at.gv.util.wsdl.ur_V5.URSuche;
+import at.gv.util.wsdl.ur_V5.URSucheService;
+import at.gv.util.wsdl.ur_V5.XmlSwFault;
+import at.gv.util.xsd.szr.pvp.PvpTokenType;
+import at.gv.util.xsd.ur_V5.pd.IdentificationType;
+import at.gv.util.xsd.ur_V5.pd.NichtNatuerlichePersonTyp;
+import at.gv.util.xsd.ur_V5.pd.PersonenDatenTyp;
+import at.gv.util.xsd.ur_V5.pd.PersonenDatenTyp.Zusatzdaten;
+import at.gv.util.xsd.ur_V5.pd.PersonenDatenZusatzdatenTyp;
+import at.gv.util.xsd.ur_V5.pd.ZusatzdatenPersonenTyp;
+import at.gv.util.xsd.ur_V5.search.BestandszeitraumVollzug;
+import at.gv.util.xsd.ur_V5.search.FunktionVollzug;
+import at.gv.util.xsd.ur_V5.search.SucheUnternehmenNachBpkRequest;
+import at.gv.util.xsd.ur_V5.search.SucheUnternehmenRequest;
+import at.gv.util.xsd.ur_V5.search.SucheUnternehmensdaten;
+import at.gv.util.xsd.ur_V5.simpletypes.EvbStatusTyp;
+
+import com.sun.xml.ws.developer.JAXWSProperties;
+
+public class URClient {
+
+	@Resource
+  WebServiceContext wsContext;
+
+	private EgovUtilConfiguration config = null;
+	private Logger log = LoggerFactory.getLogger(URClient.class);
+	private boolean logEnabled = true;
+	private boolean evbCheck = true;
+	private URSuche urSuche = null;
+	
+	private final static String version = "V5.0";
+	private List<String> allowedKeys = null;
+	private HashSet<String> allowedERsBKeys = null;
+	
+	public URClient(EgovUtilConfiguration config, List<String> allowedKeys, HashSet<String> ersbkeys, boolean evbCheck, boolean logEnabled) throws EgovUtilException {
+		MiscUtil.assertNotNull(config, "config");
+		this.config = config;
+		this.allowedKeys = allowedKeys;
+		this.logEnabled = logEnabled;
+		this.evbCheck = evbCheck;
+		this.allowedERsBKeys = ersbkeys;
+		
+		initialize();
+	}
+
+	public List<URSearchResult> searchByBpk(String vzbpk) throws URClientException {
+		SucheUnternehmenNachBpkRequest request = new SucheUnternehmenNachBpkRequest();
+		request.setVersion(version);
+		request.setBpkWTUREncoded(vzbpk);
+		
+		request.setNurAktive(true);
+		
+		SearchCriteriaType sct = new SearchCriteriaType();
+		sct.setSucheUnternehmenNachBpkRequest(request);
+		
+		List<ResultRecord> results = searchByExample(sct, -1);
+		return getURSearchResult(results);
+	}
+
+	public List<NichtNatuerlichePersonTyp> searchByRegisterNumber(String number, String type, int maxResults) throws URClientException {
+		SucheUnternehmenRequest request = new SucheUnternehmenRequest();
+		request.setVersion(version);
+		SucheUnternehmensdaten sud = new SucheUnternehmensdaten();
+		sud.setId(number);
+		sud.setIdArt(type);
+		request.setUnternehmensdaten(sud);
+		
+		SearchCriteriaType sct = new SearchCriteriaType();
+		sct.setSucheUnternehmenRequest(request);
+		
+		List<ResultRecord> results = searchByExample(sct, maxResults);
+		return getNichtNatuerlichePersonen(results);
+	}
+	
+	public List<NichtNatuerlichePersonTyp> searchByName(String name, String plz, int maxResults) throws URClientException {
+		SucheUnternehmenRequest request = new SucheUnternehmenRequest();
+		request.setVersion(version);
+		SucheUnternehmensdaten sud = new SucheUnternehmensdaten();
+		sud.setUntName(name);
+		if (MiscUtil.isNotEmpty(plz)) {
+			sud.setPlz(plz);
+		}
+		request.setUnternehmensdaten(sud);
+		
+		SearchCriteriaType sct = new SearchCriteriaType();
+		sct.setSucheUnternehmenRequest(request);
+		
+		List<ResultRecord> results = searchByExample(sct, maxResults);
+		return getNichtNatuerlichePersonen(results);
+	}
+	
+	private List<URSearchResult> getURSearchResult(List<ResultRecord> records) throws URClientException {
+		
+		if (records == null || records.size() == 0) {
+			return new ArrayList<URSearchResult>();
+		}
+		
+		List<URSearchResult> result = new ArrayList<URSearchResult>();
+		
+		log.debug("UR SOAP response with " + records.size() + "records");
+		
+		for (ResultRecord rr : records) {
+			PersonenDatenTyp pdt = rr.getPersonenDaten();
+			NichtNatuerlichePersonTyp nnpt =  pdt.getNichtNatuerlichePerson();		
+			Zusatzdaten zsd = pdt.getZusatzdaten();
+			
+			//check validity era
+			boolean check_valera = isInValidityEra(zsd);
+			
+			//check allowed keys
+			boolean check_allowedkeys = hasAllowedKeys(nnpt.getIdentification());
+			
+			//ERsB function codes
+			List<String> ersbcode = hasAllowedEVBCode(zsd);
+			
+			//check EVB
+			boolean check_EVB = isEVB(zsd);
+			
+			if (check_valera && check_allowedkeys && (check_EVB || !ersbcode.isEmpty())) {
+				result.add(new URSearchResult(nnpt, ersbcode, check_EVB));
+			}
+			else {
+				log.debug("No validity for " + nnpt.getRest().get(0).getValue()
+						+ "(Validity era=" + String.valueOf(check_valera)
+						+ " Allowed Keys="+ String.valueOf(check_allowedkeys) 
+						+ " EVB check=" + String.valueOf(check_EVB) +")");  				
+			}
+		}
+		
+		return result;
+	}
+	
+	private List<NichtNatuerlichePersonTyp> getNichtNatuerlichePersonen(List<ResultRecord> records) throws URClientException {
+		
+		if (records == null || records.size() == 0) {
+			return new ArrayList<NichtNatuerlichePersonTyp>();
+		}
+		
+		List<NichtNatuerlichePersonTyp> result = new ArrayList<NichtNatuerlichePersonTyp>();
+		
+		log.debug("UR SOAP response with " + records.size() + "records");
+		
+		for (ResultRecord rr : records) {
+			PersonenDatenTyp pdt = rr.getPersonenDaten();
+			NichtNatuerlichePersonTyp nnpt =  pdt.getNichtNatuerlichePerson();		
+			Zusatzdaten zsd = pdt.getZusatzdaten();
+			
+			//check validity era
+			boolean check_valera = isInValidityEra(zsd);
+			
+			//check allowed keys
+			boolean check_allowedkeys = hasAllowedKeys(nnpt.getIdentification());
+						
+			//check EVB
+			boolean check_EVB = isEVB(zsd);
+			
+			if (check_valera && check_allowedkeys && check_EVB) {
+				result.add(nnpt);
+			}
+			else {
+				log.debug("No validity for " + nnpt.getRest().get(0).getValue()
+						+ "(Validity era=" + String.valueOf(check_valera)
+						+ " Allowed Keys="+ String.valueOf(check_allowedkeys) 
+						+ " EVB check=" + String.valueOf(check_EVB) +")");  				
+			}
+		}
+		
+		return result;
+	}
+	
+	private List<String> hasAllowedEVBCode(Zusatzdaten zsd) {
+		
+		Set<String> set = new HashSet<String>();
+		
+		if ((this.allowedERsBKeys == null || this.allowedERsBKeys.size() == 0)) {
+			return new ArrayList<String>();
+			
+		} else {
+			
+			if(zsd != null) {
+				List<PersonenDatenZusatzdatenTyp> pd = zsd.getPersonenDaten();
+				for (PersonenDatenZusatzdatenTyp pdzd : pd) {
+					
+					ZusatzdatenPersonenTyp zusatzdaten = pdzd.getZusatzdaten();
+					if (zusatzdaten != null) {
+					
+						List<FunktionVollzug> function = zusatzdaten.getFunktion();
+						for (FunktionVollzug funct : function) {
+						
+							if (this.allowedERsBKeys.contains(String.valueOf(funct.getFktName())))
+							
+								set.add(String.valueOf(funct.getFktName()));
+						}	
+					}
+				}
+			}
+			
+			return new ArrayList<String>(set);
+		}
+	}
+	
+	//check if corporation is in validity era
+	//TODO: check correctness of TRUE if no validity era is defined!!!
+	private boolean isInValidityEra(Zusatzdaten zsd) throws URClientException {	
+		if(zsd != null) {
+			List<BestandszeitraumVollzug> validityera = zsd.getBestandszeitraum();
+			for ( BestandszeitraumVollzug valera_el : validityera) {
+				try {
+					GregorianCalendar now = new GregorianCalendar();
+					XMLGregorianCalendar xmldate = DatatypeFactory.newInstance().newXMLGregorianCalendar(now);
+					
+					if ( !(valera_el.getBestandVon().compare(xmldate) == DatatypeConstants.LESSER 
+							&& valera_el.getBestandBis().compare(xmldate) == DatatypeConstants.GREATER) ) {
+						
+						log.debug("Corporation is not within the validity period");
+						return false;
+					}
+		
+				} catch (DatatypeConfigurationException e) {
+					log.warn("Internal error during date conversion", e);
+				}				
+			}
+		}
+		return true;
+	}
+	
+	// check if person is einzelvertretungsbefugt
+	private boolean isEVB(Zusatzdaten zsd) {
+		if (!this.evbCheck) {
+			return true;
+		}
+		else {
+			if(zsd != null) {
+				List<PersonenDatenZusatzdatenTyp> pd = zsd.getPersonenDaten();
+				for (PersonenDatenZusatzdatenTyp pdzd : pd) {
+			
+					if (pdzd.getZusatzdaten() != null) {
+						EvbStatusTyp evbstatus = pdzd.getZusatzdaten().getEvbStatus();
+						if (evbstatus!=null && evbstatus.equals(EvbStatusTyp.J)) {
+							return true;
+						}
+					}
+				}
+			}
+		}
+		return false;
+	}
+	
+	//check allowedKeys 
+	private boolean hasAllowedKeys(List<IdentificationType> list) throws URClientException {	
+		
+		if ((this.allowedKeys == null || this.allowedKeys.size() == 0)) {
+			return true;
+			
+		} else {
+			for (IdentificationType idt : list) {
+				if (this.allowedKeys.contains(idt.getType())) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+	
+	
+	
+	// search by example
+	public List<ResultRecord> searchByExample(SearchCriteriaType sct, int maxResults) throws URClientException {
+		
+
+		SearchByExampleType body = new SearchByExampleType();
+				
+		body.setSearchRequestId(createURSearchId());
+		ResultCriteriaType rc = new ResultCriteriaType();
+
+		log.debug("UR SOAP request with Id " + body.getSearchRequestId());
+		
+		// set only value of max results if > 0
+		if (maxResults > 0) {
+			rc.setMaxRecords(BigInteger.valueOf(maxResults));
+		}
+		
+		// set ExtraResultCriterias
+		ExtraResultCriteria ec = new ExtraResultCriteria();
+		ec.setErsbAttribute(true);
+		rc.setExtraResultCriteria(ec);
+		body.setResultCriteria(rc);
+				
+		body.setSearchCriteria(sct);
+				
+		//request UR service
+		SearchResponseType srt = null;
+		try {
+			srt = this.urSuche.searchByExample(body);
+			
+		} catch (javax.xml.ws.soap.SOAPFaultException e) {
+			//request secondary service
+			switchTOSecondarySystem(e);
+			try {			
+				srt = this.urSuche.searchByExample(body);
+				
+			} catch (XmlSwFault e1) {
+				
+				if (e1.getFaultInfo() != null) {			
+					throw new URClientException(e1.getFaultInfo().getHelp(), e1.getFaultInfo().getCode().intValue());
+					
+				} else {
+					throw new URClientException(e1.getMessage(), -1, e1);
+				}				
+			}
+							
+		} catch (com.sun.xml.ws.client.ClientTransportException e) {
+			//request secondary service
+			switchTOSecondarySystem(e);
+			
+			try {			
+				srt = this.urSuche.searchByExample(body);
+				
+			} catch (XmlSwFault e1) {
+				
+				if (e1.getFaultInfo() != null) {			
+					throw new URClientException(e1.getFaultInfo().getHelp(), e1.getFaultInfo().getCode().intValue());
+					
+				} else {
+					throw new URClientException(e1.getMessage(), -1, e1);
+				}				
+			}
+			
+		} catch (XmlSwFault e) {
+			
+			if (e.getFaultInfo() != null) {			
+				throw new URClientException(e.getFaultInfo().getHelp(), e.getFaultInfo().getCode().intValue());
+				
+			} else {
+				throw new URClientException(e.getMessage(), -1, e);
+			}
+			
+		}
+		
+		// check number of records found
+//		int numFound = 0;
+//		if (srt.getResultInfo() != null) {
+//			numFound = srt.getResultInfo().getReturnedRecords().intValue();
+//		}
+		// check whether we have an error message
+		if (srt.getMessage() != null) {
+			if (srt.getMessage().getCode().intValue() != 2040) { // 2040 = no records found
+				throw new URClientException(srt.getMessage().getReason().get(0), srt.getMessage().getCode().intValue());
+			}
+		}
+				
+		if (srt.getResultRecords() == null || srt.getResultRecords().getResultRecord() == null) {
+			return new ArrayList<ResultRecord>();
+		}
+		return srt.getResultRecords().getResultRecord();	
+	}
+	
+	private void switchTOSecondarySystem(Exception e) throws URClientException {
+		log.warn("Request primary UR service failed with error \"" + e.getMessage() +"\". " +
+				"Switch to secondary UR service.");
+		
+		String urURL = config.getURSecondaryProductionEnvironmentURL();
+		try {
+			setURServiceURL(urURL);
+			
+		} catch (EgovUtilException e1) {
+			log.error("Switch to secodary UR service FAILED!", e1);
+			throw new URClientException(e1.getMessage(), 0);
+		}
+	}
+	
+	private void setURServiceURL(String urURL) throws EgovUtilException {
+		// set UR Service URL
+		
+		log.trace("UR connection URL: " + urURL);
+		BindingProvider bindingProvider = (BindingProvider) urSuche;
+		Map<String, Object> requestContext = bindingProvider.getRequestContext();
+		requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, urURL);
+		
+	    //set HTTP Client Timeout (Default Timeout 60sec)
+	    //requestContext.put(JAXWSProperties.CONNECT_TIMEOUT, this.config.getHTTPRequestTimeout());
+		requestContext.put(JAXWSProperties.CONNECT_TIMEOUT, 15000);
+		
+		//check for ssl
+		if (urURL.toLowerCase().startsWith("https")) {
+			log.trace("Using ssl for SZR client request.");
+			SSLContext sslContext = this.config.getURsslConfiguration().getSSLContext(false);
+			if (sslContext == null) {
+				throw new EgovUtilException("SSL context from configuration is empty. Please configure an SSL context in the configuration first.");
+			}
+			requestContext.put(JAXWSProperties.SSL_SOCKET_FACTORY, sslContext.getSocketFactory());
+			
+			// check for lax hostname
+			if (this.config.getURsslConfiguration().useLaxHostNameVerifier()) {
+				log.trace("LaxHostnameVerifier enabled. This setting is not recommended to use.");
+				requestContext.put(JAXWSProperties.HOSTNAME_VERIFIER, new LaxHostNameVerifier());
+			}
+		}
+		
+	}
+	
+	
+  @SuppressWarnings({ "rawtypes", "unchecked" })
+	private void initialize() throws EgovUtilException {
+		URL url = URClient.class.getResource("/wsdl/ur_V5/URSucheService.wsdl");
+		URSucheService urService = null;
+		urService = new URSucheService(url, new QName("urn:at:statistik:ur:ws", "URSucheService"));
+		urSuche = urService.getURSucheService();
+		
+		BindingProvider bindingProvider = (BindingProvider) urSuche;
+		
+		//set service URLs
+		String urURL = null;
+		if (config.isURTestEnvironment()) {
+			log.trace("Initializing UR test configuration.");
+			urURL  = config.getURTestEnvironmentURL(); 
+		} else {
+			log.trace("Initializing UR productive configuration.");
+			urURL = config.getURProductionEnvironmentURL();
+		}
+		
+		setURServiceURL(urURL);
+		
+		log.trace("Adding JAX-WS request/response trace handler.");
+		List<Handler> handlerList = bindingProvider.getBinding().getHandlerChain();
+		if (handlerList == null) {
+			handlerList = new ArrayList();
+		}
+		
+		LoggingHandler loggingHandler = new LoggingHandler();
+		if (this.logEnabled) {
+			handlerList.add(loggingHandler);
+		}
+		
+		log.trace("Adding WS-Security Header handler.");
+		PvpTokenType pvpToken = config.getURPVPToken();
+		SZRSOAPHandler szrSOAPHandler = new SZRSOAPHandler();
+		szrSOAPHandler.configure(pvpToken);
+		handlerList.add(szrSOAPHandler);
+		bindingProvider.getBinding().setHandlerChain(handlerList);
+	}
+  
+  private String createURSearchId() {
+  	return RandomStringUtils.randomAlphanumeric(8) + "-" + 
+  			RandomStringUtils.randomAlphanumeric(4) + "-" + RandomStringUtils.randomAlphanumeric(4) + "-" + 
+  			RandomStringUtils.randomAlphanumeric(12);
+  }
+  
+  public class URSearchResult {
+	  private NichtNatuerlichePersonTyp result;
+	  private List<String> ersbcode;
+	  private boolean evb;
+	  
+	  public URSearchResult() {
+		  this.result = null;
+		  this.ersbcode = null;
+		  this.evb = false;
+	  }
+	  
+	  public URSearchResult(NichtNatuerlichePersonTyp result, List<String> ersb_code, boolean isevb) {
+		  this.result = result;
+		  this.ersbcode = ersb_code;
+		  this.evb = isevb;
+	  }
+	  
+	  public NichtNatuerlichePersonTyp getResult() {
+		return result;
+	  }
+	  
+	  public List<String> getErsbcode() {
+		return ersbcode;
+	  }
+
+	  public boolean isEVB() {
+		  return evb;
+	  }
+  }
+  
+  
+}
+
diff --git a/src/main/java/at/gv/util/client/ur/URClientException.java b/src/main/java/at/gv/util/client/ur_V5/URClientException.java
index 80b4cd6..2d69ec4 100644
--- a/src/main/java/at/gv/util/client/ur/URClientException.java
+++ b/src/main/java/at/gv/util/client/ur_V5/URClientException.java
@@ -1,4 +1,4 @@
-package at.gv.util.client.ur;
+package at.gv.util.client.ur_V5;
 
 public class URClientException extends Exception {
 
diff --git a/src/main/java/at/gv/util/wsdl/ur/URSuche.java b/src/main/java/at/gv/util/wsdl/ur_V5/URSuche.java
index a5f46ff..1d0e99d 100644
--- a/src/main/java/at/gv/util/wsdl/ur/URSuche.java
+++ b/src/main/java/at/gv/util/wsdl/ur_V5/URSuche.java
@@ -1,5 +1,5 @@
 
-package at.gv.util.wsdl.ur;
+package at.gv.util.wsdl.ur_V5;
 
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
@@ -7,9 +7,9 @@ import javax.jws.WebResult;
 import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
 import javax.xml.bind.annotation.XmlSeeAlso;
-import at.gv.util.xsd.ur.xmlsw.SearchByExampleType;
-import at.gv.util.xsd.ur.xmlsw.SearchByIdType;
-import at.gv.util.xsd.ur.xmlsw.SearchResponseType;
+import at.gv.util.xsd.ur_V5.xmlsw.SearchByExampleType;
+import at.gv.util.xsd.ur_V5.xmlsw.SearchByIdType;
+import at.gv.util.xsd.ur_V5.xmlsw.SearchResponseType;
 
 
 /**
@@ -18,14 +18,13 @@ import at.gv.util.xsd.ur.xmlsw.SearchResponseType;
  * Generated source version: 2.2
  * 
  */
-@WebService(name = "URSuche", targetNamespace = "urn:at:statistik:udb:ws")
+@WebService(name = "URSuche", targetNamespace = "urn:at:statistik:ur:ws")
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
 @XmlSeeAlso({
-    at.gv.util.xsd.ur.search.ObjectFactory.class,
-    at.gv.util.xsd.ur.pd.ObjectFactory.class,
-    at.gv.util.xsd.ur.xmlsw.ObjectFactory.class,
-    generated.ObjectFactory.class,
-    at.gv.util.xsd.ur.simpletypes.ObjectFactory.class
+    at.gv.util.xsd.ur_V5.pd.ObjectFactory.class,
+    at.gv.util.xsd.ur_V5.search.ObjectFactory.class,
+    at.gv.util.xsd.ur_V5.xmlsw.ObjectFactory.class,
+    at.gv.util.xsd.ur_V5.simpletypes.ObjectFactory.class
 })
 public interface URSuche {
 
@@ -37,13 +36,16 @@ public interface URSuche {
      * 
      * @param body
      * @return
-     *     returns at.gv.util.xsd.ur.xmlsw.SearchResponseType
+     *     returns at.gv.util.xsd.ur_V5.xmlsw.SearchResponseType
+     * @throws XmlSwFault
      */
     @WebMethod
     @WebResult(name = "SearchResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#", partName = "body")
     public SearchResponseType searchByExample(
         @WebParam(name = "SearchByExample", targetNamespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#", partName = "body")
-        SearchByExampleType body);
+        SearchByExampleType body)
+        throws XmlSwFault
+    ;
 
     /**
      *  Operation für den Abfragetyp
@@ -52,12 +54,15 @@ public interface URSuche {
      * 
      * @param body
      * @return
-     *     returns at.gv.util.xsd.ur.xmlsw.SearchResponseType
+     *     returns at.gv.util.xsd.ur_V5.xmlsw.SearchResponseType
+     * @throws XmlSwFault
      */
     @WebMethod
     @WebResult(name = "SearchResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#", partName = "body")
     public SearchResponseType searchById(
         @WebParam(name = "SearchById", targetNamespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#", partName = "body")
-        SearchByIdType body);
+        SearchByIdType body)
+        throws XmlSwFault
+    ;
 
 }
diff --git a/src/main/java/at/gv/util/wsdl/ur/URSucheService.java b/src/main/java/at/gv/util/wsdl/ur_V5/URSucheService.java
index 6168ae3..8f039c3 100644
--- a/src/main/java/at/gv/util/wsdl/ur/URSucheService.java
+++ b/src/main/java/at/gv/util/wsdl/ur_V5/URSucheService.java
@@ -1,5 +1,5 @@
 
-package at.gv.util.wsdl.ur;
+package at.gv.util.wsdl.ur_V5;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -17,20 +17,20 @@ import javax.xml.ws.WebServiceFeature;
  * Generated source version: 2.2
  * 
  */
-@WebServiceClient(name = "URSucheService", targetNamespace = "urn:at:statistik:udb:ws", wsdlLocation = "file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/ur/URSucheService.wsdl")
+@WebServiceClient(name = "URSucheService", targetNamespace = "urn:at:statistik:ur:ws", wsdlLocation = "file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/ur_V5/URSucheService.wsdl")
 public class URSucheService
     extends Service
 {
 
     private final static URL URSUCHESERVICE_WSDL_LOCATION;
     private final static WebServiceException URSUCHESERVICE_EXCEPTION;
-    private final static QName URSUCHESERVICE_QNAME = new QName("urn:at:statistik:udb:ws", "URSucheService");
+    private final static QName URSUCHESERVICE_QNAME = new QName("urn:at:statistik:ur:ws", "URSucheService");
 
     static {
         URL url = null;
         WebServiceException e = null;
         try {
-            url = new URL("file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/ur/URSucheService.wsdl");
+            url = new URL("file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/ur_V5/URSucheService.wsdl");
         } catch (MalformedURLException ex) {
             e = new WebServiceException(ex);
         }
@@ -42,14 +42,26 @@ public class URSucheService
         super(__getWsdlLocation(), URSUCHESERVICE_QNAME);
     }
 
+    public URSucheService(WebServiceFeature... features) {
+        super(__getWsdlLocation(), URSUCHESERVICE_QNAME, features);
+    }
+
     public URSucheService(URL wsdlLocation) {
         super(wsdlLocation, URSUCHESERVICE_QNAME);
     }
 
+    public URSucheService(URL wsdlLocation, WebServiceFeature... features) {
+        super(wsdlLocation, URSUCHESERVICE_QNAME, features);
+    }
+
     public URSucheService(URL wsdlLocation, QName serviceName) {
         super(wsdlLocation, serviceName);
     }
 
+    public URSucheService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
+        super(wsdlLocation, serviceName, features);
+    }
+
     /**
      * 
      * @return
@@ -57,7 +69,7 @@ public class URSucheService
      */
     @WebEndpoint(name = "URSucheService")
     public URSuche getURSucheService() {
-        return super.getPort(new QName("urn:at:statistik:udb:ws", "URSucheService"), URSuche.class);
+        return super.getPort(new QName("urn:at:statistik:ur:ws", "URSucheService"), URSuche.class);
     }
 
     /**
@@ -69,7 +81,7 @@ public class URSucheService
      */
     @WebEndpoint(name = "URSucheService")
     public URSuche getURSucheService(WebServiceFeature... features) {
-        return super.getPort(new QName("urn:at:statistik:udb:ws", "URSucheService"), URSuche.class, features);
+        return super.getPort(new QName("urn:at:statistik:ur:ws", "URSucheService"), URSuche.class, features);
     }
 
     private static URL __getWsdlLocation() {
diff --git a/src/main/java/at/gv/util/wsdl/ur_V5/XmlSwFault.java b/src/main/java/at/gv/util/wsdl/ur_V5/XmlSwFault.java
new file mode 100644
index 0000000..2f1ee37
--- /dev/null
+++ b/src/main/java/at/gv/util/wsdl/ur_V5/XmlSwFault.java
@@ -0,0 +1,55 @@
+
+package at.gv.util.wsdl.ur_V5;
+
+import javax.xml.ws.WebFault;
+import at.gv.util.xsd.ur_V5.xmlsw.CustomFaultType;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.2.4-b01
+ * Generated source version: 2.2
+ * 
+ */
+@WebFault(name = "XmlSwFault", targetNamespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#")
+public class XmlSwFault
+    extends Exception
+{
+
+    /**
+     * Java type that goes as soapenv:Fault detail element.
+     * 
+     */
+    private CustomFaultType faultInfo;
+
+    /**
+     * 
+     * @param message
+     * @param faultInfo
+     */
+    public XmlSwFault(String message, CustomFaultType faultInfo) {
+        super(message);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @param message
+     * @param faultInfo
+     * @param cause
+     */
+    public XmlSwFault(String message, CustomFaultType faultInfo, Throwable cause) {
+        super(message, cause);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @return
+     *     returns fault bean: at.gv.util.xsd.ur_V5.xmlsw.CustomFaultType
+     */
+    public CustomFaultType getFaultInfo() {
+        return faultInfo;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/wsdl/ur/package-info.java b/src/main/java/at/gv/util/wsdl/ur_V5/package-info.java
index 6a7f40f..847ecd4 100644
--- a/src/main/java/at/gv/util/wsdl/ur/package-info.java
+++ b/src/main/java/at/gv/util/wsdl/ur_V5/package-info.java
@@ -3,4 +3,4 @@
  *     XML-Search-Service. 
  * 
  */
-package at.gv.util.wsdl.ur;
+package at.gv.util.wsdl.ur_V5;
diff --git a/src/main/java/at/gv/util/xsd/ur/pd/NichtNatuerlichePersonTyp.java b/src/main/java/at/gv/util/xsd/ur/pd/NichtNatuerlichePersonTyp.java
deleted file mode 100644
index 858446e..0000000
--- a/src/main/java/at/gv/util/xsd/ur/pd/NichtNatuerlichePersonTyp.java
+++ /dev/null
@@ -1,139 +0,0 @@
-
-package at.gv.util.xsd.ur.pd;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * entspricht CorporateBodyType
- * 
- * <p>Java class for NichtNatuerlichePersonTyp complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="NichtNatuerlichePersonTyp">
- *   &lt;complexContent>
- *     &lt;extension base="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}AbstractPersonType">
- *       &lt;sequence minOccurs="0">
- *         &lt;element name="VollerName" type="{http://www.w3.org/2001/XMLSchema}token" minOccurs="0"/>
- *         &lt;element name="Rechtsform" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;anyAttribute namespace='##other'/>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "NichtNatuerlichePersonTyp", propOrder = {
-    "vollerName",
-    "rechtsform",
-    "any"
-})
-public class NichtNatuerlichePersonTyp
-    extends AbstractPersonType
-{
-
-    @XmlElement(name = "VollerName")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String vollerName;
-    @XmlElement(name = "Rechtsform")
-    @XmlSchemaType(name = "anyURI")
-    protected String rechtsform;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the vollerName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVollerName() {
-        return vollerName;
-    }
-
-    /**
-     * Sets the value of the vollerName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVollerName(String value) {
-        this.vollerName = value;
-    }
-
-    /**
-     * Gets the value of the rechtsform property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRechtsform() {
-        return rechtsform;
-    }
-
-    /**
-     * Sets the value of the rechtsform property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRechtsform(String value) {
-        this.rechtsform = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git a/src/main/java/at/gv/util/xsd/ur/pd/PersonenDatenTyp.java b/src/main/java/at/gv/util/xsd/ur/pd/PersonenDatenTyp.java
deleted file mode 100644
index b84f115..0000000
--- a/src/main/java/at/gv/util/xsd/ur/pd/PersonenDatenTyp.java
+++ /dev/null
@@ -1,214 +0,0 @@
-
-package at.gv.util.xsd.ur.pd;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * Container um eine Person und ihre Adressen zu speichern
- * 
- * <p>Java class for PersonenDatenTyp complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="PersonenDatenTyp">
- *   &lt;complexContent>
- *     &lt;extension base="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}AbstractPersonType">
- *       &lt;sequence>
- *         &lt;element ref="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}Person"/>
- *         &lt;element ref="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}Address" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="Zusatzdaten" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 &lt;sequence maxOccurs="unbounded" minOccurs="0">
- *                   &lt;any processContents='lax'/>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *       &lt;anyAttribute namespace='##other'/>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PersonenDatenTyp", propOrder = {
-    "person",
-    "address",
-    "zusatzdaten"
-})
-public class PersonenDatenTyp
-    extends AbstractPersonType
-{
-
-    @XmlElementRef(name = "Person", namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", type = JAXBElement.class)
-    protected JAXBElement<? extends AbstractPersonType> person;
-    @XmlElementRef(name = "Address", namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", type = JAXBElement.class)
-    protected List<JAXBElement<? extends AbstractAddressType>> address;
-    @XmlElement(name = "Zusatzdaten")
-    protected PersonenDatenTyp.Zusatzdaten zusatzdaten;
-
-    /**
-     * Gets the value of the person property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link JAXBElement }{@code <}{@link NichtNatuerlichePersonTyp }{@code >}
-     *     {@link JAXBElement }{@code <}{@link NatuerlichePersonTyp }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
-     *     
-     */
-    public JAXBElement<? extends AbstractPersonType> getPerson() {
-        return person;
-    }
-
-    /**
-     * Sets the value of the person property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link JAXBElement }{@code <}{@link NichtNatuerlichePersonTyp }{@code >}
-     *     {@link JAXBElement }{@code <}{@link NatuerlichePersonTyp }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
-     *     
-     */
-    public void setPerson(JAXBElement<? extends AbstractPersonType> value) {
-        this.person = value;
-    }
-
-    /**
-     * Gets the value of the address property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the address property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAddress().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >}
-     * {@link JAXBElement }{@code <}{@link TypisiertePostAdresseTyp }{@code >}
-     * {@link JAXBElement }{@code <}{@link PostAdresseTyp }{@code >}
-     * 
-     * 
-     */
-    public List<JAXBElement<? extends AbstractAddressType>> getAddress() {
-        if (address == null) {
-            address = new ArrayList<JAXBElement<? extends AbstractAddressType>>();
-        }
-        return this.address;
-    }
-
-    /**
-     * Gets the value of the zusatzdaten property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PersonenDatenTyp.Zusatzdaten }
-     *     
-     */
-    public PersonenDatenTyp.Zusatzdaten getZusatzdaten() {
-        return zusatzdaten;
-    }
-
-    /**
-     * Sets the value of the zusatzdaten property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PersonenDatenTyp.Zusatzdaten }
-     *     
-     */
-    public void setZusatzdaten(PersonenDatenTyp.Zusatzdaten value) {
-        this.zusatzdaten = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;sequence maxOccurs="unbounded" minOccurs="0">
-     *         &lt;any processContents='lax'/>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "content"
-    })
-    public static class Zusatzdaten {
-
-        @XmlMixed
-        @XmlAnyElement(lax = true)
-        protected List<Object> content;
-
-        /**
-         * Gets the value of the content property.
-         * 
-         * <p>
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a <CODE>set</CODE> method for the content property.
-         * 
-         * <p>
-         * For example, to add a new item, do as follows:
-         * <pre>
-         *    getContent().add(newItem);
-         * </pre>
-         * 
-         * 
-         * <p>
-         * Objects of the following type(s) are allowed in the list
-         * {@link Object }
-         * {@link Element }
-         * {@link String }
-         * 
-         * 
-         */
-        public List<Object> getContent() {
-            if (content == null) {
-                content = new ArrayList<Object>();
-            }
-            return this.content;
-        }
-
-    }
-
-}
diff --git a/src/main/java/at/gv/util/xsd/ur/pd/TypisiertePostAdresseTyp.java b/src/main/java/at/gv/util/xsd/ur/pd/TypisiertePostAdresseTyp.java
deleted file mode 100644
index e669638..0000000
--- a/src/main/java/at/gv/util/xsd/ur/pd/TypisiertePostAdresseTyp.java
+++ /dev/null
@@ -1,105 +0,0 @@
-
-package at.gv.util.xsd.ur.pd;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * entspricht TypedPostalAddressType
- * 
- * <p>Java class for TypisiertePostAdresseTyp complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="TypisiertePostAdresseTyp">
- *   &lt;complexContent>
- *     &lt;extension base="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}AbstractAddressType">
- *       &lt;sequence minOccurs="0">
- *         &lt;element ref="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}PostAdresse"/>
- *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;anyAttribute namespace='##other'/>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TypisiertePostAdresseTyp", propOrder = {
-    "postAdresse",
-    "any"
-})
-public class TypisiertePostAdresseTyp
-    extends AbstractAddressType
-{
-
-    @XmlElement(name = "PostAdresse")
-    protected PostAdresseTyp postAdresse;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the postAdresse property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PostAdresseTyp }
-     *     
-     */
-    public PostAdresseTyp getPostAdresse() {
-        return postAdresse;
-    }
-
-    /**
-     * Sets the value of the postAdresse property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PostAdresseTyp }
-     *     
-     */
-    public void setPostAdresse(PostAdresseTyp value) {
-        this.postAdresse = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git a/src/main/java/at/gv/util/xsd/ur/search/DecodeBpkRequest.java b/src/main/java/at/gv/util/xsd/ur/search/DecodeBpkRequest.java
deleted file mode 100644
index 318c639..0000000
--- a/src/main/java/at/gv/util/xsd/ur/search/DecodeBpkRequest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-
-package at.gv.util.xsd.ur.search;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for DecodeBpkRequest complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="DecodeBpkRequest">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="version" type="{http://statistik.at/namespace/ur/simpleTypes/1#}VersionTyp" minOccurs="0"/>
- *         &lt;element name="bpkWTUREncoded" type="{http://statistik.at/namespace/ur/simpleTypes/1#}BpkEncodedTyp"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DecodeBpkRequest", propOrder = {
-    "version",
-    "bpkWTUREncoded"
-})
-public class DecodeBpkRequest {
-
-    protected String version;
-    @XmlElement(required = true)
-    protected String bpkWTUREncoded;
-
-    /**
-     * Gets the value of the version property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVersion() {
-        return version;
-    }
-
-    /**
-     * Sets the value of the version property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVersion(String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the bpkWTUREncoded property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBpkWTUREncoded() {
-        return bpkWTUREncoded;
-    }
-
-    /**
-     * Sets the value of the bpkWTUREncoded property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBpkWTUREncoded(String value) {
-        this.bpkWTUREncoded = value;
-    }
-
-}
diff --git a/src/main/java/at/gv/util/xsd/ur/search/Funktion.java b/src/main/java/at/gv/util/xsd/ur/search/Funktion.java
deleted file mode 100644
index 717b187..0000000
--- a/src/main/java/at/gv/util/xsd/ur/search/Funktion.java
+++ /dev/null
@@ -1,268 +0,0 @@
-
-package at.gv.util.xsd.ur.search;
-
-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.bind.annotation.XmlValue;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * <p>Java class for Funktion complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="Funktion">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="FktName" type="{http://statistik.at/namespace/ur/simpleTypes/1#}FunktionTyp"/>
- *         &lt;element name="Vertretungsbefugnis" type="{http://statistik.at/namespace/ur/simpleTypes/1#}VertretungsbefugnisTyp"/>
- *         &lt;element name="VertretungsbefugnisText" minOccurs="0">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension base="&lt;http://statistik.at/namespace/ur/simpleTypes/1#>VertretungsbefugnisTextTyp">
- *                 &lt;attribute name="beginn" use="required" type="{http://www.w3.org/2001/XMLSchema}date" />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="Beginn" type="{http://statistik.at/namespace/ur/stammdaten/1#}QuellenType"/>
- *         &lt;element name="Ende" type="{http://statistik.at/namespace/ur/stammdaten/1#}QuellenType" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Funktion", propOrder = {
-    "fktName",
-    "vertretungsbefugnis",
-    "vertretungsbefugnisText",
-    "beginn",
-    "ende"
-})
-public class Funktion {
-
-    @XmlElement(name = "FktName", required = true)
-    protected String fktName;
-    @XmlElement(name = "Vertretungsbefugnis", required = true)
-    protected String vertretungsbefugnis;
-    @XmlElement(name = "VertretungsbefugnisText")
-    protected Funktion.VertretungsbefugnisText vertretungsbefugnisText;
-    @XmlElement(name = "Beginn", required = true)
-    protected QuellenType beginn;
-    @XmlElement(name = "Ende")
-    protected QuellenType ende;
-
-    /**
-     * Gets the value of the fktName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFktName() {
-        return fktName;
-    }
-
-    /**
-     * Sets the value of the fktName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFktName(String value) {
-        this.fktName = value;
-    }
-
-    /**
-     * Gets the value of the vertretungsbefugnis property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVertretungsbefugnis() {
-        return vertretungsbefugnis;
-    }
-
-    /**
-     * Sets the value of the vertretungsbefugnis property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVertretungsbefugnis(String value) {
-        this.vertretungsbefugnis = value;
-    }
-
-    /**
-     * Gets the value of the vertretungsbefugnisText property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Funktion.VertretungsbefugnisText }
-     *     
-     */
-    public Funktion.VertretungsbefugnisText getVertretungsbefugnisText() {
-        return vertretungsbefugnisText;
-    }
-
-    /**
-     * Sets the value of the vertretungsbefugnisText property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Funktion.VertretungsbefugnisText }
-     *     
-     */
-    public void setVertretungsbefugnisText(Funktion.VertretungsbefugnisText value) {
-        this.vertretungsbefugnisText = value;
-    }
-
-    /**
-     * Gets the value of the beginn property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link QuellenType }
-     *     
-     */
-    public QuellenType getBeginn() {
-        return beginn;
-    }
-
-    /**
-     * Sets the value of the beginn property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link QuellenType }
-     *     
-     */
-    public void setBeginn(QuellenType value) {
-        this.beginn = value;
-    }
-
-    /**
-     * Gets the value of the ende property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link QuellenType }
-     *     
-     */
-    public QuellenType getEnde() {
-        return ende;
-    }
-
-    /**
-     * Sets the value of the ende property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link QuellenType }
-     *     
-     */
-    public void setEnde(QuellenType value) {
-        this.ende = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;http://statistik.at/namespace/ur/simpleTypes/1#>VertretungsbefugnisTextTyp">
-     *       &lt;attribute name="beginn" use="required" type="{http://www.w3.org/2001/XMLSchema}date" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class VertretungsbefugnisText {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "beginn", required = true)
-        @XmlSchemaType(name = "date")
-        protected XMLGregorianCalendar beginn;
-
-        /**
-         * 
-         * 				Beschreibung der Vertretungsbefugnis
-         * 			
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the beginn property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public XMLGregorianCalendar getBeginn() {
-            return beginn;
-        }
-
-        /**
-         * Sets the value of the beginn property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link XMLGregorianCalendar }
-         *     
-         */
-        public void setBeginn(XMLGregorianCalendar value) {
-            this.beginn = value;
-        }
-
-    }
-
-}
diff --git a/src/main/java/at/gv/util/xsd/ur/search/ObjectFactory.java b/src/main/java/at/gv/util/xsd/ur/search/ObjectFactory.java
deleted file mode 100644
index a4fa294..0000000
--- a/src/main/java/at/gv/util/xsd/ur/search/ObjectFactory.java
+++ /dev/null
@@ -1,314 +0,0 @@
-
-package at.gv.util.xsd.ur.search;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the at.gv.util.xsd.ur.search package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _UntName_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/1#", "UntName");
-    private final static QName _SucheUnternehmenNachAendDatRequest_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/1#", "SucheUnternehmenNachAendDatRequest");
-    private final static QName _DecodeBpkRequest_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/1#", "DecodeBpkRequest");
-    private final static QName _Funktion_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/1#", "Funktion");
-    private final static QName _SucheUnternehmenNachBpkRequest_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/1#", "SucheUnternehmenNachBpkRequest");
-    private final static QName _TypeText_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/1#", "TypeText");
-    private final static QName _SucheUnternehmenNachIdsRequest_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/1#", "SucheUnternehmenNachIdsRequest");
-    private final static QName _BpkWTUR_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/1#", "bpkWTUR");
-    private final static QName _AendDat_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/1#", "AendDat");
-    private final static QName _Branche_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/1#", "Branche");
-    private final static QName _Beginn_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/1#", "Beginn");
-    private final static QName _SucheUnternehmenNachBpkEncodedRequest_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/1#", "SucheUnternehmenNachBpkEncodedRequest");
-    private final static QName _Ende_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/1#", "Ende");
-    private final static QName _Rechtsform_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/1#", "Rechtsform");
-    private final static QName _SucheUnternehmenRequest_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/1#", "SucheUnternehmenRequest");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.util.xsd.ur.search
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link Funktion }
-     * 
-     */
-    public Funktion createFunktion() {
-        return new Funktion();
-    }
-
-    /**
-     * Create an instance of {@link QuellenType }
-     * 
-     */
-    public QuellenType createQuellenType() {
-        return new QuellenType();
-    }
-
-    /**
-     * Create an instance of {@link SucheUnternehmenNachBpkRequest }
-     * 
-     */
-    public SucheUnternehmenNachBpkRequest createSucheUnternehmenNachBpkRequest() {
-        return new SucheUnternehmenNachBpkRequest();
-    }
-
-    /**
-     * Create an instance of {@link UntName }
-     * 
-     */
-    public UntName createUntName() {
-        return new UntName();
-    }
-
-    /**
-     * Create an instance of {@link SucheUnternehmenNachIdsRequest }
-     * 
-     */
-    public SucheUnternehmenNachIdsRequest createSucheUnternehmenNachIdsRequest() {
-        return new SucheUnternehmenNachIdsRequest();
-    }
-
-    /**
-     * Create an instance of {@link DecodeBpkRequest }
-     * 
-     */
-    public DecodeBpkRequest createDecodeBpkRequest() {
-        return new DecodeBpkRequest();
-    }
-
-    /**
-     * Create an instance of {@link SucheUnternehmenNachAendDatRequest }
-     * 
-     */
-    public SucheUnternehmenNachAendDatRequest createSucheUnternehmenNachAendDatRequest() {
-        return new SucheUnternehmenNachAendDatRequest();
-    }
-
-    /**
-     * Create an instance of {@link Rechtsform }
-     * 
-     */
-    public Rechtsform createRechtsform() {
-        return new Rechtsform();
-    }
-
-    /**
-     * Create an instance of {@link Branche }
-     * 
-     */
-    public Branche createBranche() {
-        return new Branche();
-    }
-
-    /**
-     * Create an instance of {@link SucheUnternehmenNachBpkEncodedRequest }
-     * 
-     */
-    public SucheUnternehmenNachBpkEncodedRequest createSucheUnternehmenNachBpkEncodedRequest() {
-        return new SucheUnternehmenNachBpkEncodedRequest();
-    }
-
-    /**
-     * Create an instance of {@link SucheUnternehmenRequest }
-     * 
-     */
-    public SucheUnternehmenRequest createSucheUnternehmenRequest() {
-        return new SucheUnternehmenRequest();
-    }
-
-    /**
-     * Create an instance of {@link SucheUnternehmensdaten }
-     * 
-     */
-    public SucheUnternehmensdaten createSucheUnternehmensdaten() {
-        return new SucheUnternehmensdaten();
-    }
-
-    /**
-     * Create an instance of {@link OenaceType }
-     * 
-     */
-    public OenaceType createOenaceType() {
-        return new OenaceType();
-    }
-
-    /**
-     * Create an instance of {@link SucheBranche }
-     * 
-     */
-    public SucheBranche createSucheBranche() {
-        return new SucheBranche();
-    }
-
-    /**
-     * Create an instance of {@link SuchePersonendaten }
-     * 
-     */
-    public SuchePersonendaten createSuchePersonendaten() {
-        return new SuchePersonendaten();
-    }
-
-    /**
-     * Create an instance of {@link Funktion.VertretungsbefugnisText }
-     * 
-     */
-    public Funktion.VertretungsbefugnisText createFunktionVertretungsbefugnisText() {
-        return new Funktion.VertretungsbefugnisText();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link UntName }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/1#", name = "UntName")
-    public JAXBElement<UntName> createUntName(UntName value) {
-        return new JAXBElement<UntName>(_UntName_QNAME, UntName.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SucheUnternehmenNachAendDatRequest }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/1#", name = "SucheUnternehmenNachAendDatRequest")
-    public JAXBElement<SucheUnternehmenNachAendDatRequest> createSucheUnternehmenNachAendDatRequest(SucheUnternehmenNachAendDatRequest value) {
-        return new JAXBElement<SucheUnternehmenNachAendDatRequest>(_SucheUnternehmenNachAendDatRequest_QNAME, SucheUnternehmenNachAendDatRequest.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DecodeBpkRequest }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/1#", name = "DecodeBpkRequest")
-    public JAXBElement<DecodeBpkRequest> createDecodeBpkRequest(DecodeBpkRequest value) {
-        return new JAXBElement<DecodeBpkRequest>(_DecodeBpkRequest_QNAME, DecodeBpkRequest.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Funktion }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/1#", name = "Funktion")
-    public JAXBElement<Funktion> createFunktion(Funktion value) {
-        return new JAXBElement<Funktion>(_Funktion_QNAME, Funktion.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SucheUnternehmenNachBpkRequest }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/1#", name = "SucheUnternehmenNachBpkRequest")
-    public JAXBElement<SucheUnternehmenNachBpkRequest> createSucheUnternehmenNachBpkRequest(SucheUnternehmenNachBpkRequest value) {
-        return new JAXBElement<SucheUnternehmenNachBpkRequest>(_SucheUnternehmenNachBpkRequest_QNAME, SucheUnternehmenNachBpkRequest.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/1#", name = "TypeText")
-    public JAXBElement<String> createTypeText(String value) {
-        return new JAXBElement<String>(_TypeText_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SucheUnternehmenNachIdsRequest }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/1#", name = "SucheUnternehmenNachIdsRequest")
-    public JAXBElement<SucheUnternehmenNachIdsRequest> createSucheUnternehmenNachIdsRequest(SucheUnternehmenNachIdsRequest value) {
-        return new JAXBElement<SucheUnternehmenNachIdsRequest>(_SucheUnternehmenNachIdsRequest_QNAME, SucheUnternehmenNachIdsRequest.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/1#", name = "bpkWTUR")
-    public JAXBElement<String> createBpkWTUR(String value) {
-        return new JAXBElement<String>(_BpkWTUR_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/1#", name = "AendDat")
-    public JAXBElement<XMLGregorianCalendar> createAendDat(XMLGregorianCalendar value) {
-        return new JAXBElement<XMLGregorianCalendar>(_AendDat_QNAME, XMLGregorianCalendar.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Branche }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/1#", name = "Branche")
-    public JAXBElement<Branche> createBranche(Branche value) {
-        return new JAXBElement<Branche>(_Branche_QNAME, Branche.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link QuellenType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/1#", name = "Beginn")
-    public JAXBElement<QuellenType> createBeginn(QuellenType value) {
-        return new JAXBElement<QuellenType>(_Beginn_QNAME, QuellenType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SucheUnternehmenNachBpkEncodedRequest }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/1#", name = "SucheUnternehmenNachBpkEncodedRequest")
-    public JAXBElement<SucheUnternehmenNachBpkEncodedRequest> createSucheUnternehmenNachBpkEncodedRequest(SucheUnternehmenNachBpkEncodedRequest value) {
-        return new JAXBElement<SucheUnternehmenNachBpkEncodedRequest>(_SucheUnternehmenNachBpkEncodedRequest_QNAME, SucheUnternehmenNachBpkEncodedRequest.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link QuellenType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/1#", name = "Ende")
-    public JAXBElement<QuellenType> createEnde(QuellenType value) {
-        return new JAXBElement<QuellenType>(_Ende_QNAME, QuellenType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Rechtsform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/1#", name = "Rechtsform")
-    public JAXBElement<Rechtsform> createRechtsform(Rechtsform value) {
-        return new JAXBElement<Rechtsform>(_Rechtsform_QNAME, Rechtsform.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SucheUnternehmenRequest }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/1#", name = "SucheUnternehmenRequest")
-    public JAXBElement<SucheUnternehmenRequest> createSucheUnternehmenRequest(SucheUnternehmenRequest value) {
-        return new JAXBElement<SucheUnternehmenRequest>(_SucheUnternehmenRequest_QNAME, SucheUnternehmenRequest.class, null, value);
-    }
-
-}
diff --git a/src/main/java/at/gv/util/xsd/ur/search/SucheUnternehmenNachBpkEncodedRequest.java b/src/main/java/at/gv/util/xsd/ur/search/SucheUnternehmenNachBpkEncodedRequest.java
deleted file mode 100644
index 5478d79..0000000
--- a/src/main/java/at/gv/util/xsd/ur/search/SucheUnternehmenNachBpkEncodedRequest.java
+++ /dev/null
@@ -1,145 +0,0 @@
-
-package at.gv.util.xsd.ur.search;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for SucheUnternehmenNachBpkEncodedRequest complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SucheUnternehmenNachBpkEncodedRequest">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="version" type="{http://statistik.at/namespace/ur/simpleTypes/1#}VersionTyp" minOccurs="0"/>
- *         &lt;element name="bpkEncodedWTUR" type="{http://statistik.at/namespace/ur/simpleTypes/1#}BpkEncodedTyp"/>
- *         &lt;element name="bpkEncodedBereich" type="{http://statistik.at/namespace/ur/simpleTypes/1#}BpkEncodedTyp"/>
- *         &lt;element name="bereich" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SucheUnternehmenNachBpkEncodedRequest", propOrder = {
-    "version",
-    "bpkEncodedWTUR",
-    "bpkEncodedBereich",
-    "bereich"
-})
-public class SucheUnternehmenNachBpkEncodedRequest {
-
-    protected String version;
-    @XmlElement(required = true)
-    protected String bpkEncodedWTUR;
-    @XmlElement(required = true)
-    protected String bpkEncodedBereich;
-    @XmlElement(required = true)
-    protected String bereich;
-
-    /**
-     * Gets the value of the version property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVersion() {
-        return version;
-    }
-
-    /**
-     * Sets the value of the version property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVersion(String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the bpkEncodedWTUR property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBpkEncodedWTUR() {
-        return bpkEncodedWTUR;
-    }
-
-    /**
-     * Sets the value of the bpkEncodedWTUR property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBpkEncodedWTUR(String value) {
-        this.bpkEncodedWTUR = value;
-    }
-
-    /**
-     * Gets the value of the bpkEncodedBereich property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBpkEncodedBereich() {
-        return bpkEncodedBereich;
-    }
-
-    /**
-     * Sets the value of the bpkEncodedBereich property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBpkEncodedBereich(String value) {
-        this.bpkEncodedBereich = value;
-    }
-
-    /**
-     * Gets the value of the bereich property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBereich() {
-        return bereich;
-    }
-
-    /**
-     * Sets the value of the bereich property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBereich(String value) {
-        this.bereich = value;
-    }
-
-}
diff --git a/src/main/java/at/gv/util/xsd/ur/search/SucheUnternehmenNachIdsRequest.java b/src/main/java/at/gv/util/xsd/ur/search/SucheUnternehmenNachIdsRequest.java
deleted file mode 100644
index 1d6914d..0000000
--- a/src/main/java/at/gv/util/xsd/ur/search/SucheUnternehmenNachIdsRequest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-
-package at.gv.util.xsd.ur.search;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for SucheUnternehmenNachIdsRequest complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SucheUnternehmenNachIdsRequest">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="version" type="{http://statistik.at/namespace/ur/simpleTypes/1#}VersionTyp" minOccurs="0"/>
- *         &lt;element name="kur" type="{http://statistik.at/namespace/ur/simpleTypes/1#}KurTyp" maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SucheUnternehmenNachIdsRequest", propOrder = {
-    "version",
-    "kur"
-})
-public class SucheUnternehmenNachIdsRequest {
-
-    protected String version;
-    @XmlElement(required = true)
-    protected List<String> kur;
-
-    /**
-     * Gets the value of the version property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVersion() {
-        return version;
-    }
-
-    /**
-     * Sets the value of the version property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVersion(String value) {
-        this.version = value;
-    }
-
-    /**
-     * Gets the value of the kur property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the kur property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getKur().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getKur() {
-        if (kur == null) {
-            kur = new ArrayList<String>();
-        }
-        return this.kur;
-    }
-
-}
diff --git a/src/main/java/at/gv/util/xsd/ur/search/UntName.java b/src/main/java/at/gv/util/xsd/ur/search/UntName.java
deleted file mode 100644
index 2924ac8..0000000
--- a/src/main/java/at/gv/util/xsd/ur/search/UntName.java
+++ /dev/null
@@ -1,118 +0,0 @@
-
-package at.gv.util.xsd.ur.search;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for UntName complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="UntName">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="VollerName" type="{http://statistik.at/namespace/ur/simpleTypes/1#}UntNameTyp"/>
- *         &lt;element name="Beginn" type="{http://statistik.at/namespace/ur/stammdaten/1#}QuellenType"/>
- *         &lt;element name="Ende" type="{http://statistik.at/namespace/ur/stammdaten/1#}QuellenType" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "UntName", propOrder = {
-    "vollerName",
-    "beginn",
-    "ende"
-})
-public class UntName {
-
-    @XmlElement(name = "VollerName", required = true)
-    protected String vollerName;
-    @XmlElement(name = "Beginn", required = true)
-    protected QuellenType beginn;
-    @XmlElement(name = "Ende")
-    protected QuellenType ende;
-
-    /**
-     * Gets the value of the vollerName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVollerName() {
-        return vollerName;
-    }
-
-    /**
-     * Sets the value of the vollerName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVollerName(String value) {
-        this.vollerName = value;
-    }
-
-    /**
-     * Gets the value of the beginn property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link QuellenType }
-     *     
-     */
-    public QuellenType getBeginn() {
-        return beginn;
-    }
-
-    /**
-     * Sets the value of the beginn property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link QuellenType }
-     *     
-     */
-    public void setBeginn(QuellenType value) {
-        this.beginn = value;
-    }
-
-    /**
-     * Gets the value of the ende property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link QuellenType }
-     *     
-     */
-    public QuellenType getEnde() {
-        return ende;
-    }
-
-    /**
-     * Sets the value of the ende property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link QuellenType }
-     *     
-     */
-    public void setEnde(QuellenType value) {
-        this.ende = value;
-    }
-
-}
diff --git a/src/main/java/at/gv/util/xsd/ur/xmlsw/ExtraResultCriteria.java b/src/main/java/at/gv/util/xsd/ur/xmlsw/ExtraResultCriteria.java
deleted file mode 100644
index feec384..0000000
--- a/src/main/java/at/gv/util/xsd/ur/xmlsw/ExtraResultCriteria.java
+++ /dev/null
@@ -1,73 +0,0 @@
-
-package at.gv.util.xsd.ur.xmlsw;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;any processContents='lax' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "any"
-})
-@XmlRootElement(name = "ExtraResultCriteria")
-public class ExtraResultCriteria {
-
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git a/src/main/java/at/gv/util/xsd/ur/xmlsw/ExtraResultInfo.java b/src/main/java/at/gv/util/xsd/ur/xmlsw/ExtraResultInfo.java
deleted file mode 100644
index 0258127..0000000
--- a/src/main/java/at/gv/util/xsd/ur/xmlsw/ExtraResultInfo.java
+++ /dev/null
@@ -1,73 +0,0 @@
-
-package at.gv.util.xsd.ur.xmlsw;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "any"
-})
-@XmlRootElement(name = "ExtraResultInfo")
-public class ExtraResultInfo {
-
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git a/src/main/java/at/gv/util/xsd/ur/xmlsw/RecordFieldList.java b/src/main/java/at/gv/util/xsd/ur/xmlsw/RecordFieldList.java
deleted file mode 100644
index 9dc8b7b..0000000
--- a/src/main/java/at/gv/util/xsd/ur/xmlsw/RecordFieldList.java
+++ /dev/null
@@ -1,73 +0,0 @@
-
-package at.gv.util.xsd.ur.xmlsw;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "any"
-})
-@XmlRootElement(name = "RecordFieldList")
-public class RecordFieldList {
-
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git a/src/main/java/at/gv/util/xsd/ur/xmlsw/SearchCriteriaType.java b/src/main/java/at/gv/util/xsd/ur/xmlsw/SearchCriteriaType.java
deleted file mode 100644
index f15c61f..0000000
--- a/src/main/java/at/gv/util/xsd/ur/xmlsw/SearchCriteriaType.java
+++ /dev/null
@@ -1,100 +0,0 @@
-
-package at.gv.util.xsd.ur.xmlsw;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for SearchCriteriaType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SearchCriteriaType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://reference.e-government.gv.at/namespace/xml-sw/1#}ResultSetId" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SearchCriteriaType", propOrder = {
-    "resultSetId",
-    "any"
-})
-public class SearchCriteriaType {
-
-    @XmlElement(name = "ResultSetId")
-    protected String resultSetId;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the resultSetId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getResultSetId() {
-        return resultSetId;
-    }
-
-    /**
-     * Sets the value of the resultSetId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setResultSetId(String value) {
-        this.resultSetId = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git a/src/main/java/at/gv/util/xsd/ur/xmlsw/SearchRequestInfoType.java b/src/main/java/at/gv/util/xsd/ur/xmlsw/SearchRequestInfoType.java
deleted file mode 100644
index d3f0ad6..0000000
--- a/src/main/java/at/gv/util/xsd/ur/xmlsw/SearchRequestInfoType.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package at.gv.util.xsd.ur.xmlsw;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for SearchRequestInfoType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SearchRequestInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;any processContents='lax' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SearchRequestInfoType", propOrder = {
-    "any"
-})
-public class SearchRequestInfoType {
-
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}
diff --git a/src/main/java/at/gv/util/xsd/ur/pd/AbstractAddressType.java b/src/main/java/at/gv/util/xsd/ur_V5/pd/AbstractAddressType.java
index 4fbf6e7..da0d8fd 100644
--- a/src/main/java/at/gv/util/xsd/ur/pd/AbstractAddressType.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/pd/AbstractAddressType.java
@@ -1,11 +1,8 @@
 
-package at.gv.util.xsd.ur.pd;
+package at.gv.util.xsd.ur_V5.pd;
 
-import java.util.HashMap;
-import java.util.Map;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlID;
 import javax.xml.bind.annotation.XmlSchemaType;
@@ -13,11 +10,11 @@ import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
 
 
 /**
  * Struktur des Abstrakten Address Elements
+ * 			
  * 
  * <p>Java class for AbstractAddressType complex type.
  * 
@@ -28,7 +25,6 @@ import javax.xml.namespace.QName;
  *   &lt;complexContent>
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       &lt;anyAttribute namespace='##other'/>
  *     &lt;/restriction>
  *   &lt;/complexContent>
  * &lt;/complexType>
@@ -49,8 +45,6 @@ public class AbstractAddressType {
     @XmlID
     @XmlSchemaType(name = "ID")
     protected String id;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
     /**
      * Gets the value of the id property.
@@ -76,22 +70,4 @@ public class AbstractAddressType {
         this.id = value;
     }
 
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
 }
diff --git a/src/main/java/at/gv/util/xsd/ur/pd/AbstractPersonType.java b/src/main/java/at/gv/util/xsd/ur_V5/pd/AbstractPersonType.java
index 9804ab0..d69d563 100644
--- a/src/main/java/at/gv/util/xsd/ur/pd/AbstractPersonType.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/pd/AbstractPersonType.java
@@ -1,13 +1,10 @@
 
-package at.gv.util.xsd.ur.pd;
+package at.gv.util.xsd.ur_V5.pd;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlID;
@@ -16,7 +13,6 @@ import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
 
 
 /**
@@ -34,7 +30,6 @@ import javax.xml.namespace.QName;
  *         &lt;element name="Identification" type="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}IdentificationType" maxOccurs="unbounded" minOccurs="0"/>
  *       &lt;/choice>
  *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       &lt;anyAttribute namespace='##other'/>
  *     &lt;/restriction>
  *   &lt;/complexContent>
  * &lt;/complexType>
@@ -47,9 +42,10 @@ import javax.xml.namespace.QName;
     "identification"
 })
 @XmlSeeAlso({
-    NatuerlichePersonTyp.class,
     PersonenDatenTyp.class,
-    NichtNatuerlichePersonTyp.class
+    NatuerlichePersonTyp.class,
+    NichtNatuerlichePersonTyp.class,
+    PersonenDatenZusatzdatenTyp.class
 })
 public class AbstractPersonType {
 
@@ -60,8 +56,6 @@ public class AbstractPersonType {
     @XmlID
     @XmlSchemaType(name = "ID")
     protected String id;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
     /**
      * Gets the value of the identification property.
@@ -116,22 +110,4 @@ public class AbstractPersonType {
         this.id = value;
     }
 
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
 }
diff --git a/src/main/java/at/gv/util/xsd/ur/pd/IdentificationType.java b/src/main/java/at/gv/util/xsd/ur_V5/pd/IdentificationType.java
index 6474b2e..6c26713 100644
--- a/src/main/java/at/gv/util/xsd/ur/pd/IdentificationType.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/pd/IdentificationType.java
@@ -1,14 +1,8 @@
 
-package at.gv.util.xsd.ur.pd;
+package at.gv.util.xsd.ur_V5.pd;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlID;
@@ -17,12 +11,13 @@ import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-import org.w3c.dom.Element;
+import at.gv.util.xsd.ur_V5.search.QuellenType;
 
 
 /**
- * Container für beliebige Identifikationsmerkmale, besteht aus Type und Value Unterelementen, aus technischen Gründen nur auf Englisch verfügbar
+ * Container für beliebige Identifikationsmerkmale,
+ * 				besteht aus Type und Value Unterelementen, aus technischen Gründen
+ * 				nur auf Englisch verfügbar
  * 
  * <p>Java class for IdentificationType complex type.
  * 
@@ -43,10 +38,11 @@ import org.w3c.dom.Element;
  *           &lt;/complexType>
  *         &lt;/element>
  *         &lt;element name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}TypeText" minOccurs="0"/>
+ *         &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Beginn" minOccurs="0"/>
+ *         &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Ende" minOccurs="0"/>
  *       &lt;/sequence>
  *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       &lt;anyAttribute namespace='##other'/>
  *     &lt;/restriction>
  *   &lt;/complexContent>
  * &lt;/complexType>
@@ -58,7 +54,9 @@ import org.w3c.dom.Element;
 @XmlType(name = "IdentificationType", propOrder = {
     "value",
     "type",
-    "any"
+    "typeText",
+    "beginn",
+    "ende"
 })
 public class IdentificationType {
 
@@ -67,15 +65,17 @@ public class IdentificationType {
     @XmlElement(name = "Type", required = true)
     @XmlSchemaType(name = "anyURI")
     protected String type;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
+    @XmlElement(name = "TypeText", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    protected String typeText;
+    @XmlElement(name = "Beginn", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    protected QuellenType beginn;
+    @XmlElement(name = "Ende", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    protected QuellenType ende;
     @XmlAttribute(name = "Id")
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
     @XmlID
     @XmlSchemaType(name = "ID")
     protected String id;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
     /**
      * Gets the value of the value property.
@@ -126,33 +126,75 @@ public class IdentificationType {
     }
 
     /**
-     * Gets the value of the any property.
+     * Gets the value of the typeText property.
      * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTypeText() {
+        return typeText;
+    }
+
+    /**
+     * Sets the value of the typeText property.
      * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTypeText(String value) {
+        this.typeText = value;
+    }
+
+    /**
+     * Gets the value of the beginn property.
      * 
+     * @return
+     *     possible object is
+     *     {@link QuellenType }
+     *     
+     */
+    public QuellenType getBeginn() {
+        return beginn;
+    }
+
+    /**
+     * Sets the value of the beginn property.
      * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
+     * @param value
+     *     allowed object is
+     *     {@link QuellenType }
+     *     
+     */
+    public void setBeginn(QuellenType value) {
+        this.beginn = value;
+    }
+
+    /**
+     * Gets the value of the ende property.
      * 
+     * @return
+     *     possible object is
+     *     {@link QuellenType }
+     *     
+     */
+    public QuellenType getEnde() {
+        return ende;
+    }
+
+    /**
+     * Sets the value of the ende property.
      * 
+     * @param value
+     *     allowed object is
+     *     {@link QuellenType }
+     *     
      */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
+    public void setEnde(QuellenType value) {
+        this.ende = value;
     }
 
     /**
@@ -179,24 +221,6 @@ public class IdentificationType {
         this.id = value;
     }
 
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
 
     /**
      * <p>Java class for anonymous complex type.
diff --git a/src/main/java/at/gv/util/xsd/ur/pd/NatuerlichePersonTyp.java b/src/main/java/at/gv/util/xsd/ur_V5/pd/NatuerlichePersonTyp.java
index f9632ff..a96c4ff 100644
--- a/src/main/java/at/gv/util/xsd/ur/pd/NatuerlichePersonTyp.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/pd/NatuerlichePersonTyp.java
@@ -1,14 +1,13 @@
 
-package at.gv.util.xsd.ur.pd;
+package at.gv.util.xsd.ur_V5.pd;
 
-import java.util.ArrayList;
-import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
 
 
 /**
@@ -25,9 +24,8 @@ import org.w3c.dom.Element;
  *       &lt;sequence minOccurs="0">
  *         &lt;element ref="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}PersonenName" minOccurs="0"/>
  *         &lt;element ref="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}Geburtsdatum" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
  *       &lt;/sequence>
- *       &lt;anyAttribute namespace='##other'/>
+ *       &lt;attGroup ref="{http://statistik.at/namespace/ur/stammdaten/4#}VollzugAttributes"/>
  *     &lt;/extension>
  *   &lt;/complexContent>
  * &lt;/complexType>
@@ -38,8 +36,7 @@ import org.w3c.dom.Element;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "NatuerlichePersonTyp", propOrder = {
     "personenName",
-    "geburtsdatum",
-    "any"
+    "geburtsdatum"
 })
 public class NatuerlichePersonTyp
     extends AbstractPersonType
@@ -49,8 +46,14 @@ public class NatuerlichePersonTyp
     protected PersonenNameTyp personenName;
     @XmlElement(name = "Geburtsdatum")
     protected String geburtsdatum;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
+    @XmlAttribute(name = "vollzugBeginn", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugBeginn;
+    @XmlAttribute(name = "vollzugEnde", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugEnde;
 
     /**
      * Gets the value of the personenName property.
@@ -101,33 +104,51 @@ public class NatuerlichePersonTyp
     }
 
     /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
+     * Gets the value of the vollzugBeginn property.
      * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugBeginn() {
+        return vollzugBeginn;
+    }
+
+    /**
+     * Sets the value of the vollzugBeginn property.
      * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugBeginn(Object value) {
+        this.vollzugBeginn = value;
+    }
+
+    /**
+     * Gets the value of the vollzugEnde property.
      * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugEnde() {
+        return vollzugEnde;
+    }
+
+    /**
+     * Sets the value of the vollzugEnde property.
      * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
      */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
+    public void setVollzugEnde(Object value) {
+        this.vollzugEnde = value;
     }
 
 }
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/pd/NichtNatuerlichePersonTyp.java b/src/main/java/at/gv/util/xsd/ur_V5/pd/NichtNatuerlichePersonTyp.java
new file mode 100644
index 0000000..eee6885
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/pd/NichtNatuerlichePersonTyp.java
@@ -0,0 +1,158 @@
+
+package at.gv.util.xsd.ur_V5.pd;
+
+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.XmlAttribute;
+import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlElementRefs;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import at.gv.util.xsd.ur_V5.search.RechtsformVollzug;
+import at.gv.util.xsd.ur_V5.search.UntNameVollzug;
+
+
+/**
+ * entspricht CorporateBodyType
+ * 
+ * <p>Java class for NichtNatuerlichePersonTyp complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="NichtNatuerlichePersonTyp">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}AbstractPersonType">
+ *       &lt;sequence minOccurs="0">
+ *         &lt;element name="VollerName" type="{http://www.w3.org/2001/XMLSchema}token" minOccurs="0"/>
+ *         &lt;element name="Rechtsform" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}UntName" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Rechtsform" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attGroup ref="{http://statistik.at/namespace/ur/stammdaten/4#}VollzugAttributes"/>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "NichtNatuerlichePersonTyp", propOrder = {
+    "rest"
+})
+public class NichtNatuerlichePersonTyp
+    extends AbstractPersonType
+{
+
+    @XmlElementRefs({
+        @XmlElementRef(name = "Rechtsform", namespace = "http://statistik.at/namespace/ur/stammdaten/4#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "VollerName", namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "Rechtsform", namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "UntName", namespace = "http://statistik.at/namespace/ur/stammdaten/4#", type = JAXBElement.class, required = false)
+    })
+    protected List<JAXBElement<?>> rest;
+    @XmlAttribute(name = "vollzugBeginn", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugBeginn;
+    @XmlAttribute(name = "vollzugEnde", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugEnde;
+
+    /**
+     * Gets the rest of the content model. 
+     * 
+     * <p>
+     * You are getting this "catch-all" property because of the following reason: 
+     * The field name "Rechtsform" is used by two different parts of a schema. See: 
+     * line 310 of file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/ur_V5/schema/urs-v5-PersonData.xsd
+     * line 299 of file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/ur_V5/schema/urs-v5-PersonData.xsd
+     * <p>
+     * To get rid of this property, apply a property customization to one 
+     * of both of the following declarations to change their names: 
+     * Gets the value of the rest property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the rest property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getRest().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link JAXBElement }{@code <}{@link UntNameVollzug }{@code >}
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link JAXBElement }{@code <}{@link RechtsformVollzug }{@code >}
+     * 
+     * 
+     */
+    public List<JAXBElement<?>> getRest() {
+        if (rest == null) {
+            rest = new ArrayList<JAXBElement<?>>();
+        }
+        return this.rest;
+    }
+
+    /**
+     * Gets the value of the vollzugBeginn property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugBeginn() {
+        return vollzugBeginn;
+    }
+
+    /**
+     * Sets the value of the vollzugBeginn property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugBeginn(Object value) {
+        this.vollzugBeginn = value;
+    }
+
+    /**
+     * Gets the value of the vollzugEnde property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugEnde() {
+        return vollzugEnde;
+    }
+
+    /**
+     * Sets the value of the vollzugEnde property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugEnde(Object value) {
+        this.vollzugEnde = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur/pd/ObjectFactory.java b/src/main/java/at/gv/util/xsd/ur_V5/pd/ObjectFactory.java
index 6758f36..80401d4 100644
--- a/src/main/java/at/gv/util/xsd/ur/pd/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/pd/ObjectFactory.java
@@ -1,16 +1,18 @@
 
-package at.gv.util.xsd.ur.pd;
+package at.gv.util.xsd.ur_V5.pd;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlElementDecl;
 import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.namespace.QName;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the at.gv.util.xsd.ur.pd package. 
+ * generated in the at.gv.util.xsd.ur_V5.pd package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -34,9 +36,11 @@ public class ObjectFactory {
     private final static QName _TypisiertePostAdresse_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/de/20040201#", "TypisiertePostAdresse");
     private final static QName _PersonenName_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/de/20040201#", "PersonenName");
     private final static QName _PersonenDaten_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/de/20040201#", "PersonenDaten");
+    private final static QName _NichtNatuerlichePersonTypRechtsform_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/de/20040201#", "Rechtsform");
+    private final static QName _NichtNatuerlichePersonTypVollerName_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/de/20040201#", "VollerName");
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.util.xsd.ur.pd
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.util.xsd.ur_V5.pd
      * 
      */
     public ObjectFactory() {
@@ -67,19 +71,19 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link PersonenDatenTyp }
+     * Create an instance of {@link PostAdresseTyp.Zustelladresse }
      * 
      */
-    public PersonenDatenTyp createPersonenDatenTyp() {
-        return new PersonenDatenTyp();
+    public PostAdresseTyp.Zustelladresse createPostAdresseTypZustelladresse() {
+        return new PostAdresseTyp.Zustelladresse();
     }
 
     /**
-     * Create an instance of {@link NatuerlichePersonTyp }
+     * Create an instance of {@link PersonenDatenTyp }
      * 
      */
-    public NatuerlichePersonTyp createNatuerlichePersonTyp() {
-        return new NatuerlichePersonTyp();
+    public PersonenDatenTyp createPersonenDatenTyp() {
+        return new PersonenDatenTyp();
     }
 
     /**
@@ -91,6 +95,14 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link NatuerlichePersonTyp }
+     * 
+     */
+    public NatuerlichePersonTyp createNatuerlichePersonTyp() {
+        return new NatuerlichePersonTyp();
+    }
+
+    /**
      * Create an instance of {@link AbstractAddressType }
      * 
      */
@@ -115,6 +127,22 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link PersonenDatenZusatzdatenTyp }
+     * 
+     */
+    public PersonenDatenZusatzdatenTyp createPersonenDatenZusatzdatenTyp() {
+        return new PersonenDatenZusatzdatenTyp();
+    }
+
+    /**
+     * Create an instance of {@link ZusatzdatenPersonenTyp }
+     * 
+     */
+    public ZusatzdatenPersonenTyp createZusatzdatenPersonenTyp() {
+        return new ZusatzdatenPersonenTyp();
+    }
+
+    /**
      * Create an instance of {@link IdentificationType.Value }
      * 
      */
@@ -139,11 +167,11 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link PostAdresseTyp.Zustelladresse }
+     * Create an instance of {@link PostAdresseTyp.Zustelladresse.AdressRegisterEintrag }
      * 
      */
-    public PostAdresseTyp.Zustelladresse createPostAdresseTypZustelladresse() {
-        return new PostAdresseTyp.Zustelladresse();
+    public PostAdresseTyp.Zustelladresse.AdressRegisterEintrag createPostAdresseTypZustelladresseAdressRegisterEintrag() {
+        return new PostAdresseTyp.Zustelladresse.AdressRegisterEintrag();
     }
 
     /**
@@ -244,4 +272,23 @@ public class ObjectFactory {
         return new JAXBElement<PersonenDatenTyp>(_PersonenDaten_QNAME, PersonenDatenTyp.class, null, value);
     }
 
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", name = "Rechtsform", scope = NichtNatuerlichePersonTyp.class)
+    public JAXBElement<String> createNichtNatuerlichePersonTypRechtsform(String value) {
+        return new JAXBElement<String>(_NichtNatuerlichePersonTypRechtsform_QNAME, String.class, NichtNatuerlichePersonTyp.class, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", name = "VollerName", scope = NichtNatuerlichePersonTyp.class)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    public JAXBElement<String> createNichtNatuerlichePersonTypVollerName(String value) {
+        return new JAXBElement<String>(_NichtNatuerlichePersonTypVollerName_QNAME, String.class, NichtNatuerlichePersonTyp.class, value);
+    }
+
 }
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/pd/PersonenDatenTyp.java b/src/main/java/at/gv/util/xsd/ur_V5/pd/PersonenDatenTyp.java
new file mode 100644
index 0000000..fb68bd5
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/pd/PersonenDatenTyp.java
@@ -0,0 +1,536 @@
+
+package at.gv.util.xsd.ur_V5.pd;
+
+import 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.gv.util.xsd.ur_V5.search.BestandsnachweisVollzug;
+import at.gv.util.xsd.ur_V5.search.BestandszeitraumVollzug;
+import at.gv.util.xsd.ur_V5.search.Branche;
+import at.gv.util.xsd.ur_V5.search.Dubletten;
+import at.gv.util.xsd.ur_V5.search.RechtstatsachenVollzug;
+import at.gv.util.xsd.ur_V5.search.TaetigkeitszeitraumVollzug;
+import at.gv.util.xsd.ur_V5.search.VertretungVollzug;
+import at.gv.util.xsd.ur_V5.search.Vollzug;
+
+
+/**
+ * Container um eine Person und ihre Adressen zu
+ * 				speichern
+ * 
+ * <p>Java class for PersonenDatenTyp complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="PersonenDatenTyp">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}AbstractPersonType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}NichtNatuerlichePerson"/>
+ *         &lt;element ref="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}TypisiertePostAdresse" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="Zusatzdaten" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence minOccurs="0">
+ *                   &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}AendDat" minOccurs="0"/>
+ *                   &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Gesperrt" minOccurs="0"/>
+ *                   &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Dubletten" minOccurs="0"/>
+ *                   &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Bestandszeitraum" maxOccurs="unbounded" minOccurs="0"/>
+ *                   &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Taetigkeitszeitraum" maxOccurs="unbounded" minOccurs="0"/>
+ *                   &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Bestandsnachweis" maxOccurs="unbounded" minOccurs="0"/>
+ *                   &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Vertretung" maxOccurs="unbounded" minOccurs="0"/>
+ *                   &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Rechtstatsachen" maxOccurs="unbounded" minOccurs="0"/>
+ *                   &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Branche" maxOccurs="unbounded" minOccurs="0"/>
+ *                   &lt;element name="PersonenDaten" type="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}PersonenDatenZusatzdatenTyp" maxOccurs="unbounded" minOccurs="0"/>
+ *                   &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Vollzug" maxOccurs="unbounded" minOccurs="0"/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "PersonenDatenTyp", propOrder = {
+    "nichtNatuerlichePerson",
+    "typisiertePostAdresse",
+    "zusatzdaten"
+})
+public class PersonenDatenTyp
+    extends AbstractPersonType
+{
+
+    @XmlElement(name = "NichtNatuerlichePerson", required = true)
+    protected NichtNatuerlichePersonTyp nichtNatuerlichePerson;
+    @XmlElement(name = "TypisiertePostAdresse")
+    protected List<TypisiertePostAdresseTyp> typisiertePostAdresse;
+    @XmlElement(name = "Zusatzdaten")
+    protected PersonenDatenTyp.Zusatzdaten zusatzdaten;
+
+    /**
+     * Gets the value of the nichtNatuerlichePerson property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link NichtNatuerlichePersonTyp }
+     *     
+     */
+    public NichtNatuerlichePersonTyp getNichtNatuerlichePerson() {
+        return nichtNatuerlichePerson;
+    }
+
+    /**
+     * Sets the value of the nichtNatuerlichePerson property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link NichtNatuerlichePersonTyp }
+     *     
+     */
+    public void setNichtNatuerlichePerson(NichtNatuerlichePersonTyp value) {
+        this.nichtNatuerlichePerson = value;
+    }
+
+    /**
+     * Gets the value of the typisiertePostAdresse property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the typisiertePostAdresse property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getTypisiertePostAdresse().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link TypisiertePostAdresseTyp }
+     * 
+     * 
+     */
+    public List<TypisiertePostAdresseTyp> getTypisiertePostAdresse() {
+        if (typisiertePostAdresse == null) {
+            typisiertePostAdresse = new ArrayList<TypisiertePostAdresseTyp>();
+        }
+        return this.typisiertePostAdresse;
+    }
+
+    /**
+     * Gets the value of the zusatzdaten property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link PersonenDatenTyp.Zusatzdaten }
+     *     
+     */
+    public PersonenDatenTyp.Zusatzdaten getZusatzdaten() {
+        return zusatzdaten;
+    }
+
+    /**
+     * Sets the value of the zusatzdaten property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link PersonenDatenTyp.Zusatzdaten }
+     *     
+     */
+    public void setZusatzdaten(PersonenDatenTyp.Zusatzdaten value) {
+        this.zusatzdaten = value;
+    }
+
+
+    /**
+     * <p>Java class for anonymous complex type.
+     * 
+     * <p>The following schema fragment specifies the expected content contained within this class.
+     * 
+     * <pre>
+     * &lt;complexType>
+     *   &lt;complexContent>
+     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       &lt;sequence minOccurs="0">
+     *         &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}AendDat" minOccurs="0"/>
+     *         &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Gesperrt" minOccurs="0"/>
+     *         &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Dubletten" minOccurs="0"/>
+     *         &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Bestandszeitraum" maxOccurs="unbounded" minOccurs="0"/>
+     *         &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Taetigkeitszeitraum" maxOccurs="unbounded" minOccurs="0"/>
+     *         &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Bestandsnachweis" maxOccurs="unbounded" minOccurs="0"/>
+     *         &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Vertretung" maxOccurs="unbounded" minOccurs="0"/>
+     *         &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Rechtstatsachen" maxOccurs="unbounded" minOccurs="0"/>
+     *         &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Branche" maxOccurs="unbounded" minOccurs="0"/>
+     *         &lt;element name="PersonenDaten" type="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}PersonenDatenZusatzdatenTyp" maxOccurs="unbounded" minOccurs="0"/>
+     *         &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Vollzug" maxOccurs="unbounded" minOccurs="0"/>
+     *       &lt;/sequence>
+     *     &lt;/restriction>
+     *   &lt;/complexContent>
+     * &lt;/complexType>
+     * </pre>
+     * 
+     * 
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "", propOrder = {
+        "aendDat",
+        "gesperrt",
+        "dubletten",
+        "bestandszeitraum",
+        "taetigkeitszeitraum",
+        "bestandsnachweis",
+        "vertretung",
+        "rechtstatsachen",
+        "branche",
+        "personenDaten",
+        "vollzug"
+    })
+    public static class Zusatzdaten {
+
+        @XmlElement(name = "AendDat", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+        @XmlSchemaType(name = "dateTime")
+        protected XMLGregorianCalendar aendDat;
+        @XmlElement(name = "Gesperrt", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+        protected Boolean gesperrt;
+        @XmlElement(name = "Dubletten", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+        protected Dubletten dubletten;
+        @XmlElement(name = "Bestandszeitraum", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+        protected List<BestandszeitraumVollzug> bestandszeitraum;
+        @XmlElement(name = "Taetigkeitszeitraum", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+        protected List<TaetigkeitszeitraumVollzug> taetigkeitszeitraum;
+        @XmlElement(name = "Bestandsnachweis", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+        protected List<BestandsnachweisVollzug> bestandsnachweis;
+        @XmlElement(name = "Vertretung", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+        protected List<VertretungVollzug> vertretung;
+        @XmlElement(name = "Rechtstatsachen", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+        protected List<RechtstatsachenVollzug> rechtstatsachen;
+        @XmlElement(name = "Branche", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+        protected List<Branche> branche;
+        @XmlElement(name = "PersonenDaten")
+        protected List<PersonenDatenZusatzdatenTyp> personenDaten;
+        @XmlElement(name = "Vollzug", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+        protected List<Vollzug> vollzug;
+
+        /**
+         * Gets the value of the aendDat property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link XMLGregorianCalendar }
+         *     
+         */
+        public XMLGregorianCalendar getAendDat() {
+            return aendDat;
+        }
+
+        /**
+         * Sets the value of the aendDat property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link XMLGregorianCalendar }
+         *     
+         */
+        public void setAendDat(XMLGregorianCalendar value) {
+            this.aendDat = value;
+        }
+
+        /**
+         * Gets the value of the gesperrt property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link Boolean }
+         *     
+         */
+        public Boolean isGesperrt() {
+            return gesperrt;
+        }
+
+        /**
+         * Sets the value of the gesperrt property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link Boolean }
+         *     
+         */
+        public void setGesperrt(Boolean value) {
+            this.gesperrt = value;
+        }
+
+        /**
+         * Gets the value of the dubletten property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link Dubletten }
+         *     
+         */
+        public Dubletten getDubletten() {
+            return dubletten;
+        }
+
+        /**
+         * Sets the value of the dubletten property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link Dubletten }
+         *     
+         */
+        public void setDubletten(Dubletten value) {
+            this.dubletten = value;
+        }
+
+        /**
+         * Gets the value of the bestandszeitraum property.
+         * 
+         * <p>
+         * This accessor method returns a reference to the live list,
+         * not a snapshot. Therefore any modification you make to the
+         * returned list will be present inside the JAXB object.
+         * This is why there is not a <CODE>set</CODE> method for the bestandszeitraum property.
+         * 
+         * <p>
+         * For example, to add a new item, do as follows:
+         * <pre>
+         *    getBestandszeitraum().add(newItem);
+         * </pre>
+         * 
+         * 
+         * <p>
+         * Objects of the following type(s) are allowed in the list
+         * {@link BestandszeitraumVollzug }
+         * 
+         * 
+         */
+        public List<BestandszeitraumVollzug> getBestandszeitraum() {
+            if (bestandszeitraum == null) {
+                bestandszeitraum = new ArrayList<BestandszeitraumVollzug>();
+            }
+            return this.bestandszeitraum;
+        }
+
+        /**
+         * Gets the value of the taetigkeitszeitraum property.
+         * 
+         * <p>
+         * This accessor method returns a reference to the live list,
+         * not a snapshot. Therefore any modification you make to the
+         * returned list will be present inside the JAXB object.
+         * This is why there is not a <CODE>set</CODE> method for the taetigkeitszeitraum property.
+         * 
+         * <p>
+         * For example, to add a new item, do as follows:
+         * <pre>
+         *    getTaetigkeitszeitraum().add(newItem);
+         * </pre>
+         * 
+         * 
+         * <p>
+         * Objects of the following type(s) are allowed in the list
+         * {@link TaetigkeitszeitraumVollzug }
+         * 
+         * 
+         */
+        public List<TaetigkeitszeitraumVollzug> getTaetigkeitszeitraum() {
+            if (taetigkeitszeitraum == null) {
+                taetigkeitszeitraum = new ArrayList<TaetigkeitszeitraumVollzug>();
+            }
+            return this.taetigkeitszeitraum;
+        }
+
+        /**
+         * Gets the value of the bestandsnachweis property.
+         * 
+         * <p>
+         * This accessor method returns a reference to the live list,
+         * not a snapshot. Therefore any modification you make to the
+         * returned list will be present inside the JAXB object.
+         * This is why there is not a <CODE>set</CODE> method for the bestandsnachweis property.
+         * 
+         * <p>
+         * For example, to add a new item, do as follows:
+         * <pre>
+         *    getBestandsnachweis().add(newItem);
+         * </pre>
+         * 
+         * 
+         * <p>
+         * Objects of the following type(s) are allowed in the list
+         * {@link BestandsnachweisVollzug }
+         * 
+         * 
+         */
+        public List<BestandsnachweisVollzug> getBestandsnachweis() {
+            if (bestandsnachweis == null) {
+                bestandsnachweis = new ArrayList<BestandsnachweisVollzug>();
+            }
+            return this.bestandsnachweis;
+        }
+
+        /**
+         * Gets the value of the vertretung property.
+         * 
+         * <p>
+         * This accessor method returns a reference to the live list,
+         * not a snapshot. Therefore any modification you make to the
+         * returned list will be present inside the JAXB object.
+         * This is why there is not a <CODE>set</CODE> method for the vertretung property.
+         * 
+         * <p>
+         * For example, to add a new item, do as follows:
+         * <pre>
+         *    getVertretung().add(newItem);
+         * </pre>
+         * 
+         * 
+         * <p>
+         * Objects of the following type(s) are allowed in the list
+         * {@link VertretungVollzug }
+         * 
+         * 
+         */
+        public List<VertretungVollzug> getVertretung() {
+            if (vertretung == null) {
+                vertretung = new ArrayList<VertretungVollzug>();
+            }
+            return this.vertretung;
+        }
+
+        /**
+         * Gets the value of the rechtstatsachen property.
+         * 
+         * <p>
+         * This accessor method returns a reference to the live list,
+         * not a snapshot. Therefore any modification you make to the
+         * returned list will be present inside the JAXB object.
+         * This is why there is not a <CODE>set</CODE> method for the rechtstatsachen property.
+         * 
+         * <p>
+         * For example, to add a new item, do as follows:
+         * <pre>
+         *    getRechtstatsachen().add(newItem);
+         * </pre>
+         * 
+         * 
+         * <p>
+         * Objects of the following type(s) are allowed in the list
+         * {@link RechtstatsachenVollzug }
+         * 
+         * 
+         */
+        public List<RechtstatsachenVollzug> getRechtstatsachen() {
+            if (rechtstatsachen == null) {
+                rechtstatsachen = new ArrayList<RechtstatsachenVollzug>();
+            }
+            return this.rechtstatsachen;
+        }
+
+        /**
+         * Gets the value of the branche property.
+         * 
+         * <p>
+         * This accessor method returns a reference to the live list,
+         * not a snapshot. Therefore any modification you make to the
+         * returned list will be present inside the JAXB object.
+         * This is why there is not a <CODE>set</CODE> method for the branche property.
+         * 
+         * <p>
+         * For example, to add a new item, do as follows:
+         * <pre>
+         *    getBranche().add(newItem);
+         * </pre>
+         * 
+         * 
+         * <p>
+         * Objects of the following type(s) are allowed in the list
+         * {@link Branche }
+         * 
+         * 
+         */
+        public List<Branche> getBranche() {
+            if (branche == null) {
+                branche = new ArrayList<Branche>();
+            }
+            return this.branche;
+        }
+
+        /**
+         * Gets the value of the personenDaten property.
+         * 
+         * <p>
+         * This accessor method returns a reference to the live list,
+         * not a snapshot. Therefore any modification you make to the
+         * returned list will be present inside the JAXB object.
+         * This is why there is not a <CODE>set</CODE> method for the personenDaten property.
+         * 
+         * <p>
+         * For example, to add a new item, do as follows:
+         * <pre>
+         *    getPersonenDaten().add(newItem);
+         * </pre>
+         * 
+         * 
+         * <p>
+         * Objects of the following type(s) are allowed in the list
+         * {@link PersonenDatenZusatzdatenTyp }
+         * 
+         * 
+         */
+        public List<PersonenDatenZusatzdatenTyp> getPersonenDaten() {
+            if (personenDaten == null) {
+                personenDaten = new ArrayList<PersonenDatenZusatzdatenTyp>();
+            }
+            return this.personenDaten;
+        }
+
+        /**
+         * Gets the value of the vollzug property.
+         * 
+         * <p>
+         * This accessor method returns a reference to the live list,
+         * not a snapshot. Therefore any modification you make to the
+         * returned list will be present inside the JAXB object.
+         * This is why there is not a <CODE>set</CODE> method for the vollzug property.
+         * 
+         * <p>
+         * For example, to add a new item, do as follows:
+         * <pre>
+         *    getVollzug().add(newItem);
+         * </pre>
+         * 
+         * 
+         * <p>
+         * Objects of the following type(s) are allowed in the list
+         * {@link Vollzug }
+         * 
+         * 
+         */
+        public List<Vollzug> getVollzug() {
+            if (vollzug == null) {
+                vollzug = new ArrayList<Vollzug>();
+            }
+            return this.vollzug;
+        }
+
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/pd/PersonenDatenZusatzdatenTyp.java b/src/main/java/at/gv/util/xsd/ur_V5/pd/PersonenDatenZusatzdatenTyp.java
new file mode 100644
index 0000000..a95eaea
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/pd/PersonenDatenZusatzdatenTyp.java
@@ -0,0 +1,160 @@
+
+package at.gv.util.xsd.ur_V5.pd;
+
+import 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;
+
+
+/**
+ * Container um eine Person und ihre Adressen zu
+ * 				speichern
+ * 
+ * <p>Java class for PersonenDatenZusatzdatenTyp complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="PersonenDatenZusatzdatenTyp">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}AbstractPersonType">
+ *       &lt;sequence>
+ *         &lt;choice minOccurs="0">
+ *           &lt;element ref="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}NichtNatuerlichePerson"/>
+ *           &lt;element ref="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}NatuerlichePerson"/>
+ *         &lt;/choice>
+ *         &lt;element ref="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}TypisiertePostAdresse" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="Zusatzdaten" type="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}ZusatzdatenPersonenTyp" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "PersonenDatenZusatzdatenTyp", propOrder = {
+    "nichtNatuerlichePerson",
+    "natuerlichePerson",
+    "typisiertePostAdresse",
+    "zusatzdaten"
+})
+public class PersonenDatenZusatzdatenTyp
+    extends AbstractPersonType
+{
+
+    @XmlElement(name = "NichtNatuerlichePerson")
+    protected NichtNatuerlichePersonTyp nichtNatuerlichePerson;
+    @XmlElement(name = "NatuerlichePerson")
+    protected NatuerlichePersonTyp natuerlichePerson;
+    @XmlElement(name = "TypisiertePostAdresse")
+    protected List<TypisiertePostAdresseTyp> typisiertePostAdresse;
+    @XmlElement(name = "Zusatzdaten")
+    protected ZusatzdatenPersonenTyp zusatzdaten;
+
+    /**
+     * Gets the value of the nichtNatuerlichePerson property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link NichtNatuerlichePersonTyp }
+     *     
+     */
+    public NichtNatuerlichePersonTyp getNichtNatuerlichePerson() {
+        return nichtNatuerlichePerson;
+    }
+
+    /**
+     * Sets the value of the nichtNatuerlichePerson property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link NichtNatuerlichePersonTyp }
+     *     
+     */
+    public void setNichtNatuerlichePerson(NichtNatuerlichePersonTyp value) {
+        this.nichtNatuerlichePerson = value;
+    }
+
+    /**
+     * Gets the value of the natuerlichePerson property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link NatuerlichePersonTyp }
+     *     
+     */
+    public NatuerlichePersonTyp getNatuerlichePerson() {
+        return natuerlichePerson;
+    }
+
+    /**
+     * Sets the value of the natuerlichePerson property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link NatuerlichePersonTyp }
+     *     
+     */
+    public void setNatuerlichePerson(NatuerlichePersonTyp value) {
+        this.natuerlichePerson = value;
+    }
+
+    /**
+     * Gets the value of the typisiertePostAdresse property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the typisiertePostAdresse property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getTypisiertePostAdresse().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link TypisiertePostAdresseTyp }
+     * 
+     * 
+     */
+    public List<TypisiertePostAdresseTyp> getTypisiertePostAdresse() {
+        if (typisiertePostAdresse == null) {
+            typisiertePostAdresse = new ArrayList<TypisiertePostAdresseTyp>();
+        }
+        return this.typisiertePostAdresse;
+    }
+
+    /**
+     * Gets the value of the zusatzdaten property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ZusatzdatenPersonenTyp }
+     *     
+     */
+    public ZusatzdatenPersonenTyp getZusatzdaten() {
+        return zusatzdaten;
+    }
+
+    /**
+     * Sets the value of the zusatzdaten property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ZusatzdatenPersonenTyp }
+     *     
+     */
+    public void setZusatzdaten(ZusatzdatenPersonenTyp value) {
+        this.zusatzdaten = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur/pd/PersonenNameTyp.java b/src/main/java/at/gv/util/xsd/ur_V5/pd/PersonenNameTyp.java
index 8c640e8..d9af557 100644
--- a/src/main/java/at/gv/util/xsd/ur/pd/PersonenNameTyp.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/pd/PersonenNameTyp.java
@@ -1,6 +1,8 @@
 
-package at.gv.util.xsd.ur.pd;
+package at.gv.util.xsd.ur_V5.pd;
 
+import 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;
@@ -40,7 +42,7 @@ import javax.xml.bind.annotation.XmlValue;
  *             &lt;/simpleContent>
  *           &lt;/complexType>
  *         &lt;/element>
- *         &lt;element name="Affix" minOccurs="0">
+ *         &lt;element name="Affix" maxOccurs="unbounded" minOccurs="0">
  *           &lt;complexType>
  *             &lt;simpleContent>
  *               &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
@@ -89,7 +91,7 @@ public class PersonenNameTyp {
     @XmlElement(name = "Familienname", required = true)
     protected PersonenNameTyp.Familienname familienname;
     @XmlElement(name = "Affix")
-    protected PersonenNameTyp.Affix affix;
+    protected List<PersonenNameTyp.Affix> affix;
 
     /**
      * Gets the value of the vorname property.
@@ -142,25 +144,30 @@ public class PersonenNameTyp {
     /**
      * Gets the value of the affix property.
      * 
-     * @return
-     *     possible object is
-     *     {@link PersonenNameTyp.Affix }
-     *     
-     */
-    public PersonenNameTyp.Affix getAffix() {
-        return affix;
-    }
-
-    /**
-     * Sets the value of the affix property.
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the affix property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAffix().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link PersonenNameTyp.Affix }
+     * 
      * 
-     * @param value
-     *     allowed object is
-     *     {@link PersonenNameTyp.Affix }
-     *     
      */
-    public void setAffix(PersonenNameTyp.Affix value) {
-        this.affix = value;
+    public List<PersonenNameTyp.Affix> getAffix() {
+        if (affix == null) {
+            affix = new ArrayList<PersonenNameTyp.Affix>();
+        }
+        return this.affix;
     }
 
 
diff --git a/src/main/java/at/gv/util/xsd/ur/pd/PostAdresseTyp.java b/src/main/java/at/gv/util/xsd/ur_V5/pd/PostAdresseTyp.java
index 5335fc2..4a402fa 100644
--- a/src/main/java/at/gv/util/xsd/ur/pd/PostAdresseTyp.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/pd/PostAdresseTyp.java
@@ -1,9 +1,8 @@
 
-package at.gv.util.xsd.ur.pd;
+package at.gv.util.xsd.ur_V5.pd;
 
 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;
@@ -41,23 +40,26 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  *                 &lt;sequence>
  *                   &lt;element name="Strassenname" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *                   &lt;element name="Orientierungsnummer" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *                   &lt;element name="Nutzungseinheitlaufnummer" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *                   &lt;element name="AdressRegisterEintrag" minOccurs="0">
+ *                     &lt;complexType>
+ *                       &lt;complexContent>
+ *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           &lt;sequence>
+ *                             &lt;element name="Adresscode" type="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}string7"/>
+ *                             &lt;element name="Subcode" type="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}string3" minOccurs="0"/>
+ *                             &lt;element name="Objektnummer" type="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}string7" minOccurs="0"/>
+ *                           &lt;/sequence>
+ *                         &lt;/restriction>
+ *                       &lt;/complexContent>
+ *                     &lt;/complexType>
+ *                   &lt;/element>
  *                 &lt;/sequence>
  *               &lt;/restriction>
  *             &lt;/complexContent>
  *           &lt;/complexType>
  *         &lt;/element>
  *       &lt;/sequence>
- *       &lt;attribute name="type" default="undefiniert">
- *         &lt;simpleType>
- *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *             &lt;enumeration value="Postfachadresse"/>
- *             &lt;enumeration value="Anschrift"/>
- *             &lt;enumeration value="MilitaerischeAdresse"/>
- *             &lt;enumeration value="undefiniert"/>
- *           &lt;/restriction>
- *         &lt;/simpleType>
- *       &lt;/attribute>
- *       &lt;anyAttribute namespace='##other'/>
  *     &lt;/extension>
  *   &lt;/complexContent>
  * &lt;/complexType>
@@ -94,8 +96,6 @@ public class PostAdresseTyp
     protected String ortschaft;
     @XmlElement(name = "Zustelladresse")
     protected PostAdresseTyp.Zustelladresse zustelladresse;
-    @XmlAttribute(name = "type")
-    protected String type;
 
     /**
      * Gets the value of the staatscode property.
@@ -241,34 +241,6 @@ public class PostAdresseTyp
         this.zustelladresse = value;
     }
 
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getType() {
-        if (type == null) {
-            return "undefiniert";
-        } else {
-            return type;
-        }
-    }
-
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
-
 
     /**
      * <p>Java class for anonymous complex type.
@@ -282,6 +254,20 @@ public class PostAdresseTyp
      *       &lt;sequence>
      *         &lt;element name="Strassenname" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
      *         &lt;element name="Orientierungsnummer" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+     *         &lt;element name="Nutzungseinheitlaufnummer" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+     *         &lt;element name="AdressRegisterEintrag" minOccurs="0">
+     *           &lt;complexType>
+     *             &lt;complexContent>
+     *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 &lt;sequence>
+     *                   &lt;element name="Adresscode" type="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}string7"/>
+     *                   &lt;element name="Subcode" type="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}string3" minOccurs="0"/>
+     *                   &lt;element name="Objektnummer" type="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}string7" minOccurs="0"/>
+     *                 &lt;/sequence>
+     *               &lt;/restriction>
+     *             &lt;/complexContent>
+     *           &lt;/complexType>
+     *         &lt;/element>
      *       &lt;/sequence>
      *     &lt;/restriction>
      *   &lt;/complexContent>
@@ -293,7 +279,9 @@ public class PostAdresseTyp
     @XmlAccessorType(XmlAccessType.FIELD)
     @XmlType(name = "", propOrder = {
         "strassenname",
-        "orientierungsnummer"
+        "orientierungsnummer",
+        "nutzungseinheitlaufnummer",
+        "adressRegisterEintrag"
     })
     public static class Zustelladresse {
 
@@ -301,6 +289,10 @@ public class PostAdresseTyp
         protected String strassenname;
         @XmlElement(name = "Orientierungsnummer")
         protected String orientierungsnummer;
+        @XmlElement(name = "Nutzungseinheitlaufnummer")
+        protected String nutzungseinheitlaufnummer;
+        @XmlElement(name = "AdressRegisterEintrag")
+        protected PostAdresseTyp.Zustelladresse.AdressRegisterEintrag adressRegisterEintrag;
 
         /**
          * Gets the value of the strassenname property.
@@ -350,6 +342,165 @@ public class PostAdresseTyp
             this.orientierungsnummer = value;
         }
 
+        /**
+         * Gets the value of the nutzungseinheitlaufnummer property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link String }
+         *     
+         */
+        public String getNutzungseinheitlaufnummer() {
+            return nutzungseinheitlaufnummer;
+        }
+
+        /**
+         * Sets the value of the nutzungseinheitlaufnummer property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link String }
+         *     
+         */
+        public void setNutzungseinheitlaufnummer(String value) {
+            this.nutzungseinheitlaufnummer = value;
+        }
+
+        /**
+         * Gets the value of the adressRegisterEintrag property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link PostAdresseTyp.Zustelladresse.AdressRegisterEintrag }
+         *     
+         */
+        public PostAdresseTyp.Zustelladresse.AdressRegisterEintrag getAdressRegisterEintrag() {
+            return adressRegisterEintrag;
+        }
+
+        /**
+         * Sets the value of the adressRegisterEintrag property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link PostAdresseTyp.Zustelladresse.AdressRegisterEintrag }
+         *     
+         */
+        public void setAdressRegisterEintrag(PostAdresseTyp.Zustelladresse.AdressRegisterEintrag value) {
+            this.adressRegisterEintrag = value;
+        }
+
+
+        /**
+         * <p>Java class for anonymous complex type.
+         * 
+         * <p>The following schema fragment specifies the expected content contained within this class.
+         * 
+         * <pre>
+         * &lt;complexType>
+         *   &lt;complexContent>
+         *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       &lt;sequence>
+         *         &lt;element name="Adresscode" type="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}string7"/>
+         *         &lt;element name="Subcode" type="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}string3" minOccurs="0"/>
+         *         &lt;element name="Objektnummer" type="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}string7" minOccurs="0"/>
+         *       &lt;/sequence>
+         *     &lt;/restriction>
+         *   &lt;/complexContent>
+         * &lt;/complexType>
+         * </pre>
+         * 
+         * 
+         */
+        @XmlAccessorType(XmlAccessType.FIELD)
+        @XmlType(name = "", propOrder = {
+            "adresscode",
+            "subcode",
+            "objektnummer"
+        })
+        public static class AdressRegisterEintrag {
+
+            @XmlElement(name = "Adresscode", required = true)
+            protected String adresscode;
+            @XmlElement(name = "Subcode")
+            protected String subcode;
+            @XmlElement(name = "Objektnummer")
+            protected String objektnummer;
+
+            /**
+             * Gets the value of the adresscode property.
+             * 
+             * @return
+             *     possible object is
+             *     {@link String }
+             *     
+             */
+            public String getAdresscode() {
+                return adresscode;
+            }
+
+            /**
+             * Sets the value of the adresscode property.
+             * 
+             * @param value
+             *     allowed object is
+             *     {@link String }
+             *     
+             */
+            public void setAdresscode(String value) {
+                this.adresscode = value;
+            }
+
+            /**
+             * Gets the value of the subcode property.
+             * 
+             * @return
+             *     possible object is
+             *     {@link String }
+             *     
+             */
+            public String getSubcode() {
+                return subcode;
+            }
+
+            /**
+             * Sets the value of the subcode property.
+             * 
+             * @param value
+             *     allowed object is
+             *     {@link String }
+             *     
+             */
+            public void setSubcode(String value) {
+                this.subcode = value;
+            }
+
+            /**
+             * Gets the value of the objektnummer property.
+             * 
+             * @return
+             *     possible object is
+             *     {@link String }
+             *     
+             */
+            public String getObjektnummer() {
+                return objektnummer;
+            }
+
+            /**
+             * Sets the value of the objektnummer property.
+             * 
+             * @param value
+             *     allowed object is
+             *     {@link String }
+             *     
+             */
+            public void setObjektnummer(String value) {
+                this.objektnummer = value;
+            }
+
+        }
+
     }
 
 }
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/pd/TypisiertePostAdresseTyp.java b/src/main/java/at/gv/util/xsd/ur_V5/pd/TypisiertePostAdresseTyp.java
new file mode 100644
index 0000000..da4be8d
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/pd/TypisiertePostAdresseTyp.java
@@ -0,0 +1,156 @@
+
+package at.gv.util.xsd.ur_V5.pd;
+
+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.XmlIDREF;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import at.gv.util.xsd.ur_V5.simpletypes.AdressTyp;
+
+
+/**
+ * entspricht TypedPostalAddressType
+ * 			
+ * 
+ * <p>Java class for TypisiertePostAdresseTyp complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TypisiertePostAdresseTyp">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}AbstractAddressType">
+ *       &lt;sequence minOccurs="0">
+ *         &lt;element ref="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}PostAdresse"/>
+ *         &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Typ"/>
+ *       &lt;/sequence>
+ *       &lt;attGroup ref="{http://statistik.at/namespace/ur/stammdaten/4#}VollzugAttributes"/>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TypisiertePostAdresseTyp", propOrder = {
+    "postAdresse",
+    "typ"
+})
+public class TypisiertePostAdresseTyp
+    extends AbstractAddressType
+{
+
+    @XmlElement(name = "PostAdresse")
+    protected PostAdresseTyp postAdresse;
+    @XmlElement(name = "Typ", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    protected AdressTyp typ;
+    @XmlAttribute(name = "vollzugBeginn", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugBeginn;
+    @XmlAttribute(name = "vollzugEnde", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugEnde;
+
+    /**
+     * Gets the value of the postAdresse property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link PostAdresseTyp }
+     *     
+     */
+    public PostAdresseTyp getPostAdresse() {
+        return postAdresse;
+    }
+
+    /**
+     * Sets the value of the postAdresse property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link PostAdresseTyp }
+     *     
+     */
+    public void setPostAdresse(PostAdresseTyp value) {
+        this.postAdresse = value;
+    }
+
+    /**
+     * Gets the value of the typ property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link AdressTyp }
+     *     
+     */
+    public AdressTyp getTyp() {
+        return typ;
+    }
+
+    /**
+     * Sets the value of the typ property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link AdressTyp }
+     *     
+     */
+    public void setTyp(AdressTyp value) {
+        this.typ = value;
+    }
+
+    /**
+     * Gets the value of the vollzugBeginn property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugBeginn() {
+        return vollzugBeginn;
+    }
+
+    /**
+     * Sets the value of the vollzugBeginn property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugBeginn(Object value) {
+        this.vollzugBeginn = value;
+    }
+
+    /**
+     * Gets the value of the vollzugEnde property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugEnde() {
+        return vollzugEnde;
+    }
+
+    /**
+     * Sets the value of the vollzugEnde property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugEnde(Object value) {
+        this.vollzugEnde = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/pd/ZusatzdatenPersonenTyp.java b/src/main/java/at/gv/util/xsd/ur_V5/pd/ZusatzdatenPersonenTyp.java
new file mode 100644
index 0000000..f5aee24
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/pd/ZusatzdatenPersonenTyp.java
@@ -0,0 +1,133 @@
+
+package at.gv.util.xsd.ur_V5.pd;
+
+import 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.gv.util.xsd.ur_V5.search.FunktionVollzug;
+import at.gv.util.xsd.ur_V5.search.RechtstatsachenVollzug;
+import at.gv.util.xsd.ur_V5.simpletypes.EvbStatusTyp;
+
+
+/**
+ * <p>Java class for ZusatzdatenPersonenTyp complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ZusatzdatenPersonenTyp">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}EvbStatus" minOccurs="0"/>
+ *         &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Funktion" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}Rechtstatsachen" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ZusatzdatenPersonenTyp", propOrder = {
+    "evbStatus",
+    "funktion",
+    "rechtstatsachen"
+})
+public class ZusatzdatenPersonenTyp {
+
+    @XmlElement(name = "EvbStatus", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    protected EvbStatusTyp evbStatus;
+    @XmlElement(name = "Funktion", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    protected List<FunktionVollzug> funktion;
+    @XmlElement(name = "Rechtstatsachen", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    protected List<RechtstatsachenVollzug> rechtstatsachen;
+
+    /**
+     * Gets the value of the evbStatus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link EvbStatusTyp }
+     *     
+     */
+    public EvbStatusTyp getEvbStatus() {
+        return evbStatus;
+    }
+
+    /**
+     * Sets the value of the evbStatus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link EvbStatusTyp }
+     *     
+     */
+    public void setEvbStatus(EvbStatusTyp value) {
+        this.evbStatus = value;
+    }
+
+    /**
+     * Gets the value of the funktion property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the funktion property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getFunktion().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link FunktionVollzug }
+     * 
+     * 
+     */
+    public List<FunktionVollzug> getFunktion() {
+        if (funktion == null) {
+            funktion = new ArrayList<FunktionVollzug>();
+        }
+        return this.funktion;
+    }
+
+    /**
+     * Gets the value of the rechtstatsachen property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the rechtstatsachen property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getRechtstatsachen().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link RechtstatsachenVollzug }
+     * 
+     * 
+     */
+    public List<RechtstatsachenVollzug> getRechtstatsachen() {
+        if (rechtstatsachen == null) {
+            rechtstatsachen = new ArrayList<RechtstatsachenVollzug>();
+        }
+        return this.rechtstatsachen;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur/pd/package-info.java b/src/main/java/at/gv/util/xsd/ur_V5/pd/package-info.java
index 64113f9..c485dc8 100644
--- a/src/main/java/at/gv/util/xsd/ur/pd/package-info.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/pd/package-info.java
@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package at.gv.util.xsd.ur.pd;
+package at.gv.util.xsd.ur_V5.pd;
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/Bestandsnachweis.java b/src/main/java/at/gv/util/xsd/ur_V5/search/Bestandsnachweis.java
new file mode 100644
index 0000000..00d36d7
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/Bestandsnachweis.java
@@ -0,0 +1,63 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+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 javax.xml.bind.annotation.XmlValue;
+
+
+/**
+ * <p>Java class for Bestandsnachweis complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Bestandsnachweis">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Bestandsnachweis", propOrder = {
+    "value"
+})
+@XmlSeeAlso({
+    BestandsnachweisVollzug.class
+})
+public abstract class Bestandsnachweis {
+
+    @XmlValue
+    protected String value;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/BestandsnachweisVollzug.java b/src/main/java/at/gv/util/xsd/ur_V5/search/BestandsnachweisVollzug.java
new file mode 100644
index 0000000..3f6f957
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/BestandsnachweisVollzug.java
@@ -0,0 +1,92 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for BestandsnachweisVollzug complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="BestandsnachweisVollzug">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://statistik.at/namespace/ur/stammdaten/4#>Bestandsnachweis">
+ *       &lt;attGroup ref="{http://statistik.at/namespace/ur/stammdaten/4#}VollzugAttributes"/>
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "BestandsnachweisVollzug")
+public class BestandsnachweisVollzug
+    extends Bestandsnachweis
+{
+
+    @XmlAttribute(name = "vollzugBeginn", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugBeginn;
+    @XmlAttribute(name = "vollzugEnde", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugEnde;
+
+    /**
+     * Gets the value of the vollzugBeginn property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugBeginn() {
+        return vollzugBeginn;
+    }
+
+    /**
+     * Sets the value of the vollzugBeginn property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugBeginn(Object value) {
+        this.vollzugBeginn = value;
+    }
+
+    /**
+     * Gets the value of the vollzugEnde property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugEnde() {
+        return vollzugEnde;
+    }
+
+    /**
+     * Sets the value of the vollzugEnde property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugEnde(Object value) {
+        this.vollzugEnde = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/Bestandszeitraum.java b/src/main/java/at/gv/util/xsd/ur_V5/search/Bestandszeitraum.java
new file mode 100644
index 0000000..337d8b6
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/Bestandszeitraum.java
@@ -0,0 +1,98 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+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;
+
+
+/**
+ * <p>Java class for Bestandszeitraum complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Bestandszeitraum">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="BestandVon" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
+ *         &lt;element name="BestandBis" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Bestandszeitraum", propOrder = {
+    "bestandVon",
+    "bestandBis"
+})
+@XmlSeeAlso({
+    BestandszeitraumVollzug.class
+})
+public abstract class Bestandszeitraum {
+
+    @XmlElement(name = "BestandVon")
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar bestandVon;
+    @XmlElement(name = "BestandBis")
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar bestandBis;
+
+    /**
+     * Gets the value of the bestandVon property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getBestandVon() {
+        return bestandVon;
+    }
+
+    /**
+     * Sets the value of the bestandVon property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setBestandVon(XMLGregorianCalendar value) {
+        this.bestandVon = value;
+    }
+
+    /**
+     * Gets the value of the bestandBis property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getBestandBis() {
+        return bestandBis;
+    }
+
+    /**
+     * Sets the value of the bestandBis property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setBestandBis(XMLGregorianCalendar value) {
+        this.bestandBis = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/BestandszeitraumVollzug.java b/src/main/java/at/gv/util/xsd/ur_V5/search/BestandszeitraumVollzug.java
new file mode 100644
index 0000000..3249535
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/BestandszeitraumVollzug.java
@@ -0,0 +1,92 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for BestandszeitraumVollzug complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="BestandszeitraumVollzug">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://statistik.at/namespace/ur/stammdaten/4#}Bestandszeitraum">
+ *       &lt;attGroup ref="{http://statistik.at/namespace/ur/stammdaten/4#}VollzugAttributes"/>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "BestandszeitraumVollzug")
+public class BestandszeitraumVollzug
+    extends Bestandszeitraum
+{
+
+    @XmlAttribute(name = "vollzugBeginn", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugBeginn;
+    @XmlAttribute(name = "vollzugEnde", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugEnde;
+
+    /**
+     * Gets the value of the vollzugBeginn property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugBeginn() {
+        return vollzugBeginn;
+    }
+
+    /**
+     * Sets the value of the vollzugBeginn property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugBeginn(Object value) {
+        this.vollzugBeginn = value;
+    }
+
+    /**
+     * Gets the value of the vollzugEnde property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugEnde() {
+        return vollzugEnde;
+    }
+
+    /**
+     * Sets the value of the vollzugEnde property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugEnde(Object value) {
+        this.vollzugEnde = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur/search/Branche.java b/src/main/java/at/gv/util/xsd/ur_V5/search/Branche.java
index d7a4ab8..28b822d 100644
--- a/src/main/java/at/gv/util/xsd/ur/search/Branche.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/Branche.java
@@ -1,12 +1,12 @@
 
-package at.gv.util.xsd.ur.search;
+package at.gv.util.xsd.ur_V5.search;
 
 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.gv.util.xsd.ur.simpletypes.OenaceArtTyp;
+import at.gv.util.xsd.ur_V5.simpletypes.OenaceArtTyp;
 
 
 /**
@@ -19,12 +19,12 @@ import at.gv.util.xsd.ur.simpletypes.OenaceArtTyp;
  *   &lt;complexContent>
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;sequence>
- *         &lt;element name="Oenace" type="{http://statistik.at/namespace/ur/stammdaten/1#}OenaceType"/>
+ *         &lt;element name="Oenace" type="{http://statistik.at/namespace/ur/stammdaten/4#}OenaceType"/>
  *         &lt;element name="OenaceText" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="Beginn" type="{http://statistik.at/namespace/ur/stammdaten/1#}QuellenType"/>
- *         &lt;element name="Ende" type="{http://statistik.at/namespace/ur/stammdaten/1#}QuellenType" minOccurs="0"/>
+ *         &lt;element name="Beginn" type="{http://statistik.at/namespace/ur/stammdaten/4#}QuellenType"/>
+ *         &lt;element name="Ende" type="{http://statistik.at/namespace/ur/stammdaten/4#}QuellenType" minOccurs="0"/>
  *       &lt;/sequence>
- *       &lt;attribute name="art" use="required" type="{http://statistik.at/namespace/ur/simpleTypes/1#}OenaceArtTyp" />
+ *       &lt;attribute name="art" use="required" type="{http://statistik.at/namespace/ur/simpleTypes/2#}OenaceArtTyp" />
  *     &lt;/restriction>
  *   &lt;/complexContent>
  * &lt;/complexType>
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/Dubletten.java b/src/main/java/at/gv/util/xsd/ur_V5/search/Dubletten.java
new file mode 100644
index 0000000..3126e85
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/Dubletten.java
@@ -0,0 +1,124 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+import 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.gv.util.xsd.ur_V5.simpletypes.ArtDublette;
+
+
+/**
+ * <p>Java class for Dubletten complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Dubletten">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="art" type="{http://statistik.at/namespace/ur/simpleTypes/2#}ArtDublette"/>
+ *         &lt;element name="kurMaster" type="{http://statistik.at/namespace/ur/simpleTypes/2#}KurTyp" minOccurs="0"/>
+ *         &lt;element name="kurSlave" type="{http://statistik.at/namespace/ur/simpleTypes/2#}KurTyp" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Dubletten", propOrder = {
+    "art",
+    "kurMaster",
+    "kurSlave"
+})
+public class Dubletten {
+
+    @XmlElement(required = true)
+    protected ArtDublette art;
+    protected String kurMaster;
+    protected List<String> kurSlave;
+
+    /**
+     * Gets the value of the art property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ArtDublette }
+     *     
+     */
+    public ArtDublette getArt() {
+        return art;
+    }
+
+    /**
+     * Sets the value of the art property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ArtDublette }
+     *     
+     */
+    public void setArt(ArtDublette value) {
+        this.art = value;
+    }
+
+    /**
+     * Gets the value of the kurMaster property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getKurMaster() {
+        return kurMaster;
+    }
+
+    /**
+     * Sets the value of the kurMaster property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setKurMaster(String value) {
+        this.kurMaster = value;
+    }
+
+    /**
+     * Gets the value of the kurSlave property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the kurSlave property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getKurSlave().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getKurSlave() {
+        if (kurSlave == null) {
+            kurSlave = new ArrayList<String>();
+        }
+        return this.kurSlave;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/FktRegelTyp.java b/src/main/java/at/gv/util/xsd/ur_V5/search/FktRegelTyp.java
new file mode 100644
index 0000000..c302dd4
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/FktRegelTyp.java
@@ -0,0 +1,126 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+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;
+
+
+/**
+ * <p>Java class for FktRegelTyp complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="FktRegelTyp">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="FktRegelVon" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
+ *         &lt;element name="FktRegelBis" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
+ *         &lt;element name="FktRegelText" type="{http://statistik.at/namespace/ur/simpleTypes/2#}FktRegelTextTyp" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "FktRegelTyp", propOrder = {
+    "fktRegelVon",
+    "fktRegelBis",
+    "fktRegelText"
+})
+@XmlSeeAlso({
+    FktRegelTypVollzug.class
+})
+public abstract class FktRegelTyp {
+
+    @XmlElement(name = "FktRegelVon")
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar fktRegelVon;
+    @XmlElement(name = "FktRegelBis")
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar fktRegelBis;
+    @XmlElement(name = "FktRegelText")
+    protected String fktRegelText;
+
+    /**
+     * Gets the value of the fktRegelVon property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getFktRegelVon() {
+        return fktRegelVon;
+    }
+
+    /**
+     * Sets the value of the fktRegelVon property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setFktRegelVon(XMLGregorianCalendar value) {
+        this.fktRegelVon = value;
+    }
+
+    /**
+     * Gets the value of the fktRegelBis property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getFktRegelBis() {
+        return fktRegelBis;
+    }
+
+    /**
+     * Sets the value of the fktRegelBis property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setFktRegelBis(XMLGregorianCalendar value) {
+        this.fktRegelBis = value;
+    }
+
+    /**
+     * Gets the value of the fktRegelText property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFktRegelText() {
+        return fktRegelText;
+    }
+
+    /**
+     * Sets the value of the fktRegelText property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFktRegelText(String value) {
+        this.fktRegelText = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/FktRegelTypVollzug.java b/src/main/java/at/gv/util/xsd/ur_V5/search/FktRegelTypVollzug.java
new file mode 100644
index 0000000..5216279
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/FktRegelTypVollzug.java
@@ -0,0 +1,92 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for FktRegelTypVollzug complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="FktRegelTypVollzug">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://statistik.at/namespace/ur/stammdaten/4#}FktRegelTyp">
+ *       &lt;attGroup ref="{http://statistik.at/namespace/ur/stammdaten/4#}VollzugAttributes"/>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "FktRegelTypVollzug")
+public class FktRegelTypVollzug
+    extends FktRegelTyp
+{
+
+    @XmlAttribute(name = "vollzugBeginn", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugBeginn;
+    @XmlAttribute(name = "vollzugEnde", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugEnde;
+
+    /**
+     * Gets the value of the vollzugBeginn property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugBeginn() {
+        return vollzugBeginn;
+    }
+
+    /**
+     * Sets the value of the vollzugBeginn property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugBeginn(Object value) {
+        this.vollzugBeginn = value;
+    }
+
+    /**
+     * Gets the value of the vollzugEnde property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugEnde() {
+        return vollzugEnde;
+    }
+
+    /**
+     * Sets the value of the vollzugEnde property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugEnde(Object value) {
+        this.vollzugEnde = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/Funktion.java b/src/main/java/at/gv/util/xsd/ur_V5/search/Funktion.java
new file mode 100644
index 0000000..2f3eef0
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/Funktion.java
@@ -0,0 +1,86 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+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;
+
+
+/**
+ * <p>Java class for Funktion complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Funktion">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="FktName" type="{http://statistik.at/namespace/ur/simpleTypes/2#}FunktionTyp"/>
+ *         &lt;element name="FktNameText" type="{http://statistik.at/namespace/ur/simpleTypes/2#}FunktionTextTyp" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Funktion", propOrder = {
+    "fktName",
+    "fktNameText"
+})
+@XmlSeeAlso({
+    FunktionVollzug.class
+})
+public abstract class Funktion {
+
+    @XmlElement(name = "FktName")
+    protected int fktName;
+    @XmlElement(name = "FktNameText")
+    protected String fktNameText;
+
+    /**
+     * Gets the value of the fktName property.
+     * 
+     */
+    public int getFktName() {
+        return fktName;
+    }
+
+    /**
+     * Sets the value of the fktName property.
+     * 
+     */
+    public void setFktName(int value) {
+        this.fktName = value;
+    }
+
+    /**
+     * Gets the value of the fktNameText property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFktNameText() {
+        return fktNameText;
+    }
+
+    /**
+     * Sets the value of the fktNameText property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFktNameText(String value) {
+        this.fktNameText = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/FunktionVollzug.java b/src/main/java/at/gv/util/xsd/ur_V5/search/FunktionVollzug.java
new file mode 100644
index 0000000..ef648d6
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/FunktionVollzug.java
@@ -0,0 +1,164 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+import 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.XmlIDREF;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for FunktionVollzug complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="FunktionVollzug">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://statistik.at/namespace/ur/stammdaten/4#}Funktion">
+ *       &lt;sequence>
+ *         &lt;element name="FktRegel" type="{http://statistik.at/namespace/ur/stammdaten/4#}FktRegelTypVollzug" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="Rechtstatsachen" type="{http://statistik.at/namespace/ur/stammdaten/4#}RechtstatsachenVollzug" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attGroup ref="{http://statistik.at/namespace/ur/stammdaten/4#}VollzugAttributes"/>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "FunktionVollzug", propOrder = {
+    "fktRegel",
+    "rechtstatsachen"
+})
+public class FunktionVollzug
+    extends Funktion
+{
+
+    @XmlElement(name = "FktRegel")
+    protected List<FktRegelTypVollzug> fktRegel;
+    @XmlElement(name = "Rechtstatsachen")
+    protected List<RechtstatsachenVollzug> rechtstatsachen;
+    @XmlAttribute(name = "vollzugBeginn", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugBeginn;
+    @XmlAttribute(name = "vollzugEnde", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugEnde;
+
+    /**
+     * Gets the value of the fktRegel property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the fktRegel property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getFktRegel().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link FktRegelTypVollzug }
+     * 
+     * 
+     */
+    public List<FktRegelTypVollzug> getFktRegel() {
+        if (fktRegel == null) {
+            fktRegel = new ArrayList<FktRegelTypVollzug>();
+        }
+        return this.fktRegel;
+    }
+
+    /**
+     * Gets the value of the rechtstatsachen property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the rechtstatsachen property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getRechtstatsachen().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link RechtstatsachenVollzug }
+     * 
+     * 
+     */
+    public List<RechtstatsachenVollzug> getRechtstatsachen() {
+        if (rechtstatsachen == null) {
+            rechtstatsachen = new ArrayList<RechtstatsachenVollzug>();
+        }
+        return this.rechtstatsachen;
+    }
+
+    /**
+     * Gets the value of the vollzugBeginn property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugBeginn() {
+        return vollzugBeginn;
+    }
+
+    /**
+     * Sets the value of the vollzugBeginn property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugBeginn(Object value) {
+        this.vollzugBeginn = value;
+    }
+
+    /**
+     * Gets the value of the vollzugEnde property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugEnde() {
+        return vollzugEnde;
+    }
+
+    /**
+     * Sets the value of the vollzugEnde property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugEnde(Object value) {
+        this.vollzugEnde = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/ObjectFactory.java b/src/main/java/at/gv/util/xsd/ur_V5/search/ObjectFactory.java
new file mode 100644
index 0000000..a41014c
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/ObjectFactory.java
@@ -0,0 +1,482 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.datatype.XMLGregorianCalendar;
+import javax.xml.namespace.QName;
+import at.gv.util.xsd.ur_V5.simpletypes.AdressTyp;
+import at.gv.util.xsd.ur_V5.simpletypes.EvbStatusTyp;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the at.gv.util.xsd.ur_V5.search package. 
+ * <p>An ObjectFactory allows you to programatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private final static QName _Bestandsnachweis_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "Bestandsnachweis");
+    private final static QName _SucheUnternehmenNachIdRequest_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "SucheUnternehmenNachIdRequest");
+    private final static QName _Bestandszeitraum_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "Bestandszeitraum");
+    private final static QName _Vertretung_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "Vertretung");
+    private final static QName _EvbStatus_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "EvbStatus");
+    private final static QName _TypeText_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "TypeText");
+    private final static QName _SucheUnternehmenNachBpkRequest_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "SucheUnternehmenNachBpkRequest");
+    private final static QName _Funktion_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "Funktion");
+    private final static QName _Taetigkeitszeitraum_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "Taetigkeitszeitraum");
+    private final static QName _SucheUnternehmenNachAendDatRequest_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "SucheUnternehmenNachAendDatRequest");
+    private final static QName _UntName_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "UntName");
+    private final static QName _SucheUnternehmenRequest_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "SucheUnternehmenRequest");
+    private final static QName _URVPdf_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "URV_pdf");
+    private final static QName _Dubletten_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "Dubletten");
+    private final static QName _Typ_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "Typ");
+    private final static QName _Rechtsform_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "Rechtsform");
+    private final static QName _Rechtstatsachen_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "Rechtstatsachen");
+    private final static QName _Ende_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "Ende");
+    private final static QName _Branche_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "Branche");
+    private final static QName _Gesperrt_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "Gesperrt");
+    private final static QName _Beginn_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "Beginn");
+    private final static QName _Vollzug_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "Vollzug");
+    private final static QName _AendDat_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "AendDat");
+    private final static QName _BpkWTUR_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "bpkWTUR");
+    private final static QName _ErsbAttribute_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "ErsbAttribute");
+    private final static QName _SucheUnternehmenNachIdsRequest_QNAME = new QName("http://statistik.at/namespace/ur/stammdaten/4#", "SucheUnternehmenNachIdsRequest");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.util.xsd.ur_V5.search
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link QuellenType }
+     * 
+     */
+    public QuellenType createQuellenType() {
+        return new QuellenType();
+    }
+
+    /**
+     * Create an instance of {@link SucheUnternehmenNachBpkRequest }
+     * 
+     */
+    public SucheUnternehmenNachBpkRequest createSucheUnternehmenNachBpkRequest() {
+        return new SucheUnternehmenNachBpkRequest();
+    }
+
+    /**
+     * Create an instance of {@link Dubletten }
+     * 
+     */
+    public Dubletten createDubletten() {
+        return new Dubletten();
+    }
+
+    /**
+     * Create an instance of {@link RechtsformVollzug }
+     * 
+     */
+    public RechtsformVollzug createRechtsformVollzug() {
+        return new RechtsformVollzug();
+    }
+
+    /**
+     * Create an instance of {@link RechtstatsachenVollzug }
+     * 
+     */
+    public RechtstatsachenVollzug createRechtstatsachenVollzug() {
+        return new RechtstatsachenVollzug();
+    }
+
+    /**
+     * Create an instance of {@link BestandszeitraumVollzug }
+     * 
+     */
+    public BestandszeitraumVollzug createBestandszeitraumVollzug() {
+        return new BestandszeitraumVollzug();
+    }
+
+    /**
+     * Create an instance of {@link VertretungVollzug }
+     * 
+     */
+    public VertretungVollzug createVertretungVollzug() {
+        return new VertretungVollzug();
+    }
+
+    /**
+     * Create an instance of {@link BestandsnachweisVollzug }
+     * 
+     */
+    public BestandsnachweisVollzug createBestandsnachweisVollzug() {
+        return new BestandsnachweisVollzug();
+    }
+
+    /**
+     * Create an instance of {@link SucheUnternehmenNachIdRequest }
+     * 
+     */
+    public SucheUnternehmenNachIdRequest createSucheUnternehmenNachIdRequest() {
+        return new SucheUnternehmenNachIdRequest();
+    }
+
+    /**
+     * Create an instance of {@link SucheUnternehmenRequest }
+     * 
+     */
+    public SucheUnternehmenRequest createSucheUnternehmenRequest() {
+        return new SucheUnternehmenRequest();
+    }
+
+    /**
+     * Create an instance of {@link UntNameVollzug }
+     * 
+     */
+    public UntNameVollzug createUntNameVollzug() {
+        return new UntNameVollzug();
+    }
+
+    /**
+     * Create an instance of {@link SucheUnternehmenNachIdsRequest }
+     * 
+     */
+    public SucheUnternehmenNachIdsRequest createSucheUnternehmenNachIdsRequest() {
+        return new SucheUnternehmenNachIdsRequest();
+    }
+
+    /**
+     * Create an instance of {@link SucheUnternehmenNachAendDatRequest }
+     * 
+     */
+    public SucheUnternehmenNachAendDatRequest createSucheUnternehmenNachAendDatRequest() {
+        return new SucheUnternehmenNachAendDatRequest();
+    }
+
+    /**
+     * Create an instance of {@link Branche }
+     * 
+     */
+    public Branche createBranche() {
+        return new Branche();
+    }
+
+    /**
+     * Create an instance of {@link Vollzug }
+     * 
+     */
+    public Vollzug createVollzug() {
+        return new Vollzug();
+    }
+
+    /**
+     * Create an instance of {@link FunktionVollzug }
+     * 
+     */
+    public FunktionVollzug createFunktionVollzug() {
+        return new FunktionVollzug();
+    }
+
+    /**
+     * Create an instance of {@link TaetigkeitszeitraumVollzug }
+     * 
+     */
+    public TaetigkeitszeitraumVollzug createTaetigkeitszeitraumVollzug() {
+        return new TaetigkeitszeitraumVollzug();
+    }
+
+    /**
+     * Create an instance of {@link SucheUnternehmensdaten }
+     * 
+     */
+    public SucheUnternehmensdaten createSucheUnternehmensdaten() {
+        return new SucheUnternehmensdaten();
+    }
+
+    /**
+     * Create an instance of {@link OenaceType }
+     * 
+     */
+    public OenaceType createOenaceType() {
+        return new OenaceType();
+    }
+
+    /**
+     * Create an instance of {@link VollzugElem }
+     * 
+     */
+    public VollzugElem createVollzugElem() {
+        return new VollzugElem();
+    }
+
+    /**
+     * Create an instance of {@link SucheBranche }
+     * 
+     */
+    public SucheBranche createSucheBranche() {
+        return new SucheBranche();
+    }
+
+    /**
+     * Create an instance of {@link FktRegelTypVollzug }
+     * 
+     */
+    public FktRegelTypVollzug createFktRegelTypVollzug() {
+        return new FktRegelTypVollzug();
+    }
+
+    /**
+     * Create an instance of {@link SuchePersonendaten }
+     * 
+     */
+    public SuchePersonendaten createSuchePersonendaten() {
+        return new SuchePersonendaten();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link BestandsnachweisVollzug }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "Bestandsnachweis")
+    public JAXBElement<BestandsnachweisVollzug> createBestandsnachweis(BestandsnachweisVollzug value) {
+        return new JAXBElement<BestandsnachweisVollzug>(_Bestandsnachweis_QNAME, BestandsnachweisVollzug.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SucheUnternehmenNachIdRequest }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "SucheUnternehmenNachIdRequest")
+    public JAXBElement<SucheUnternehmenNachIdRequest> createSucheUnternehmenNachIdRequest(SucheUnternehmenNachIdRequest value) {
+        return new JAXBElement<SucheUnternehmenNachIdRequest>(_SucheUnternehmenNachIdRequest_QNAME, SucheUnternehmenNachIdRequest.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link BestandszeitraumVollzug }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "Bestandszeitraum")
+    public JAXBElement<BestandszeitraumVollzug> createBestandszeitraum(BestandszeitraumVollzug value) {
+        return new JAXBElement<BestandszeitraumVollzug>(_Bestandszeitraum_QNAME, BestandszeitraumVollzug.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link VertretungVollzug }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "Vertretung")
+    public JAXBElement<VertretungVollzug> createVertretung(VertretungVollzug value) {
+        return new JAXBElement<VertretungVollzug>(_Vertretung_QNAME, VertretungVollzug.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EvbStatusTyp }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "EvbStatus")
+    public JAXBElement<EvbStatusTyp> createEvbStatus(EvbStatusTyp value) {
+        return new JAXBElement<EvbStatusTyp>(_EvbStatus_QNAME, EvbStatusTyp.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "TypeText")
+    public JAXBElement<String> createTypeText(String value) {
+        return new JAXBElement<String>(_TypeText_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SucheUnternehmenNachBpkRequest }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "SucheUnternehmenNachBpkRequest")
+    public JAXBElement<SucheUnternehmenNachBpkRequest> createSucheUnternehmenNachBpkRequest(SucheUnternehmenNachBpkRequest value) {
+        return new JAXBElement<SucheUnternehmenNachBpkRequest>(_SucheUnternehmenNachBpkRequest_QNAME, SucheUnternehmenNachBpkRequest.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link FunktionVollzug }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "Funktion")
+    public JAXBElement<FunktionVollzug> createFunktion(FunktionVollzug value) {
+        return new JAXBElement<FunktionVollzug>(_Funktion_QNAME, FunktionVollzug.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TaetigkeitszeitraumVollzug }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "Taetigkeitszeitraum")
+    public JAXBElement<TaetigkeitszeitraumVollzug> createTaetigkeitszeitraum(TaetigkeitszeitraumVollzug value) {
+        return new JAXBElement<TaetigkeitszeitraumVollzug>(_Taetigkeitszeitraum_QNAME, TaetigkeitszeitraumVollzug.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SucheUnternehmenNachAendDatRequest }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "SucheUnternehmenNachAendDatRequest")
+    public JAXBElement<SucheUnternehmenNachAendDatRequest> createSucheUnternehmenNachAendDatRequest(SucheUnternehmenNachAendDatRequest value) {
+        return new JAXBElement<SucheUnternehmenNachAendDatRequest>(_SucheUnternehmenNachAendDatRequest_QNAME, SucheUnternehmenNachAendDatRequest.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link UntNameVollzug }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "UntName")
+    public JAXBElement<UntNameVollzug> createUntName(UntNameVollzug value) {
+        return new JAXBElement<UntNameVollzug>(_UntName_QNAME, UntNameVollzug.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SucheUnternehmenRequest }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "SucheUnternehmenRequest")
+    public JAXBElement<SucheUnternehmenRequest> createSucheUnternehmenRequest(SucheUnternehmenRequest value) {
+        return new JAXBElement<SucheUnternehmenRequest>(_SucheUnternehmenRequest_QNAME, SucheUnternehmenRequest.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "URV_pdf")
+    public JAXBElement<byte[]> createURVPdf(byte[] value) {
+        return new JAXBElement<byte[]>(_URVPdf_QNAME, byte[].class, null, ((byte[]) value));
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Dubletten }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "Dubletten")
+    public JAXBElement<Dubletten> createDubletten(Dubletten value) {
+        return new JAXBElement<Dubletten>(_Dubletten_QNAME, Dubletten.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link AdressTyp }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "Typ")
+    public JAXBElement<AdressTyp> createTyp(AdressTyp value) {
+        return new JAXBElement<AdressTyp>(_Typ_QNAME, AdressTyp.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link RechtsformVollzug }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "Rechtsform")
+    public JAXBElement<RechtsformVollzug> createRechtsform(RechtsformVollzug value) {
+        return new JAXBElement<RechtsformVollzug>(_Rechtsform_QNAME, RechtsformVollzug.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link RechtstatsachenVollzug }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "Rechtstatsachen")
+    public JAXBElement<RechtstatsachenVollzug> createRechtstatsachen(RechtstatsachenVollzug value) {
+        return new JAXBElement<RechtstatsachenVollzug>(_Rechtstatsachen_QNAME, RechtstatsachenVollzug.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link QuellenType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "Ende")
+    public JAXBElement<QuellenType> createEnde(QuellenType value) {
+        return new JAXBElement<QuellenType>(_Ende_QNAME, QuellenType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Branche }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "Branche")
+    public JAXBElement<Branche> createBranche(Branche value) {
+        return new JAXBElement<Branche>(_Branche_QNAME, Branche.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "Gesperrt")
+    public JAXBElement<Boolean> createGesperrt(Boolean value) {
+        return new JAXBElement<Boolean>(_Gesperrt_QNAME, Boolean.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link QuellenType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "Beginn")
+    public JAXBElement<QuellenType> createBeginn(QuellenType value) {
+        return new JAXBElement<QuellenType>(_Beginn_QNAME, QuellenType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Vollzug }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "Vollzug")
+    public JAXBElement<Vollzug> createVollzug(Vollzug value) {
+        return new JAXBElement<Vollzug>(_Vollzug_QNAME, Vollzug.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "AendDat")
+    public JAXBElement<XMLGregorianCalendar> createAendDat(XMLGregorianCalendar value) {
+        return new JAXBElement<XMLGregorianCalendar>(_AendDat_QNAME, XMLGregorianCalendar.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "bpkWTUR")
+    public JAXBElement<String> createBpkWTUR(String value) {
+        return new JAXBElement<String>(_BpkWTUR_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "ErsbAttribute", defaultValue = "false")
+    public JAXBElement<Boolean> createErsbAttribute(Boolean value) {
+        return new JAXBElement<Boolean>(_ErsbAttribute_QNAME, Boolean.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SucheUnternehmenNachIdsRequest }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", name = "SucheUnternehmenNachIdsRequest")
+    public JAXBElement<SucheUnternehmenNachIdsRequest> createSucheUnternehmenNachIdsRequest(SucheUnternehmenNachIdsRequest value) {
+        return new JAXBElement<SucheUnternehmenNachIdsRequest>(_SucheUnternehmenNachIdsRequest_QNAME, SucheUnternehmenNachIdsRequest.class, null, value);
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur/search/OenaceType.java b/src/main/java/at/gv/util/xsd/ur_V5/search/OenaceType.java
index 9f5f2ee..cb6b455 100644
--- a/src/main/java/at/gv/util/xsd/ur/search/OenaceType.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/OenaceType.java
@@ -1,5 +1,5 @@
 
-package at.gv.util.xsd.ur.search;
+package at.gv.util.xsd.ur_V5.search;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -16,8 +16,8 @@ import javax.xml.bind.annotation.XmlValue;
  * <pre>
  * &lt;complexType name="OenaceType">
  *   &lt;simpleContent>
- *     &lt;extension base="&lt;http://statistik.at/namespace/ur/simpleTypes/1#>OenaceCodeTyp">
- *       &lt;attribute name="jahr" use="required" type="{http://statistik.at/namespace/ur/simpleTypes/1#}OenaceJahrTyp" />
+ *     &lt;extension base="&lt;http://statistik.at/namespace/ur/simpleTypes/2#>OenaceCodeTyp">
+ *       &lt;attribute name="jahr" use="required" type="{http://statistik.at/namespace/ur/simpleTypes/2#}OenaceJahrTyp" />
  *     &lt;/extension>
  *   &lt;/simpleContent>
  * &lt;/complexType>
@@ -38,7 +38,7 @@ public class OenaceType {
 
     /**
      * 
-     * 				ÖNACE - Branchenkennzahl
+     * 				Ö\u0096NACE - Branchenkennzahl
      * 			
      * 
      * @return
diff --git a/src/main/java/at/gv/util/xsd/ur/search/QuellenType.java b/src/main/java/at/gv/util/xsd/ur_V5/search/QuellenType.java
index 6c9eebb..01a3fec 100644
--- a/src/main/java/at/gv/util/xsd/ur/search/QuellenType.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/QuellenType.java
@@ -1,5 +1,5 @@
 
-package at.gv.util.xsd.ur.search;
+package at.gv.util.xsd.ur_V5.search;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -19,7 +19,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * &lt;complexType name="QuellenType">
  *   &lt;simpleContent>
  *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>date">
- *       &lt;attribute name="quelle" use="required" type="{http://statistik.at/namespace/ur/simpleTypes/1#}QuelleTyp" />
+ *       &lt;attribute name="quelle" use="required" type="{http://statistik.at/namespace/ur/simpleTypes/2#}QuelleTyp" />
  *       &lt;attribute name="quText" use="required" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
  *     &lt;/extension>
  *   &lt;/simpleContent>
diff --git a/src/main/java/at/gv/util/xsd/ur/search/Rechtsform.java b/src/main/java/at/gv/util/xsd/ur_V5/search/Rechtsform.java
index 1e6df01..58eea19 100644
--- a/src/main/java/at/gv/util/xsd/ur/search/Rechtsform.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/Rechtsform.java
@@ -1,9 +1,10 @@
 
-package at.gv.util.xsd.ur.search;
+package at.gv.util.xsd.ur_V5.search;
 
 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;
 
 
@@ -17,11 +18,10 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;complexContent>
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;sequence>
- *         &lt;element name="ReForm" type="{http://statistik.at/namespace/ur/simpleTypes/1#}RechtsformTyp"/>
- *         &lt;element name="ReFormText" type="{http://statistik.at/namespace/ur/simpleTypes/1#}RechtsformTextTyp"/>
- *         &lt;element name="ReFormExtern" type="{http://statistik.at/namespace/ur/simpleTypes/1#}RechtsformTextTyp"/>
- *         &lt;element name="Beginn" type="{http://statistik.at/namespace/ur/stammdaten/1#}QuellenType"/>
- *         &lt;element name="Ende" type="{http://statistik.at/namespace/ur/stammdaten/1#}QuellenType" minOccurs="0"/>
+ *         &lt;element name="ReForm" type="{http://statistik.at/namespace/ur/simpleTypes/2#}RechtsformTyp" minOccurs="0"/>
+ *         &lt;element name="ReFormText" type="{http://statistik.at/namespace/ur/simpleTypes/2#}RechtsformTextTyp" minOccurs="0"/>
+ *         &lt;element name="ReFormExtern" type="{http://statistik.at/namespace/ur/simpleTypes/2#}RechtsformTyp"/>
+ *         &lt;element name="ReFormExternText" type="{http://statistik.at/namespace/ur/simpleTypes/2#}RechtsformTextTyp" minOccurs="0"/>
  *       &lt;/sequence>
  *     &lt;/restriction>
  *   &lt;/complexContent>
@@ -35,31 +35,31 @@ import javax.xml.bind.annotation.XmlType;
     "reForm",
     "reFormText",
     "reFormExtern",
-    "beginn",
-    "ende"
+    "reFormExternText"
 })
-public class Rechtsform {
+@XmlSeeAlso({
+    RechtsformVollzug.class
+})
+public abstract class Rechtsform {
 
-    @XmlElement(name = "ReForm", required = true)
-    protected String reForm;
-    @XmlElement(name = "ReFormText", required = true)
+    @XmlElement(name = "ReForm")
+    protected Integer reForm;
+    @XmlElement(name = "ReFormText")
     protected String reFormText;
-    @XmlElement(name = "ReFormExtern", required = true)
-    protected String reFormExtern;
-    @XmlElement(name = "Beginn", required = true)
-    protected QuellenType beginn;
-    @XmlElement(name = "Ende")
-    protected QuellenType ende;
+    @XmlElement(name = "ReFormExtern")
+    protected int reFormExtern;
+    @XmlElement(name = "ReFormExternText")
+    protected String reFormExternText;
 
     /**
      * Gets the value of the reForm property.
      * 
      * @return
      *     possible object is
-     *     {@link String }
+     *     {@link Integer }
      *     
      */
-    public String getReForm() {
+    public Integer getReForm() {
         return reForm;
     }
 
@@ -68,10 +68,10 @@ public class Rechtsform {
      * 
      * @param value
      *     allowed object is
-     *     {@link String }
+     *     {@link Integer }
      *     
      */
-    public void setReForm(String value) {
+    public void setReForm(Integer value) {
         this.reForm = value;
     }
 
@@ -102,73 +102,41 @@ public class Rechtsform {
     /**
      * Gets the value of the reFormExtern property.
      * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
      */
-    public String getReFormExtern() {
+    public int getReFormExtern() {
         return reFormExtern;
     }
 
     /**
      * Sets the value of the reFormExtern property.
      * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
      */
-    public void setReFormExtern(String value) {
+    public void setReFormExtern(int value) {
         this.reFormExtern = value;
     }
 
     /**
-     * Gets the value of the beginn property.
+     * Gets the value of the reFormExternText property.
      * 
      * @return
      *     possible object is
-     *     {@link QuellenType }
-     *     
-     */
-    public QuellenType getBeginn() {
-        return beginn;
-    }
-
-    /**
-     * Sets the value of the beginn property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link QuellenType }
-     *     
-     */
-    public void setBeginn(QuellenType value) {
-        this.beginn = value;
-    }
-
-    /**
-     * Gets the value of the ende property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link QuellenType }
+     *     {@link String }
      *     
      */
-    public QuellenType getEnde() {
-        return ende;
+    public String getReFormExternText() {
+        return reFormExternText;
     }
 
     /**
-     * Sets the value of the ende property.
+     * Sets the value of the reFormExternText property.
      * 
      * @param value
      *     allowed object is
-     *     {@link QuellenType }
+     *     {@link String }
      *     
      */
-    public void setEnde(QuellenType value) {
-        this.ende = value;
+    public void setReFormExternText(String value) {
+        this.reFormExternText = value;
     }
 
 }
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/RechtsformVollzug.java b/src/main/java/at/gv/util/xsd/ur_V5/search/RechtsformVollzug.java
new file mode 100644
index 0000000..a63b789
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/RechtsformVollzug.java
@@ -0,0 +1,92 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for RechtsformVollzug complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="RechtsformVollzug">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://statistik.at/namespace/ur/stammdaten/4#}Rechtsform">
+ *       &lt;attGroup ref="{http://statistik.at/namespace/ur/stammdaten/4#}VollzugAttributes"/>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "RechtsformVollzug")
+public class RechtsformVollzug
+    extends Rechtsform
+{
+
+    @XmlAttribute(name = "vollzugBeginn", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugBeginn;
+    @XmlAttribute(name = "vollzugEnde", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugEnde;
+
+    /**
+     * Gets the value of the vollzugBeginn property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugBeginn() {
+        return vollzugBeginn;
+    }
+
+    /**
+     * Sets the value of the vollzugBeginn property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugBeginn(Object value) {
+        this.vollzugBeginn = value;
+    }
+
+    /**
+     * Gets the value of the vollzugEnde property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugEnde() {
+        return vollzugEnde;
+    }
+
+    /**
+     * Sets the value of the vollzugEnde property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugEnde(Object value) {
+        this.vollzugEnde = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/Rechtstatsachen.java b/src/main/java/at/gv/util/xsd/ur_V5/search/Rechtstatsachen.java
new file mode 100644
index 0000000..934f1f4
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/Rechtstatsachen.java
@@ -0,0 +1,122 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+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;
+
+
+/**
+ * <p>Java class for Rechtstatsachen complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Rechtstatsachen">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="RT_Nummer" type="{http://statistik.at/namespace/ur/simpleTypes/2#}RT_NummerTyp" minOccurs="0"/>
+ *         &lt;element name="RT_Code" type="{http://statistik.at/namespace/ur/simpleTypes/2#}RT_CodeTyp" minOccurs="0"/>
+ *         &lt;element name="RT_Text" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Rechtstatsachen", propOrder = {
+    "rtNummer",
+    "rtCode",
+    "rtText"
+})
+@XmlSeeAlso({
+    RechtstatsachenVollzug.class
+})
+public abstract class Rechtstatsachen {
+
+    @XmlElement(name = "RT_Nummer")
+    protected String rtNummer;
+    @XmlElement(name = "RT_Code")
+    protected String rtCode;
+    @XmlElement(name = "RT_Text")
+    protected String rtText;
+
+    /**
+     * Gets the value of the rtNummer property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRTNummer() {
+        return rtNummer;
+    }
+
+    /**
+     * Sets the value of the rtNummer property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRTNummer(String value) {
+        this.rtNummer = value;
+    }
+
+    /**
+     * Gets the value of the rtCode property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRTCode() {
+        return rtCode;
+    }
+
+    /**
+     * Sets the value of the rtCode property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRTCode(String value) {
+        this.rtCode = value;
+    }
+
+    /**
+     * Gets the value of the rtText property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRTText() {
+        return rtText;
+    }
+
+    /**
+     * Sets the value of the rtText property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRTText(String value) {
+        this.rtText = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/RechtstatsachenVollzug.java b/src/main/java/at/gv/util/xsd/ur_V5/search/RechtstatsachenVollzug.java
new file mode 100644
index 0000000..c44e2c1
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/RechtstatsachenVollzug.java
@@ -0,0 +1,92 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for RechtstatsachenVollzug complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="RechtstatsachenVollzug">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://statistik.at/namespace/ur/stammdaten/4#}Rechtstatsachen">
+ *       &lt;attGroup ref="{http://statistik.at/namespace/ur/stammdaten/4#}VollzugAttributes"/>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "RechtstatsachenVollzug")
+public class RechtstatsachenVollzug
+    extends Rechtstatsachen
+{
+
+    @XmlAttribute(name = "vollzugBeginn", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugBeginn;
+    @XmlAttribute(name = "vollzugEnde", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugEnde;
+
+    /**
+     * Gets the value of the vollzugBeginn property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugBeginn() {
+        return vollzugBeginn;
+    }
+
+    /**
+     * Sets the value of the vollzugBeginn property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugBeginn(Object value) {
+        this.vollzugBeginn = value;
+    }
+
+    /**
+     * Gets the value of the vollzugEnde property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugEnde() {
+        return vollzugEnde;
+    }
+
+    /**
+     * Sets the value of the vollzugEnde property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugEnde(Object value) {
+        this.vollzugEnde = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur/search/SucheBranche.java b/src/main/java/at/gv/util/xsd/ur_V5/search/SucheBranche.java
index 1131840..b6b54d5 100644
--- a/src/main/java/at/gv/util/xsd/ur/search/SucheBranche.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/SucheBranche.java
@@ -1,10 +1,10 @@
 
-package at.gv.util.xsd.ur.search;
+package at.gv.util.xsd.ur_V5.search;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
-import at.gv.util.xsd.ur.simpletypes.OenaceArtTyp;
+import at.gv.util.xsd.ur_V5.simpletypes.OenaceArtTyp;
 
 
 /**
@@ -17,9 +17,9 @@ import at.gv.util.xsd.ur.simpletypes.OenaceArtTyp;
  *   &lt;complexContent>
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;sequence>
- *         &lt;element name="oenaceJahr" type="{http://statistik.at/namespace/ur/simpleTypes/1#}OenaceJahrTyp" minOccurs="0"/>
- *         &lt;element name="oenaceCode" type="{http://statistik.at/namespace/ur/simpleTypes/1#}OenaceCodeTyp" minOccurs="0"/>
- *         &lt;element name="oenaceArt" type="{http://statistik.at/namespace/ur/simpleTypes/1#}OenaceArtTyp" minOccurs="0"/>
+ *         &lt;element name="oenaceJahr" type="{http://statistik.at/namespace/ur/simpleTypes/2#}OenaceJahrTyp" minOccurs="0"/>
+ *         &lt;element name="oenaceCode" type="{http://statistik.at/namespace/ur/simpleTypes/2#}OenaceCodeTyp" minOccurs="0"/>
+ *         &lt;element name="oenaceArt" type="{http://statistik.at/namespace/ur/simpleTypes/2#}OenaceArtTyp" minOccurs="0"/>
  *       &lt;/sequence>
  *     &lt;/restriction>
  *   &lt;/complexContent>
diff --git a/src/main/java/at/gv/util/xsd/ur/search/SuchePersonendaten.java b/src/main/java/at/gv/util/xsd/ur_V5/search/SuchePersonendaten.java
index 19fd338..8e2f6e2 100644
--- a/src/main/java/at/gv/util/xsd/ur/search/SuchePersonendaten.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/SuchePersonendaten.java
@@ -1,5 +1,5 @@
 
-package at.gv.util.xsd.ur.search;
+package at.gv.util.xsd.ur_V5.search;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -18,15 +18,18 @@ import javax.xml.datatype.XMLGregorianCalendar;
  *   &lt;complexContent>
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;sequence>
- *         &lt;element name="nachname" type="{http://statistik.at/namespace/ur/simpleTypes/1#}NachnameTyp" minOccurs="0"/>
- *         &lt;element name="vorname" type="{http://statistik.at/namespace/ur/simpleTypes/1#}VornameTyp" minOccurs="0"/>
+ *         &lt;element name="phonetisch" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         &lt;element name="nachname" type="{http://statistik.at/namespace/ur/simpleTypes/2#}NachnameTyp" minOccurs="0"/>
+ *         &lt;element name="vorname" type="{http://statistik.at/namespace/ur/simpleTypes/2#}VornameTyp" minOccurs="0"/>
  *         &lt;element name="gebDatum" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
- *         &lt;element name="strasse" type="{http://statistik.at/namespace/ur/simpleTypes/1#}StrasseTyp" minOccurs="0"/>
- *         &lt;element name="hNr" type="{http://statistik.at/namespace/ur/simpleTypes/1#}HNrTyp" minOccurs="0"/>
- *         &lt;element name="ort" type="{http://statistik.at/namespace/ur/simpleTypes/1#}OrtTyp" minOccurs="0"/>
- *         &lt;element name="gemnr" type="{http://statistik.at/namespace/ur/simpleTypes/1#}GemnrTyp" minOccurs="0"/>
- *         &lt;element name="plz" type="{http://statistik.at/namespace/ur/simpleTypes/1#}PlzTyp" minOccurs="0"/>
- *         &lt;element name="land" type="{http://statistik.at/namespace/ur/simpleTypes/1#}LandTyp" minOccurs="0"/>
+ *         &lt;element name="strasse" type="{http://statistik.at/namespace/ur/simpleTypes/2#}StrasseTyp" minOccurs="0"/>
+ *         &lt;element name="hNr" type="{http://statistik.at/namespace/ur/simpleTypes/2#}HNrTyp" minOccurs="0"/>
+ *         &lt;element name="ort" type="{http://statistik.at/namespace/ur/simpleTypes/2#}OrtTyp" minOccurs="0"/>
+ *         &lt;element name="gemnr" type="{http://statistik.at/namespace/ur/simpleTypes/2#}GemnrTyp" minOccurs="0"/>
+ *         &lt;element name="plz" type="{http://statistik.at/namespace/ur/simpleTypes/2#}PlzTyp" minOccurs="0"/>
+ *         &lt;element name="land" type="{http://statistik.at/namespace/ur/simpleTypes/2#}LandTyp" minOccurs="0"/>
+ *         &lt;element name="stammzahl" type="{http://statistik.at/namespace/ur/simpleTypes/2#}IdTyp" minOccurs="0"/>
+ *         &lt;element name="stammregister" type="{http://statistik.at/namespace/ur/simpleTypes/2#}IdArtTyp" minOccurs="0"/>
  *       &lt;/sequence>
  *     &lt;/restriction>
  *   &lt;/complexContent>
@@ -37,6 +40,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "SuchePersonendaten", propOrder = {
+    "phonetisch",
     "nachname",
     "vorname",
     "gebDatum",
@@ -45,10 +49,13 @@ import javax.xml.datatype.XMLGregorianCalendar;
     "ort",
     "gemnr",
     "plz",
-    "land"
+    "land",
+    "stammzahl",
+    "stammregister"
 })
 public class SuchePersonendaten {
 
+    protected Boolean phonetisch;
     protected String nachname;
     protected String vorname;
     @XmlSchemaType(name = "date")
@@ -59,6 +66,32 @@ public class SuchePersonendaten {
     protected Integer gemnr;
     protected String plz;
     protected String land;
+    protected String stammzahl;
+    protected String stammregister;
+
+    /**
+     * Gets the value of the phonetisch property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isPhonetisch() {
+        return phonetisch;
+    }
+
+    /**
+     * Sets the value of the phonetisch property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setPhonetisch(Boolean value) {
+        this.phonetisch = value;
+    }
 
     /**
      * Gets the value of the nachname property.
@@ -276,4 +309,52 @@ public class SuchePersonendaten {
         this.land = value;
     }
 
+    /**
+     * Gets the value of the stammzahl property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getStammzahl() {
+        return stammzahl;
+    }
+
+    /**
+     * Sets the value of the stammzahl property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setStammzahl(String value) {
+        this.stammzahl = value;
+    }
+
+    /**
+     * Gets the value of the stammregister property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getStammregister() {
+        return stammregister;
+    }
+
+    /**
+     * Sets the value of the stammregister property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setStammregister(String value) {
+        this.stammregister = value;
+    }
+
 }
diff --git a/src/main/java/at/gv/util/xsd/ur/search/SucheUnternehmenNachAendDatRequest.java b/src/main/java/at/gv/util/xsd/ur_V5/search/SucheUnternehmenNachAendDatRequest.java
index 3a08d16..c7f05dc 100644
--- a/src/main/java/at/gv/util/xsd/ur/search/SucheUnternehmenNachAendDatRequest.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/SucheUnternehmenNachAendDatRequest.java
@@ -1,5 +1,5 @@
 
-package at.gv.util.xsd.ur.search;
+package at.gv.util.xsd.ur_V5.search;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -19,7 +19,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
  *   &lt;complexContent>
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;sequence>
- *         &lt;element name="version" type="{http://statistik.at/namespace/ur/simpleTypes/1#}VersionTyp" minOccurs="0"/>
+ *         &lt;element name="version" type="{http://statistik.at/namespace/ur/simpleTypes/2#}VersionTyp" minOccurs="0"/>
  *         &lt;element name="aendDat" type="{http://www.w3.org/2001/XMLSchema}date"/>
  *       &lt;/sequence>
  *     &lt;/restriction>
diff --git a/src/main/java/at/gv/util/xsd/ur/search/SucheUnternehmenNachBpkRequest.java b/src/main/java/at/gv/util/xsd/ur_V5/search/SucheUnternehmenNachBpkRequest.java
index 6e146ae..9f2affe 100644
--- a/src/main/java/at/gv/util/xsd/ur/search/SucheUnternehmenNachBpkRequest.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/SucheUnternehmenNachBpkRequest.java
@@ -1,5 +1,5 @@
 
-package at.gv.util.xsd.ur.search;
+package at.gv.util.xsd.ur_V5.search;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -16,11 +16,12 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;complexContent>
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;sequence>
- *         &lt;element name="version" type="{http://statistik.at/namespace/ur/simpleTypes/1#}VersionTyp" minOccurs="0"/>
+ *         &lt;element name="version" type="{http://statistik.at/namespace/ur/simpleTypes/2#}VersionTyp" minOccurs="0"/>
  *         &lt;choice>
- *           &lt;element name="bpkWTUR" type="{http://statistik.at/namespace/ur/simpleTypes/1#}BpkTyp"/>
- *           &lt;element name="bpkWTUREncoded" type="{http://statistik.at/namespace/ur/simpleTypes/1#}BpkEncodedTyp"/>
+ *           &lt;element name="bpkWTUR" type="{http://statistik.at/namespace/ur/simpleTypes/2#}BpkTyp"/>
+ *           &lt;element name="bpkWTUREncoded" type="{http://statistik.at/namespace/ur/simpleTypes/2#}BpkEncodedTyp"/>
  *         &lt;/choice>
+ *         &lt;element name="nurAktive" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *       &lt;/sequence>
  *     &lt;/restriction>
  *   &lt;/complexContent>
@@ -33,13 +34,15 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "SucheUnternehmenNachBpkRequest", propOrder = {
     "version",
     "bpkWTUR",
-    "bpkWTUREncoded"
+    "bpkWTUREncoded",
+    "nurAktive"
 })
 public class SucheUnternehmenNachBpkRequest {
 
     protected String version;
     protected String bpkWTUR;
     protected String bpkWTUREncoded;
+    protected Boolean nurAktive;
 
     /**
      * Gets the value of the version property.
@@ -113,4 +116,28 @@ public class SucheUnternehmenNachBpkRequest {
         this.bpkWTUREncoded = value;
     }
 
+    /**
+     * Gets the value of the nurAktive property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isNurAktive() {
+        return nurAktive;
+    }
+
+    /**
+     * Sets the value of the nurAktive property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setNurAktive(Boolean value) {
+        this.nurAktive = value;
+    }
+
 }
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/SucheUnternehmenNachIdRequest.java b/src/main/java/at/gv/util/xsd/ur_V5/search/SucheUnternehmenNachIdRequest.java
new file mode 100644
index 0000000..6cc06cf
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/SucheUnternehmenNachIdRequest.java
@@ -0,0 +1,304 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+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.gv.util.xsd.ur_V5.simpletypes.ErgebnisVollzugStatusTyp;
+
+
+/**
+ * <p>Java class for SucheUnternehmenNachIdRequest complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="SucheUnternehmenNachIdRequest">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="version" type="{http://statistik.at/namespace/ur/simpleTypes/2#}VersionTyp" minOccurs="0"/>
+ *         &lt;choice>
+ *           &lt;element name="kur" type="{http://statistik.at/namespace/ur/simpleTypes/2#}KurTyp"/>
+ *           &lt;element name="fbn" type="{http://statistik.at/namespace/ur/simpleTypes/2#}FbnTyp"/>
+ *           &lt;element name="zvr" type="{http://statistik.at/namespace/ur/simpleTypes/2#}ZvrTyp"/>
+ *           &lt;element name="erj" type="{http://statistik.at/namespace/ur/simpleTypes/2#}ErjTyp"/>
+ *           &lt;element name="sek" type="{http://statistik.at/namespace/ur/simpleTypes/2#}SekTyp"/>
+ *         &lt;/choice>
+ *         &lt;element name="URV_pdf" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         &lt;element name="stichtag" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
+ *         &lt;element name="mitHistorie" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element name="vollzugStatus" type="{http://statistik.at/namespace/ur/simpleTypes/2#}ErgebnisVollzugStatusTyp" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SucheUnternehmenNachIdRequest", propOrder = {
+    "version",
+    "kur",
+    "fbn",
+    "zvr",
+    "erj",
+    "sek",
+    "urvPdf",
+    "stichtag",
+    "mitHistorie",
+    "vollzugStatus"
+})
+public class SucheUnternehmenNachIdRequest {
+
+    protected String version;
+    protected String kur;
+    protected String fbn;
+    protected String zvr;
+    protected String erj;
+    protected String sek;
+    @XmlElement(name = "URV_pdf", defaultValue = "false")
+    protected Boolean urvPdf;
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar stichtag;
+    @XmlElement(defaultValue = "false")
+    protected boolean mitHistorie;
+    protected ErgebnisVollzugStatusTyp vollzugStatus;
+
+    /**
+     * Gets the value of the version property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * Sets the value of the version property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setVersion(String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the kur property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getKur() {
+        return kur;
+    }
+
+    /**
+     * Sets the value of the kur property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setKur(String value) {
+        this.kur = value;
+    }
+
+    /**
+     * Gets the value of the fbn property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFbn() {
+        return fbn;
+    }
+
+    /**
+     * Sets the value of the fbn property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFbn(String value) {
+        this.fbn = value;
+    }
+
+    /**
+     * Gets the value of the zvr property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getZvr() {
+        return zvr;
+    }
+
+    /**
+     * Sets the value of the zvr property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setZvr(String value) {
+        this.zvr = value;
+    }
+
+    /**
+     * Gets the value of the erj property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getErj() {
+        return erj;
+    }
+
+    /**
+     * Sets the value of the erj property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setErj(String value) {
+        this.erj = value;
+    }
+
+    /**
+     * Gets the value of the sek property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getSek() {
+        return sek;
+    }
+
+    /**
+     * Sets the value of the sek property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSek(String value) {
+        this.sek = value;
+    }
+
+    /**
+     * Gets the value of the urvPdf property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isURVPdf() {
+        return urvPdf;
+    }
+
+    /**
+     * Sets the value of the urvPdf property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setURVPdf(Boolean value) {
+        this.urvPdf = value;
+    }
+
+    /**
+     * Gets the value of the stichtag property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getStichtag() {
+        return stichtag;
+    }
+
+    /**
+     * Sets the value of the stichtag property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setStichtag(XMLGregorianCalendar value) {
+        this.stichtag = value;
+    }
+
+    /**
+     * Gets the value of the mitHistorie property.
+     * 
+     */
+    public boolean isMitHistorie() {
+        return mitHistorie;
+    }
+
+    /**
+     * Sets the value of the mitHistorie property.
+     * 
+     */
+    public void setMitHistorie(boolean value) {
+        this.mitHistorie = value;
+    }
+
+    /**
+     * Gets the value of the vollzugStatus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ErgebnisVollzugStatusTyp }
+     *     
+     */
+    public ErgebnisVollzugStatusTyp getVollzugStatus() {
+        return vollzugStatus;
+    }
+
+    /**
+     * Sets the value of the vollzugStatus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ErgebnisVollzugStatusTyp }
+     *     
+     */
+    public void setVollzugStatus(ErgebnisVollzugStatusTyp value) {
+        this.vollzugStatus = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/SucheUnternehmenNachIdsRequest.java b/src/main/java/at/gv/util/xsd/ur_V5/search/SucheUnternehmenNachIdsRequest.java
new file mode 100644
index 0000000..45196b6
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/SucheUnternehmenNachIdsRequest.java
@@ -0,0 +1,279 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+import 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.gv.util.xsd.ur_V5.simpletypes.ErgebnisVollzugStatusTyp;
+
+
+/**
+ * <p>Java class for SucheUnternehmenNachIdsRequest complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="SucheUnternehmenNachIdsRequest">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="version" type="{http://statistik.at/namespace/ur/simpleTypes/2#}VersionTyp" minOccurs="0"/>
+ *         &lt;element name="kur" type="{http://statistik.at/namespace/ur/simpleTypes/2#}KurTyp" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="fbn" type="{http://statistik.at/namespace/ur/simpleTypes/2#}FbnTyp" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="zvr" type="{http://statistik.at/namespace/ur/simpleTypes/2#}ZvrTyp" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="erj" type="{http://statistik.at/namespace/ur/simpleTypes/2#}ErjTyp" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="sek" type="{http://statistik.at/namespace/ur/simpleTypes/2#}SekTyp" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="mitHistorie" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         &lt;element name="vollzugStatus" type="{http://statistik.at/namespace/ur/simpleTypes/2#}ErgebnisVollzugStatusTyp" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SucheUnternehmenNachIdsRequest", propOrder = {
+    "version",
+    "kur",
+    "fbn",
+    "zvr",
+    "erj",
+    "sek",
+    "mitHistorie",
+    "vollzugStatus"
+})
+public class SucheUnternehmenNachIdsRequest {
+
+    protected String version;
+    protected List<String> kur;
+    protected List<String> fbn;
+    protected List<String> zvr;
+    protected List<String> erj;
+    protected List<String> sek;
+    @XmlElement(defaultValue = "false")
+    protected Boolean mitHistorie;
+    protected ErgebnisVollzugStatusTyp vollzugStatus;
+
+    /**
+     * Gets the value of the version property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * Sets the value of the version property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setVersion(String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the kur property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the kur property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getKur().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getKur() {
+        if (kur == null) {
+            kur = new ArrayList<String>();
+        }
+        return this.kur;
+    }
+
+    /**
+     * Gets the value of the fbn property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the fbn property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getFbn().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getFbn() {
+        if (fbn == null) {
+            fbn = new ArrayList<String>();
+        }
+        return this.fbn;
+    }
+
+    /**
+     * Gets the value of the zvr property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the zvr property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getZvr().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getZvr() {
+        if (zvr == null) {
+            zvr = new ArrayList<String>();
+        }
+        return this.zvr;
+    }
+
+    /**
+     * Gets the value of the erj property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the erj property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getErj().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getErj() {
+        if (erj == null) {
+            erj = new ArrayList<String>();
+        }
+        return this.erj;
+    }
+
+    /**
+     * Gets the value of the sek property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the sek property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getSek().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getSek() {
+        if (sek == null) {
+            sek = new ArrayList<String>();
+        }
+        return this.sek;
+    }
+
+    /**
+     * Gets the value of the mitHistorie property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isMitHistorie() {
+        return mitHistorie;
+    }
+
+    /**
+     * Sets the value of the mitHistorie property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setMitHistorie(Boolean value) {
+        this.mitHistorie = value;
+    }
+
+    /**
+     * Gets the value of the vollzugStatus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ErgebnisVollzugStatusTyp }
+     *     
+     */
+    public ErgebnisVollzugStatusTyp getVollzugStatus() {
+        return vollzugStatus;
+    }
+
+    /**
+     * Sets the value of the vollzugStatus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ErgebnisVollzugStatusTyp }
+     *     
+     */
+    public void setVollzugStatus(ErgebnisVollzugStatusTyp value) {
+        this.vollzugStatus = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur/search/SucheUnternehmenRequest.java b/src/main/java/at/gv/util/xsd/ur_V5/search/SucheUnternehmenRequest.java
index bfc7d9d..039d1bc 100644
--- a/src/main/java/at/gv/util/xsd/ur/search/SucheUnternehmenRequest.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/SucheUnternehmenRequest.java
@@ -1,11 +1,9 @@
 
-package at.gv.util.xsd.ur.search;
+package at.gv.util.xsd.ur_V5.search;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
 
 
 /**
@@ -18,12 +16,10 @@ import javax.xml.datatype.XMLGregorianCalendar;
  *   &lt;complexContent>
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;sequence>
- *         &lt;element name="version" type="{http://statistik.at/namespace/ur/simpleTypes/1#}VersionTyp" minOccurs="0"/>
- *         &lt;element name="unternehmensdaten" type="{http://statistik.at/namespace/ur/stammdaten/1#}SucheUnternehmensdaten" minOccurs="0"/>
- *         &lt;element name="branche" type="{http://statistik.at/namespace/ur/stammdaten/1#}SucheBranche" minOccurs="0"/>
- *         &lt;element name="personendaten" type="{http://statistik.at/namespace/ur/stammdaten/1#}SuchePersonendaten" minOccurs="0"/>
- *         &lt;element name="zeitraumVon" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
- *         &lt;element name="zeitraumBis" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
+ *         &lt;element name="version" type="{http://statistik.at/namespace/ur/simpleTypes/2#}VersionTyp" minOccurs="0"/>
+ *         &lt;element name="unternehmensdaten" type="{http://statistik.at/namespace/ur/stammdaten/4#}SucheUnternehmensdaten" minOccurs="0"/>
+ *         &lt;element name="branche" type="{http://statistik.at/namespace/ur/stammdaten/4#}SucheBranche" minOccurs="0"/>
+ *         &lt;element name="personendaten" type="{http://statistik.at/namespace/ur/stammdaten/4#}SuchePersonendaten" minOccurs="0"/>
  *       &lt;/sequence>
  *     &lt;/restriction>
  *   &lt;/complexContent>
@@ -37,9 +33,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
     "version",
     "unternehmensdaten",
     "branche",
-    "personendaten",
-    "zeitraumVon",
-    "zeitraumBis"
+    "personendaten"
 })
 public class SucheUnternehmenRequest {
 
@@ -47,10 +41,6 @@ public class SucheUnternehmenRequest {
     protected SucheUnternehmensdaten unternehmensdaten;
     protected SucheBranche branche;
     protected SuchePersonendaten personendaten;
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar zeitraumVon;
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar zeitraumBis;
 
     /**
      * Gets the value of the version property.
@@ -148,52 +138,4 @@ public class SucheUnternehmenRequest {
         this.personendaten = value;
     }
 
-    /**
-     * Gets the value of the zeitraumVon property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getZeitraumVon() {
-        return zeitraumVon;
-    }
-
-    /**
-     * Sets the value of the zeitraumVon property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setZeitraumVon(XMLGregorianCalendar value) {
-        this.zeitraumVon = value;
-    }
-
-    /**
-     * Gets the value of the zeitraumBis property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getZeitraumBis() {
-        return zeitraumBis;
-    }
-
-    /**
-     * Sets the value of the zeitraumBis property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setZeitraumBis(XMLGregorianCalendar value) {
-        this.zeitraumBis = value;
-    }
-
 }
diff --git a/src/main/java/at/gv/util/xsd/ur/search/SucheUnternehmensdaten.java b/src/main/java/at/gv/util/xsd/ur_V5/search/SucheUnternehmensdaten.java
index d09b891..80e77f9 100644
--- a/src/main/java/at/gv/util/xsd/ur/search/SucheUnternehmensdaten.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/SucheUnternehmensdaten.java
@@ -1,5 +1,5 @@
 
-package at.gv.util.xsd.ur.search;
+package at.gv.util.xsd.ur_V5.search;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,17 +17,16 @@ import javax.xml.bind.annotation.XmlType;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;sequence>
  *         &lt;element name="phonetisch" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         &lt;element name="klammer" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         &lt;element name="untName" type="{http://statistik.at/namespace/ur/simpleTypes/1#}UntNameTyp" minOccurs="0"/>
- *         &lt;element name="rechtsform" type="{http://statistik.at/namespace/ur/simpleTypes/1#}RechtsformTyp" minOccurs="0"/>
- *         &lt;element name="id" type="{http://statistik.at/namespace/ur/simpleTypes/1#}IdTyp" minOccurs="0"/>
- *         &lt;element name="idArt" type="{http://statistik.at/namespace/ur/simpleTypes/1#}IdArtTyp" minOccurs="0"/>
- *         &lt;element name="strasse" type="{http://statistik.at/namespace/ur/simpleTypes/1#}StrasseTyp" minOccurs="0"/>
- *         &lt;element name="hNr" type="{http://statistik.at/namespace/ur/simpleTypes/1#}HNrTyp" minOccurs="0"/>
- *         &lt;element name="ort" type="{http://statistik.at/namespace/ur/simpleTypes/1#}OrtTyp" minOccurs="0"/>
- *         &lt;element name="gemnr" type="{http://statistik.at/namespace/ur/simpleTypes/1#}GemnrTyp" minOccurs="0"/>
- *         &lt;element name="plz" type="{http://statistik.at/namespace/ur/simpleTypes/1#}PlzTyp" minOccurs="0"/>
- *         &lt;element name="land" type="{http://statistik.at/namespace/ur/simpleTypes/1#}LandTyp" minOccurs="0"/>
+ *         &lt;element name="untName" type="{http://statistik.at/namespace/ur/simpleTypes/2#}UntNameTyp" minOccurs="0"/>
+ *         &lt;element name="rechtsform" type="{http://statistik.at/namespace/ur/simpleTypes/2#}RechtsformTyp" minOccurs="0"/>
+ *         &lt;element name="id" type="{http://statistik.at/namespace/ur/simpleTypes/2#}IdTyp" minOccurs="0"/>
+ *         &lt;element name="idArt" type="{http://statistik.at/namespace/ur/simpleTypes/2#}IdArtTyp" minOccurs="0"/>
+ *         &lt;element name="strasse" type="{http://statistik.at/namespace/ur/simpleTypes/2#}StrasseTyp" minOccurs="0"/>
+ *         &lt;element name="hNr" type="{http://statistik.at/namespace/ur/simpleTypes/2#}HNrTyp" minOccurs="0"/>
+ *         &lt;element name="ort" type="{http://statistik.at/namespace/ur/simpleTypes/2#}OrtTyp" minOccurs="0"/>
+ *         &lt;element name="gemnr" type="{http://statistik.at/namespace/ur/simpleTypes/2#}GemnrTyp" minOccurs="0"/>
+ *         &lt;element name="plz" type="{http://statistik.at/namespace/ur/simpleTypes/2#}PlzTyp" minOccurs="0"/>
+ *         &lt;element name="land" type="{http://statistik.at/namespace/ur/simpleTypes/2#}LandTyp" minOccurs="0"/>
  *       &lt;/sequence>
  *     &lt;/restriction>
  *   &lt;/complexContent>
@@ -39,7 +38,6 @@ import javax.xml.bind.annotation.XmlType;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "SucheUnternehmensdaten", propOrder = {
     "phonetisch",
-    "klammer",
     "untName",
     "rechtsform",
     "id",
@@ -54,9 +52,8 @@ import javax.xml.bind.annotation.XmlType;
 public class SucheUnternehmensdaten {
 
     protected Boolean phonetisch;
-    protected Boolean klammer;
     protected String untName;
-    protected String rechtsform;
+    protected Integer rechtsform;
     protected String id;
     protected String idArt;
     protected String strasse;
@@ -91,30 +88,6 @@ public class SucheUnternehmensdaten {
     }
 
     /**
-     * Gets the value of the klammer property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isKlammer() {
-        return klammer;
-    }
-
-    /**
-     * Sets the value of the klammer property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setKlammer(Boolean value) {
-        this.klammer = value;
-    }
-
-    /**
      * Gets the value of the untName property.
      * 
      * @return
@@ -143,10 +116,10 @@ public class SucheUnternehmensdaten {
      * 
      * @return
      *     possible object is
-     *     {@link String }
+     *     {@link Integer }
      *     
      */
-    public String getRechtsform() {
+    public Integer getRechtsform() {
         return rechtsform;
     }
 
@@ -155,10 +128,10 @@ public class SucheUnternehmensdaten {
      * 
      * @param value
      *     allowed object is
-     *     {@link String }
+     *     {@link Integer }
      *     
      */
-    public void setRechtsform(String value) {
+    public void setRechtsform(Integer value) {
         this.rechtsform = value;
     }
 
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/Taetigkeitszeitraum.java b/src/main/java/at/gv/util/xsd/ur_V5/search/Taetigkeitszeitraum.java
new file mode 100644
index 0000000..b9f27a0
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/Taetigkeitszeitraum.java
@@ -0,0 +1,98 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+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;
+
+
+/**
+ * <p>Java class for Taetigkeitszeitraum complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Taetigkeitszeitraum">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="TaetigVon" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
+ *         &lt;element name="TaetigBis" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Taetigkeitszeitraum", propOrder = {
+    "taetigVon",
+    "taetigBis"
+})
+@XmlSeeAlso({
+    TaetigkeitszeitraumVollzug.class
+})
+public abstract class Taetigkeitszeitraum {
+
+    @XmlElement(name = "TaetigVon")
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar taetigVon;
+    @XmlElement(name = "TaetigBis")
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar taetigBis;
+
+    /**
+     * Gets the value of the taetigVon property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getTaetigVon() {
+        return taetigVon;
+    }
+
+    /**
+     * Sets the value of the taetigVon property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setTaetigVon(XMLGregorianCalendar value) {
+        this.taetigVon = value;
+    }
+
+    /**
+     * Gets the value of the taetigBis property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getTaetigBis() {
+        return taetigBis;
+    }
+
+    /**
+     * Sets the value of the taetigBis property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setTaetigBis(XMLGregorianCalendar value) {
+        this.taetigBis = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/TaetigkeitszeitraumVollzug.java b/src/main/java/at/gv/util/xsd/ur_V5/search/TaetigkeitszeitraumVollzug.java
new file mode 100644
index 0000000..8195fbe
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/TaetigkeitszeitraumVollzug.java
@@ -0,0 +1,92 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for TaetigkeitszeitraumVollzug complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TaetigkeitszeitraumVollzug">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://statistik.at/namespace/ur/stammdaten/4#}Taetigkeitszeitraum">
+ *       &lt;attGroup ref="{http://statistik.at/namespace/ur/stammdaten/4#}VollzugAttributes"/>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TaetigkeitszeitraumVollzug")
+public class TaetigkeitszeitraumVollzug
+    extends Taetigkeitszeitraum
+{
+
+    @XmlAttribute(name = "vollzugBeginn", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugBeginn;
+    @XmlAttribute(name = "vollzugEnde", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugEnde;
+
+    /**
+     * Gets the value of the vollzugBeginn property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugBeginn() {
+        return vollzugBeginn;
+    }
+
+    /**
+     * Sets the value of the vollzugBeginn property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugBeginn(Object value) {
+        this.vollzugBeginn = value;
+    }
+
+    /**
+     * Gets the value of the vollzugEnde property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugEnde() {
+        return vollzugEnde;
+    }
+
+    /**
+     * Sets the value of the vollzugEnde property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugEnde(Object value) {
+        this.vollzugEnde = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/UntName.java b/src/main/java/at/gv/util/xsd/ur_V5/search/UntName.java
new file mode 100644
index 0000000..d84dda5
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/UntName.java
@@ -0,0 +1,66 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+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;
+
+
+/**
+ * <p>Java class for UntName complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="UntName">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="VollerName" type="{http://statistik.at/namespace/ur/simpleTypes/2#}UntNameTyp"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "UntName", propOrder = {
+    "vollerName"
+})
+@XmlSeeAlso({
+    UntNameVollzug.class
+})
+public abstract class UntName {
+
+    @XmlElement(name = "VollerName", required = true)
+    protected String vollerName;
+
+    /**
+     * Gets the value of the vollerName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getVollerName() {
+        return vollerName;
+    }
+
+    /**
+     * Sets the value of the vollerName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setVollerName(String value) {
+        this.vollerName = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/UntNameVollzug.java b/src/main/java/at/gv/util/xsd/ur_V5/search/UntNameVollzug.java
new file mode 100644
index 0000000..10f83ae
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/UntNameVollzug.java
@@ -0,0 +1,92 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for UntNameVollzug complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="UntNameVollzug">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://statistik.at/namespace/ur/stammdaten/4#}UntName">
+ *       &lt;attGroup ref="{http://statistik.at/namespace/ur/stammdaten/4#}VollzugAttributes"/>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "UntNameVollzug")
+public class UntNameVollzug
+    extends UntName
+{
+
+    @XmlAttribute(name = "vollzugBeginn", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugBeginn;
+    @XmlAttribute(name = "vollzugEnde", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugEnde;
+
+    /**
+     * Gets the value of the vollzugBeginn property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugBeginn() {
+        return vollzugBeginn;
+    }
+
+    /**
+     * Sets the value of the vollzugBeginn property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugBeginn(Object value) {
+        this.vollzugBeginn = value;
+    }
+
+    /**
+     * Gets the value of the vollzugEnde property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugEnde() {
+        return vollzugEnde;
+    }
+
+    /**
+     * Sets the value of the vollzugEnde property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugEnde(Object value) {
+        this.vollzugEnde = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/Vertretung.java b/src/main/java/at/gv/util/xsd/ur_V5/search/Vertretung.java
new file mode 100644
index 0000000..7e3225c
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/Vertretung.java
@@ -0,0 +1,63 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+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 javax.xml.bind.annotation.XmlValue;
+
+
+/**
+ * <p>Java class for Vertretung complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Vertretung">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Vertretung", propOrder = {
+    "value"
+})
+@XmlSeeAlso({
+    VertretungVollzug.class
+})
+public abstract class Vertretung {
+
+    @XmlValue
+    protected String value;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/VertretungVollzug.java b/src/main/java/at/gv/util/xsd/ur_V5/search/VertretungVollzug.java
new file mode 100644
index 0000000..e6d2800
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/VertretungVollzug.java
@@ -0,0 +1,92 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for VertretungVollzug complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="VertretungVollzug">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://statistik.at/namespace/ur/stammdaten/4#>Vertretung">
+ *       &lt;attGroup ref="{http://statistik.at/namespace/ur/stammdaten/4#}VollzugAttributes"/>
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "VertretungVollzug")
+public class VertretungVollzug
+    extends Vertretung
+{
+
+    @XmlAttribute(name = "vollzugBeginn", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugBeginn;
+    @XmlAttribute(name = "vollzugEnde", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    protected Object vollzugEnde;
+
+    /**
+     * Gets the value of the vollzugBeginn property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugBeginn() {
+        return vollzugBeginn;
+    }
+
+    /**
+     * Sets the value of the vollzugBeginn property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugBeginn(Object value) {
+        this.vollzugBeginn = value;
+    }
+
+    /**
+     * Gets the value of the vollzugEnde property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getVollzugEnde() {
+        return vollzugEnde;
+    }
+
+    /**
+     * Sets the value of the vollzugEnde property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setVollzugEnde(Object value) {
+        this.vollzugEnde = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/Vollzug.java b/src/main/java/at/gv/util/xsd/ur_V5/search/Vollzug.java
new file mode 100644
index 0000000..7d740eb
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/Vollzug.java
@@ -0,0 +1,209 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+import java.math.BigInteger;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import at.gv.util.xsd.ur_V5.simpletypes.VollzugStatusTyp;
+
+
+/**
+ * <p>Java class for Vollzug complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Vollzug">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Antrag" type="{http://statistik.at/namespace/ur/stammdaten/4#}VollzugElem"/>
+ *         &lt;element name="Vollzug" type="{http://statistik.at/namespace/ur/stammdaten/4#}VollzugElem" minOccurs="0"/>
+ *         &lt;element name="Zurueckstellung" type="{http://statistik.at/namespace/ur/stammdaten/4#}VollzugElem" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       &lt;attribute name="nummer" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       &lt;attribute name="status" use="required" type="{http://statistik.at/namespace/ur/simpleTypes/2#}VollzugStatusTyp" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Vollzug", propOrder = {
+    "antrag",
+    "vollzug",
+    "zurueckstellung"
+})
+public class Vollzug {
+
+    @XmlElement(name = "Antrag", required = true)
+    protected VollzugElem antrag;
+    @XmlElement(name = "Vollzug")
+    protected VollzugElem vollzug;
+    @XmlElement(name = "Zurueckstellung")
+    protected VollzugElem zurueckstellung;
+    @XmlAttribute(name = "id", required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    @XmlSchemaType(name = "ID")
+    protected String id;
+    @XmlAttribute(name = "nummer", required = true)
+    protected BigInteger nummer;
+    @XmlAttribute(name = "status", required = true)
+    protected VollzugStatusTyp status;
+
+    /**
+     * Gets the value of the antrag property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link VollzugElem }
+     *     
+     */
+    public VollzugElem getAntrag() {
+        return antrag;
+    }
+
+    /**
+     * Sets the value of the antrag property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link VollzugElem }
+     *     
+     */
+    public void setAntrag(VollzugElem value) {
+        this.antrag = value;
+    }
+
+    /**
+     * Gets the value of the vollzug property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link VollzugElem }
+     *     
+     */
+    public VollzugElem getVollzug() {
+        return vollzug;
+    }
+
+    /**
+     * Sets the value of the vollzug property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link VollzugElem }
+     *     
+     */
+    public void setVollzug(VollzugElem value) {
+        this.vollzug = value;
+    }
+
+    /**
+     * Gets the value of the zurueckstellung property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link VollzugElem }
+     *     
+     */
+    public VollzugElem getZurueckstellung() {
+        return zurueckstellung;
+    }
+
+    /**
+     * Sets the value of the zurueckstellung property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link VollzugElem }
+     *     
+     */
+    public void setZurueckstellung(VollzugElem value) {
+        this.zurueckstellung = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setId(String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the nummer property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getNummer() {
+        return nummer;
+    }
+
+    /**
+     * Sets the value of the nummer property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setNummer(BigInteger value) {
+        this.nummer = value;
+    }
+
+    /**
+     * Gets the value of the status property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link VollzugStatusTyp }
+     *     
+     */
+    public VollzugStatusTyp getStatus() {
+        return status;
+    }
+
+    /**
+     * Sets the value of the status property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link VollzugStatusTyp }
+     *     
+     */
+    public void setStatus(VollzugStatusTyp value) {
+        this.status = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/search/VollzugElem.java b/src/main/java/at/gv/util/xsd/ur_V5/search/VollzugElem.java
new file mode 100644
index 0000000..84c5d5c
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/VollzugElem.java
@@ -0,0 +1,118 @@
+
+package at.gv.util.xsd.ur_V5.search;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+import javax.xml.datatype.XMLGregorianCalendar;
+
+
+/**
+ * <p>Java class for VollzugElem complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="VollzugElem">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>date">
+ *       &lt;attribute name="quelle" use="required" type="{http://statistik.at/namespace/ur/simpleTypes/2#}QuelleTyp" />
+ *       &lt;attribute name="quText" use="required" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "VollzugElem", propOrder = {
+    "value"
+})
+public class VollzugElem {
+
+    @XmlValue
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar value;
+    @XmlAttribute(name = "quelle", required = true)
+    protected String quelle;
+    @XmlAttribute(name = "quText", required = true)
+    @XmlSchemaType(name = "anySimpleType")
+    protected String quText;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setValue(XMLGregorianCalendar value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the quelle property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getQuelle() {
+        return quelle;
+    }
+
+    /**
+     * Sets the value of the quelle property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setQuelle(String value) {
+        this.quelle = value;
+    }
+
+    /**
+     * Gets the value of the quText property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getQuText() {
+        return quText;
+    }
+
+    /**
+     * Sets the value of the quText property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setQuText(String value) {
+        this.quText = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur/search/package-info.java b/src/main/java/at/gv/util/xsd/ur_V5/search/package-info.java
index b2d6987..c7febe7 100644
--- a/src/main/java/at/gv/util/xsd/ur/search/package-info.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/search/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://statistik.at/namespace/ur/stammdaten/1#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package at.gv.util.xsd.ur.search;
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://statistik.at/namespace/ur/stammdaten/4#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package at.gv.util.xsd.ur_V5.search;
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/simpletypes/AdressTyp.java b/src/main/java/at/gv/util/xsd/ur_V5/simpletypes/AdressTyp.java
new file mode 100644
index 0000000..42ee29d
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/simpletypes/AdressTyp.java
@@ -0,0 +1,38 @@
+
+package at.gv.util.xsd.ur_V5.simpletypes;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for AdressTyp.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;simpleType name="AdressTyp">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     &lt;enumeration value="SITZ"/>
+ *     &lt;enumeration value="ZUSTELLADRESSE"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "AdressTyp", namespace = "http://statistik.at/namespace/ur/simpleTypes/2#")
+@XmlEnum
+public enum AdressTyp {
+
+    SITZ,
+    ZUSTELLADRESSE;
+
+    public String value() {
+        return name();
+    }
+
+    public static AdressTyp fromValue(String v) {
+        return valueOf(v);
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/simpletypes/ArtDublette.java b/src/main/java/at/gv/util/xsd/ur_V5/simpletypes/ArtDublette.java
new file mode 100644
index 0000000..ccbea6b
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/simpletypes/ArtDublette.java
@@ -0,0 +1,38 @@
+
+package at.gv.util.xsd.ur_V5.simpletypes;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ArtDublette.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;simpleType name="ArtDublette">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     &lt;enumeration value="M"/>
+ *     &lt;enumeration value="S"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "ArtDublette", namespace = "http://statistik.at/namespace/ur/simpleTypes/2#")
+@XmlEnum
+public enum ArtDublette {
+
+    M,
+    S;
+
+    public String value() {
+        return name();
+    }
+
+    public static ArtDublette fromValue(String v) {
+        return valueOf(v);
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/simpletypes/ErgebnisVollzugStatusTyp.java b/src/main/java/at/gv/util/xsd/ur_V5/simpletypes/ErgebnisVollzugStatusTyp.java
new file mode 100644
index 0000000..0770ab6
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/simpletypes/ErgebnisVollzugStatusTyp.java
@@ -0,0 +1,38 @@
+
+package at.gv.util.xsd.ur_V5.simpletypes;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ErgebnisVollzugStatusTyp.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;simpleType name="ErgebnisVollzugStatusTyp">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     &lt;enumeration value="V"/>
+ *     &lt;enumeration value="AZV"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "ErgebnisVollzugStatusTyp", namespace = "http://statistik.at/namespace/ur/simpleTypes/2#")
+@XmlEnum
+public enum ErgebnisVollzugStatusTyp {
+
+    V,
+    AZV;
+
+    public String value() {
+        return name();
+    }
+
+    public static ErgebnisVollzugStatusTyp fromValue(String v) {
+        return valueOf(v);
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/simpletypes/EvbStatusTyp.java b/src/main/java/at/gv/util/xsd/ur_V5/simpletypes/EvbStatusTyp.java
new file mode 100644
index 0000000..16bc296
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/simpletypes/EvbStatusTyp.java
@@ -0,0 +1,40 @@
+
+package at.gv.util.xsd.ur_V5.simpletypes;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for EvbStatusTyp.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;simpleType name="EvbStatusTyp">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     &lt;enumeration value="J"/>
+ *     &lt;enumeration value="N"/>
+ *     &lt;enumeration value="U"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "EvbStatusTyp", namespace = "http://statistik.at/namespace/ur/simpleTypes/2#")
+@XmlEnum
+public enum EvbStatusTyp {
+
+    J,
+    N,
+    U;
+
+    public String value() {
+        return name();
+    }
+
+    public static EvbStatusTyp fromValue(String v) {
+        return valueOf(v);
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur/simpletypes/ObjectFactory.java b/src/main/java/at/gv/util/xsd/ur_V5/simpletypes/ObjectFactory.java
index 1653fad..85c1538 100644
--- a/src/main/java/at/gv/util/xsd/ur/simpletypes/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/simpletypes/ObjectFactory.java
@@ -1,5 +1,5 @@
 
-package at.gv.util.xsd.ur.simpletypes;
+package at.gv.util.xsd.ur_V5.simpletypes;
 
 import javax.xml.bind.annotation.XmlRegistry;
 
@@ -7,7 +7,7 @@ import javax.xml.bind.annotation.XmlRegistry;
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the at.gv.util.xsd.ur.simpletypes package. 
+ * generated in the at.gv.util.xsd.ur_V5.simpletypes package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -23,7 +23,7 @@ public class ObjectFactory {
 
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.util.xsd.ur.simpletypes
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.util.xsd.ur_V5.simpletypes
      * 
      */
     public ObjectFactory() {
diff --git a/src/main/java/at/gv/util/xsd/ur/simpletypes/OenaceArtTyp.java b/src/main/java/at/gv/util/xsd/ur_V5/simpletypes/OenaceArtTyp.java
index 9788faf..3312580 100644
--- a/src/main/java/at/gv/util/xsd/ur/simpletypes/OenaceArtTyp.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/simpletypes/OenaceArtTyp.java
@@ -1,5 +1,5 @@
 
-package at.gv.util.xsd.ur.simpletypes;
+package at.gv.util.xsd.ur_V5.simpletypes;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlType;
@@ -20,7 +20,7 @@ import javax.xml.bind.annotation.XmlType;
  * </pre>
  * 
  */
-@XmlType(name = "OenaceArtTyp", namespace = "http://statistik.at/namespace/ur/simpleTypes/1#")
+@XmlType(name = "OenaceArtTyp", namespace = "http://statistik.at/namespace/ur/simpleTypes/2#")
 @XmlEnum
 public enum OenaceArtTyp {
 
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/simpletypes/VollzugStatusTyp.java b/src/main/java/at/gv/util/xsd/ur_V5/simpletypes/VollzugStatusTyp.java
new file mode 100644
index 0000000..3e61598
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/simpletypes/VollzugStatusTyp.java
@@ -0,0 +1,40 @@
+
+package at.gv.util.xsd.ur_V5.simpletypes;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for VollzugStatusTyp.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;simpleType name="VollzugStatusTyp">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     &lt;enumeration value="A"/>
+ *     &lt;enumeration value="V"/>
+ *     &lt;enumeration value="Z"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "VollzugStatusTyp", namespace = "http://statistik.at/namespace/ur/simpleTypes/2#")
+@XmlEnum
+public enum VollzugStatusTyp {
+
+    A,
+    V,
+    Z;
+
+    public String value() {
+        return name();
+    }
+
+    public static VollzugStatusTyp fromValue(String v) {
+        return valueOf(v);
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur/xmlsw/CustomFaultType.java b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/CustomFaultType.java
index 83138df..77ccc28 100644
--- a/src/main/java/at/gv/util/xsd/ur/xmlsw/CustomFaultType.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/CustomFaultType.java
@@ -1,5 +1,5 @@
 
-package at.gv.util.xsd.ur.xmlsw;
+package at.gv.util.xsd.ur_V5.xmlsw;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType;
  *         &lt;element name="Code" type="{http://www.w3.org/2001/XMLSchema}integer"/>
  *         &lt;element name="Reason" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/>
  *         &lt;element name="Help" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="Detail" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/>
+ *         &lt;element ref="{http://reference.e-government.gv.at/namespace/xml-sw/1#}FaultHint" maxOccurs="unbounded" minOccurs="0"/>
  *       &lt;/sequence>
  *     &lt;/restriction>
  *   &lt;/complexContent>
@@ -39,7 +39,7 @@ import javax.xml.bind.annotation.XmlType;
     "code",
     "reason",
     "help",
-    "detail"
+    "faultHint"
 })
 public class CustomFaultType {
 
@@ -49,8 +49,8 @@ public class CustomFaultType {
     protected List<String> reason;
     @XmlElement(name = "Help")
     protected String help;
-    @XmlElement(name = "Detail")
-    protected Object detail;
+    @XmlElement(name = "FaultHint")
+    protected List<String> faultHint;
 
     /**
      * Gets the value of the code property.
@@ -130,27 +130,32 @@ public class CustomFaultType {
     }
 
     /**
-     * Gets the value of the detail property.
+     * Gets the value of the faultHint property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the faultHint property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getFaultHint().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
      * 
-     * @return
-     *     possible object is
-     *     {@link Object }
-     *     
-     */
-    public Object getDetail() {
-        return detail;
-    }
-
-    /**
-     * Sets the value of the detail property.
      * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     
      */
-    public void setDetail(Object value) {
-        this.detail = value;
+    public List<String> getFaultHint() {
+        if (faultHint == null) {
+            faultHint = new ArrayList<String>();
+        }
+        return this.faultHint;
     }
 
 }
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/ExtraResultCriteria.java b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/ExtraResultCriteria.java
new file mode 100644
index 0000000..068dd95
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/ExtraResultCriteria.java
@@ -0,0 +1,64 @@
+
+package at.gv.util.xsd.ur_V5.xmlsw;
+
+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;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}ErsbAttribute" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "ersbAttribute"
+})
+@XmlRootElement(name = "ExtraResultCriteria")
+public class ExtraResultCriteria {
+
+    @XmlElement(name = "ErsbAttribute", namespace = "http://statistik.at/namespace/ur/stammdaten/4#", defaultValue = "false")
+    protected Boolean ersbAttribute;
+
+    /**
+     * Gets the value of the ersbAttribute property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isErsbAttribute() {
+        return ersbAttribute;
+    }
+
+    /**
+     * Sets the value of the ersbAttribute property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setErsbAttribute(Boolean value) {
+        this.ersbAttribute = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/ExtraResultInfo.java b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/ExtraResultInfo.java
new file mode 100644
index 0000000..8495046
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/ExtraResultInfo.java
@@ -0,0 +1,34 @@
+
+package at.gv.util.xsd.ur_V5.xmlsw;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "ExtraResultInfo")
+public class ExtraResultInfo {
+
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur/xmlsw/ObjectFactory.java b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/ObjectFactory.java
index 4cbb57d..cc099dc 100644
--- a/src/main/java/at/gv/util/xsd/ur/xmlsw/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/ObjectFactory.java
@@ -1,5 +1,5 @@
 
-package at.gv.util.xsd.ur.xmlsw;
+package at.gv.util.xsd.ur_V5.xmlsw;
 
 import java.math.BigInteger;
 import javax.xml.bind.JAXBElement;
@@ -12,7 +12,7 @@ import javax.xml.namespace.QName;
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the at.gv.util.xsd.ur.xmlsw package. 
+ * generated in the at.gv.util.xsd.ur_V5.xmlsw package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -28,6 +28,7 @@ public class ObjectFactory {
 
     private final static QName _FaultHint_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "FaultHint");
     private final static QName _CaseSensitive_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "CaseSensitive");
+    private final static QName _XmlSwFault_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "XmlSwFault");
     private final static QName _Path_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "Path");
     private final static QName _SearchRequestInfo_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "SearchRequestInfo");
     private final static QName _ResultSetId_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "ResultSetId");
@@ -40,8 +41,8 @@ public class ObjectFactory {
     private final static QName _SearchRequestId_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "SearchRequestId");
     private final static QName _ResultCriteria_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "ResultCriteria");
     private final static QName _ReturnedRecords_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "ReturnedRecords");
-    private final static QName _SearchResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "SearchResponse");
     private final static QName _AccountedUnits_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "AccountedUnits");
+    private final static QName _SearchResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "SearchResponse");
     private final static QName _FoundRecords_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "FoundRecords");
     private final static QName _StartRecord_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "StartRecord");
     private final static QName _Ascending_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "Ascending");
@@ -49,14 +50,14 @@ public class ObjectFactory {
     private final static QName _TimeOut_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "TimeOut");
     private final static QName _InvoiceId_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "InvoiceId");
     private final static QName _Message_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "Message");
-    private final static QName _SortKeys_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "SortKeys");
     private final static QName _MaxRecords_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "MaxRecords");
+    private final static QName _SortKeys_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "SortKeys");
     private final static QName _SearchById_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "SearchById");
     private final static QName _ResultInfo_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "ResultInfo");
     private final static QName _PaymentInfo_QNAME = new QName("http://reference.e-government.gv.at/namespace/xml-sw/1#", "PaymentInfo");
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.util.xsd.ur.xmlsw
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.util.xsd.ur_V5.xmlsw
      * 
      */
     public ObjectFactory() {
@@ -79,6 +80,14 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link CustomFaultType }
+     * 
+     */
+    public CustomFaultType createCustomFaultType() {
+        return new CustomFaultType();
+    }
+
+    /**
      * Create an instance of {@link SearchByExampleType }
      * 
      */
@@ -103,14 +112,6 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link CustomFaultType }
-     * 
-     */
-    public CustomFaultType createCustomFaultType() {
-        return new CustomFaultType();
-    }
-
-    /**
      * Create an instance of {@link ResultInfoType }
      * 
      */
@@ -209,6 +210,15 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link CustomFaultType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#", name = "XmlSwFault")
+    public JAXBElement<CustomFaultType> createXmlSwFault(CustomFaultType value) {
+        return new JAXBElement<CustomFaultType>(_XmlSwFault_QNAME, CustomFaultType.class, null, value);
+    }
+
+    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
@@ -317,21 +327,21 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SearchResponseType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#", name = "SearchResponse")
-    public JAXBElement<SearchResponseType> createSearchResponse(SearchResponseType value) {
-        return new JAXBElement<SearchResponseType>(_SearchResponse_QNAME, SearchResponseType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#", name = "AccountedUnits")
+    public JAXBElement<BigInteger> createAccountedUnits(BigInteger value) {
+        return new JAXBElement<BigInteger>(_AccountedUnits_QNAME, BigInteger.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SearchResponseType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#", name = "AccountedUnits")
-    public JAXBElement<BigInteger> createAccountedUnits(BigInteger value) {
-        return new JAXBElement<BigInteger>(_AccountedUnits_QNAME, BigInteger.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#", name = "SearchResponse")
+    public JAXBElement<SearchResponseType> createSearchResponse(SearchResponseType value) {
+        return new JAXBElement<SearchResponseType>(_SearchResponse_QNAME, SearchResponseType.class, null, value);
     }
 
     /**
@@ -398,21 +408,21 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SortKeysType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#", name = "SortKeys")
-    public JAXBElement<SortKeysType> createSortKeys(SortKeysType value) {
-        return new JAXBElement<SortKeysType>(_SortKeys_QNAME, SortKeysType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#", name = "MaxRecords")
+    public JAXBElement<BigInteger> createMaxRecords(BigInteger value) {
+        return new JAXBElement<BigInteger>(_MaxRecords_QNAME, BigInteger.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SortKeysType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#", name = "MaxRecords")
-    public JAXBElement<BigInteger> createMaxRecords(BigInteger value) {
-        return new JAXBElement<BigInteger>(_MaxRecords_QNAME, BigInteger.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#", name = "SortKeys")
+    public JAXBElement<SortKeysType> createSortKeys(SortKeysType value) {
+        return new JAXBElement<SortKeysType>(_SortKeys_QNAME, SortKeysType.class, null, value);
     }
 
     /**
diff --git a/src/main/java/at/gv/util/xsd/ur/xmlsw/PaymentInfoType.java b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/PaymentInfoType.java
index 9ce4339..ccfb4fc 100644
--- a/src/main/java/at/gv/util/xsd/ur/xmlsw/PaymentInfoType.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/PaymentInfoType.java
@@ -1,17 +1,13 @@
 
-package at.gv.util.xsd.ur.xmlsw;
+package at.gv.util.xsd.ur_V5.xmlsw;
 
 import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.datatype.XMLGregorianCalendar;
-import org.w3c.dom.Element;
 
 
 /**
@@ -28,7 +24,6 @@ import org.w3c.dom.Element;
  *         &lt;element ref="{http://reference.e-government.gv.at/namespace/xml-sw/1#}Costs"/>
  *         &lt;element ref="{http://reference.e-government.gv.at/namespace/xml-sw/1#}AccountedUnits" minOccurs="0"/>
  *         &lt;element ref="{http://reference.e-government.gv.at/namespace/xml-sw/1#}TimeStamp"/>
- *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
  *       &lt;/sequence>
  *     &lt;/restriction>
  *   &lt;/complexContent>
@@ -42,8 +37,7 @@ import org.w3c.dom.Element;
     "invoiceId",
     "costs",
     "accountedUnits",
-    "timeStamp",
-    "any"
+    "timeStamp"
 })
 public class PaymentInfoType {
 
@@ -57,8 +51,6 @@ public class PaymentInfoType {
     @XmlElement(name = "TimeStamp", required = true)
     @XmlSchemaType(name = "dateTime")
     protected XMLGregorianCalendar timeStamp;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
 
     /**
      * Gets the value of the invoiceId property.
@@ -148,34 +140,4 @@ public class PaymentInfoType {
         this.timeStamp = value;
     }
 
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
 }
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/RecordFieldList.java b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/RecordFieldList.java
new file mode 100644
index 0000000..703fb6c
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/RecordFieldList.java
@@ -0,0 +1,34 @@
+
+package at.gv.util.xsd.ur_V5.xmlsw;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "RecordFieldList")
+public class RecordFieldList {
+
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur/xmlsw/ResultCriteriaType.java b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/ResultCriteriaType.java
index e1f1de7..f0bf0ea 100644
--- a/src/main/java/at/gv/util/xsd/ur/xmlsw/ResultCriteriaType.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/ResultCriteriaType.java
@@ -1,5 +1,5 @@
 
-package at.gv.util.xsd.ur.xmlsw;
+package at.gv.util.xsd.ur_V5.xmlsw;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;
diff --git a/src/main/java/at/gv/util/xsd/ur/xmlsw/ResultInfoType.java b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/ResultInfoType.java
index d82d0dc..a51a3f6 100644
--- a/src/main/java/at/gv/util/xsd/ur/xmlsw/ResultInfoType.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/ResultInfoType.java
@@ -1,5 +1,5 @@
 
-package at.gv.util.xsd.ur.xmlsw;
+package at.gv.util.xsd.ur_V5.xmlsw;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;
diff --git a/src/main/java/at/gv/util/xsd/ur/xmlsw/ResultRecord.java b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/ResultRecord.java
index e3d945e..8581156 100644
--- a/src/main/java/at/gv/util/xsd/ur/xmlsw/ResultRecord.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/ResultRecord.java
@@ -1,17 +1,15 @@
 
-package at.gv.util.xsd.ur.xmlsw;
+package at.gv.util.xsd.ur_V5.xmlsw;
 
 import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
 import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
+import at.gv.util.xsd.ur_V5.pd.PersonenDatenTyp;
 
 
 /**
@@ -24,7 +22,8 @@ import org.w3c.dom.Element;
  *   &lt;complexContent>
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;sequence>
- *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element ref="{http://reference.e-government.gv.at/namespace/persondata/de/20040201#}PersonenDaten"/>
+ *         &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}URV_pdf" minOccurs="0"/>
  *       &lt;/sequence>
  *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
  *     &lt;/restriction>
@@ -36,45 +35,64 @@ import org.w3c.dom.Element;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "any"
+    "personenDaten",
+    "urvPdf"
 })
 @XmlRootElement(name = "ResultRecord")
 public class ResultRecord {
 
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
+    @XmlElement(name = "PersonenDaten", namespace = "http://reference.e-government.gv.at/namespace/persondata/de/20040201#", required = true)
+    protected PersonenDatenTyp personenDaten;
+    @XmlElement(name = "URV_pdf", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    protected byte[] urvPdf;
     @XmlAttribute(name = "id")
     @XmlSchemaType(name = "nonNegativeInteger")
     protected BigInteger id;
 
     /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
+     * Gets the value of the personenDaten property.
      * 
+     * @return
+     *     possible object is
+     *     {@link PersonenDatenTyp }
+     *     
+     */
+    public PersonenDatenTyp getPersonenDaten() {
+        return personenDaten;
+    }
+
+    /**
+     * Sets the value of the personenDaten property.
      * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
+     * @param value
+     *     allowed object is
+     *     {@link PersonenDatenTyp }
+     *     
+     */
+    public void setPersonenDaten(PersonenDatenTyp value) {
+        this.personenDaten = value;
+    }
+
+    /**
+     * Gets the value of the urvPdf property.
      * 
+     * @return
+     *     possible object is
+     *     byte[]
+     */
+    public byte[] getURVPdf() {
+        return urvPdf;
+    }
+
+    /**
+     * Sets the value of the urvPdf property.
      * 
+     * @param value
+     *     allowed object is
+     *     byte[]
      */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
+    public void setURVPdf(byte[] value) {
+        this.urvPdf = value;
     }
 
     /**
diff --git a/src/main/java/at/gv/util/xsd/ur/xmlsw/ResultRecords.java b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/ResultRecords.java
index 05126a3..742bc42 100644
--- a/src/main/java/at/gv/util/xsd/ur/xmlsw/ResultRecords.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/ResultRecords.java
@@ -1,5 +1,5 @@
 
-package at.gv.util.xsd.ur.xmlsw;
+package at.gv.util.xsd.ur_V5.xmlsw;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/at/gv/util/xsd/ur/xmlsw/SearchByExampleType.java b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/SearchByExampleType.java
index 10b8812..64e25cc 100644
--- a/src/main/java/at/gv/util/xsd/ur/xmlsw/SearchByExampleType.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/SearchByExampleType.java
@@ -1,5 +1,5 @@
 
-package at.gv.util.xsd.ur.xmlsw;
+package at.gv.util.xsd.ur_V5.xmlsw;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/at/gv/util/xsd/ur/xmlsw/SearchByIdType.java b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/SearchByIdType.java
index 217f526..22d2b0d 100644
--- a/src/main/java/at/gv/util/xsd/ur/xmlsw/SearchByIdType.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/SearchByIdType.java
@@ -1,5 +1,5 @@
 
-package at.gv.util.xsd.ur.xmlsw;
+package at.gv.util.xsd.ur_V5.xmlsw;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/SearchCriteriaType.java b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/SearchCriteriaType.java
new file mode 100644
index 0000000..8ddd5b1
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/SearchCriteriaType.java
@@ -0,0 +1,209 @@
+
+package at.gv.util.xsd.ur_V5.xmlsw;
+
+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.gv.util.xsd.ur_V5.search.SucheUnternehmenNachAendDatRequest;
+import at.gv.util.xsd.ur_V5.search.SucheUnternehmenNachBpkRequest;
+import at.gv.util.xsd.ur_V5.search.SucheUnternehmenNachIdRequest;
+import at.gv.util.xsd.ur_V5.search.SucheUnternehmenNachIdsRequest;
+import at.gv.util.xsd.ur_V5.search.SucheUnternehmenRequest;
+
+
+/**
+ * <p>Java class for SearchCriteriaType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="SearchCriteriaType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://reference.e-government.gv.at/namespace/xml-sw/1#}ResultSetId" minOccurs="0"/>
+ *         &lt;choice>
+ *           &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}SucheUnternehmenNachAendDatRequest"/>
+ *           &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}SucheUnternehmenNachBpkRequest"/>
+ *           &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}SucheUnternehmenNachIdRequest"/>
+ *           &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}SucheUnternehmenNachIdsRequest"/>
+ *           &lt;element ref="{http://statistik.at/namespace/ur/stammdaten/4#}SucheUnternehmenRequest"/>
+ *         &lt;/choice>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SearchCriteriaType", propOrder = {
+    "resultSetId",
+    "sucheUnternehmenNachAendDatRequest",
+    "sucheUnternehmenNachBpkRequest",
+    "sucheUnternehmenNachIdRequest",
+    "sucheUnternehmenNachIdsRequest",
+    "sucheUnternehmenRequest"
+})
+public class SearchCriteriaType {
+
+    @XmlElement(name = "ResultSetId")
+    protected String resultSetId;
+    @XmlElement(name = "SucheUnternehmenNachAendDatRequest", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    protected SucheUnternehmenNachAendDatRequest sucheUnternehmenNachAendDatRequest;
+    @XmlElement(name = "SucheUnternehmenNachBpkRequest", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    protected SucheUnternehmenNachBpkRequest sucheUnternehmenNachBpkRequest;
+    @XmlElement(name = "SucheUnternehmenNachIdRequest", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    protected SucheUnternehmenNachIdRequest sucheUnternehmenNachIdRequest;
+    @XmlElement(name = "SucheUnternehmenNachIdsRequest", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    protected SucheUnternehmenNachIdsRequest sucheUnternehmenNachIdsRequest;
+    @XmlElement(name = "SucheUnternehmenRequest", namespace = "http://statistik.at/namespace/ur/stammdaten/4#")
+    protected SucheUnternehmenRequest sucheUnternehmenRequest;
+
+    /**
+     * Gets the value of the resultSetId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getResultSetId() {
+        return resultSetId;
+    }
+
+    /**
+     * Sets the value of the resultSetId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setResultSetId(String value) {
+        this.resultSetId = value;
+    }
+
+    /**
+     * Gets the value of the sucheUnternehmenNachAendDatRequest property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SucheUnternehmenNachAendDatRequest }
+     *     
+     */
+    public SucheUnternehmenNachAendDatRequest getSucheUnternehmenNachAendDatRequest() {
+        return sucheUnternehmenNachAendDatRequest;
+    }
+
+    /**
+     * Sets the value of the sucheUnternehmenNachAendDatRequest property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SucheUnternehmenNachAendDatRequest }
+     *     
+     */
+    public void setSucheUnternehmenNachAendDatRequest(SucheUnternehmenNachAendDatRequest value) {
+        this.sucheUnternehmenNachAendDatRequest = value;
+    }
+
+    /**
+     * Gets the value of the sucheUnternehmenNachBpkRequest property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SucheUnternehmenNachBpkRequest }
+     *     
+     */
+    public SucheUnternehmenNachBpkRequest getSucheUnternehmenNachBpkRequest() {
+        return sucheUnternehmenNachBpkRequest;
+    }
+
+    /**
+     * Sets the value of the sucheUnternehmenNachBpkRequest property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SucheUnternehmenNachBpkRequest }
+     *     
+     */
+    public void setSucheUnternehmenNachBpkRequest(SucheUnternehmenNachBpkRequest value) {
+        this.sucheUnternehmenNachBpkRequest = value;
+    }
+
+    /**
+     * Gets the value of the sucheUnternehmenNachIdRequest property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SucheUnternehmenNachIdRequest }
+     *     
+     */
+    public SucheUnternehmenNachIdRequest getSucheUnternehmenNachIdRequest() {
+        return sucheUnternehmenNachIdRequest;
+    }
+
+    /**
+     * Sets the value of the sucheUnternehmenNachIdRequest property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SucheUnternehmenNachIdRequest }
+     *     
+     */
+    public void setSucheUnternehmenNachIdRequest(SucheUnternehmenNachIdRequest value) {
+        this.sucheUnternehmenNachIdRequest = value;
+    }
+
+    /**
+     * Gets the value of the sucheUnternehmenNachIdsRequest property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SucheUnternehmenNachIdsRequest }
+     *     
+     */
+    public SucheUnternehmenNachIdsRequest getSucheUnternehmenNachIdsRequest() {
+        return sucheUnternehmenNachIdsRequest;
+    }
+
+    /**
+     * Sets the value of the sucheUnternehmenNachIdsRequest property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SucheUnternehmenNachIdsRequest }
+     *     
+     */
+    public void setSucheUnternehmenNachIdsRequest(SucheUnternehmenNachIdsRequest value) {
+        this.sucheUnternehmenNachIdsRequest = value;
+    }
+
+    /**
+     * Gets the value of the sucheUnternehmenRequest property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SucheUnternehmenRequest }
+     *     
+     */
+    public SucheUnternehmenRequest getSucheUnternehmenRequest() {
+        return sucheUnternehmenRequest;
+    }
+
+    /**
+     * Sets the value of the sucheUnternehmenRequest property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SucheUnternehmenRequest }
+     *     
+     */
+    public void setSucheUnternehmenRequest(SucheUnternehmenRequest value) {
+        this.sucheUnternehmenRequest = value;
+    }
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/SearchRequestInfoType.java b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/SearchRequestInfoType.java
new file mode 100644
index 0000000..fe8d112
--- /dev/null
+++ b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/SearchRequestInfoType.java
@@ -0,0 +1,32 @@
+
+package at.gv.util.xsd.ur_V5.xmlsw;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for SearchRequestInfoType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="SearchRequestInfoType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SearchRequestInfoType")
+public class SearchRequestInfoType {
+
+
+}
diff --git a/src/main/java/at/gv/util/xsd/ur/xmlsw/SearchResponseType.java b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/SearchResponseType.java
index 4af6e3e..4b2f2fa 100644
--- a/src/main/java/at/gv/util/xsd/ur/xmlsw/SearchResponseType.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/SearchResponseType.java
@@ -1,5 +1,5 @@
 
-package at.gv.util.xsd.ur.xmlsw;
+package at.gv.util.xsd.ur_V5.xmlsw;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/at/gv/util/xsd/ur/xmlsw/SortKeyType.java b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/SortKeyType.java
index 274365b..98907b3 100644
--- a/src/main/java/at/gv/util/xsd/ur/xmlsw/SortKeyType.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/SortKeyType.java
@@ -1,5 +1,5 @@
 
-package at.gv.util.xsd.ur.xmlsw;
+package at.gv.util.xsd.ur_V5.xmlsw;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/at/gv/util/xsd/ur/xmlsw/SortKeysType.java b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/SortKeysType.java
index ce78a67..d70be98 100644
--- a/src/main/java/at/gv/util/xsd/ur/xmlsw/SortKeysType.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/SortKeysType.java
@@ -1,5 +1,5 @@
 
-package at.gv.util.xsd.ur.xmlsw;
+package at.gv.util.xsd.ur_V5.xmlsw;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/at/gv/util/xsd/ur/xmlsw/package-info.java b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/package-info.java
index 5a4e788..9b0b515 100644
--- a/src/main/java/at/gv/util/xsd/ur/xmlsw/package-info.java
+++ b/src/main/java/at/gv/util/xsd/ur_V5/xmlsw/package-info.java
@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://reference.e-government.gv.at/namespace/xml-sw/1#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package at.gv.util.xsd.ur.xmlsw;
+package at.gv.util.xsd.ur_V5.xmlsw;
diff --git a/src/main/resources/wsdl/custom-bindings/ur_V5-schemas.xml b/src/main/resources/wsdl/custom-bindings/ur_V5-schemas.xml
new file mode 100644
index 0000000..2413fef
--- /dev/null
+++ b/src/main/resources/wsdl/custom-bindings/ur_V5-schemas.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bindings version="2.0" xmlns="http://java.sun.com/xml/ns/jaxb"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+	xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc">
+
+	<bindings schemaLocation="../ur_V5/schema/urs-v5-suche.xsd">
+		<bindings node="/xsd:schema">
+			<schemaBindings>
+				<package name="at.gv.util.xsd.ur_V5.search" />
+			</schemaBindings>
+		</bindings>
+	</bindings>
+	
+	<bindings schemaLocation="../ur_V5/schema/urs-v5-PersonData.xsd">
+		<bindings node="/xsd:schema">
+			<schemaBindings>
+				<package name="at.gv.util.xsd.ur_V5.pd" />
+			</schemaBindings>
+		</bindings>
+	</bindings>
+	
+  <bindings schemaLocation="../ur_V5/schema/urs-v5-xml-sw.xsd">
+		<bindings node="/xsd:schema">
+			<schemaBindings>
+				<package name="at.gv.util.xsd.ur_V5.xmlsw" />
+			</schemaBindings>
+		</bindings>
+	</bindings>
+  
+  <!-- bindings schemaLocation="../ur_V2/schema/ur-basicTypes.xsd">
+		<bindings node="/xsd:schema">
+			<schemaBindings>
+				<package name="at.gv.util.xsd.ur_V2.basicTypes" />
+			</schemaBindings>
+		</bindings>
+	</bindings --> 
+	
+	<!-- bindings schemaLocation="../ur/specific/CustomFault.xsd">
+		<bindings node="/xsd:schema">
+			<schemaBindings>
+				<package name="at.gv.util.xsd.ur.cf" />
+			</schemaBindings>
+		</bindings>
+	</bindings -->
+	
+	<bindings schemaLocation="../ur_V5/schema/urs-v5-simpleTypes.xsd">
+		<bindings node="/xsd:schema">
+			<schemaBindings>
+				<package name="at.gv.util.xsd.ur_V5.simpletypes" />
+			</schemaBindings>
+		</bindings>
+	</bindings>
+
+</bindings>
\ No newline at end of file
diff --git a/src/main/resources/wsdl/custom-bindings/ur_V5-wsdl.xml b/src/main/resources/wsdl/custom-bindings/ur_V5-wsdl.xml
new file mode 100644
index 0000000..b7e57f9
--- /dev/null
+++ b/src/main/resources/wsdl/custom-bindings/ur_V5-wsdl.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bindings xmlns="http://java.sun.com/xml/ns/jaxws"
+               xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+               xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+
+  <package name="at.gv.util.wsdl.ur_V5"/>  
+</bindings>
\ No newline at end of file
diff --git a/src/main/resources/wsdl/szrgw_wsdl.zip b/src/main/resources/wsdl/szrgw_wsdl.zip
new file mode 100644
index 0000000..9b59f83
--- /dev/null
+++ b/src/main/resources/wsdl/szrgw_wsdl.zip
diff --git a/src/main/resources/wsdl/ur_V5/14-03 URV Webservices zur Unternehmenssuche v5.0.pdf b/src/main/resources/wsdl/ur_V5/14-03 URV Webservices zur Unternehmenssuche v5.0.pdf
new file mode 100644
index 0000000..aaacee4
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/14-03 URV Webservices zur Unternehmenssuche v5.0.pdf
diff --git a/src/main/resources/wsdl/ur_V5/URSucheService.wsdl b/src/main/resources/wsdl/ur_V5/URSucheService.wsdl
new file mode 100644
index 0000000..0e1e8d5
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/URSucheService.wsdl
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+	Anpassungen für URV URSuche v5.0
+	================================
+	2014-03-04 sml  FunktionVollzug: Kardinalität FktRegel auf "unbounded" geändert (URV-486, URV-471)
+	2014-03-10 sml  SucheUnternehmenNachBpkResponse: Befüllung Identification PNR, FktRegel: FktRegelVon + FktRegelBis (URV-471)
+	
+	Anpassungen für URV URSuche v4.0
+	================================
+	2013-11-12 sml	Ãœberarbeitung SOAPFaults: XmlSwFault, CustomFault
+	2013-11-04 sml  Zusatzdaten: Dubletten Block hinzugefügt (STAT.AT internal use only) (URV-438)
+	2013-11-04 sml  SucheUnternehmenNachIdRequest, SucheUnternehmenNachIdsRequest: sek hinzugefügt (URV-445)
+	2013-11-04 sml  PostAdresseTyp: Nutzungseinheitlaufnummer hinzugefügt
+	2013-10-10 sml  Zusatzdaten: Gesperrt hinzugefügt (URV-420)
+	
+	Anpassungen für URV URSuche v3.0
+	================================
+	2013-03-05 sml  Erweiterung um Taetigkeitszeitraum
+	2012-09-24 sml  Auslagerung Zusatzdaten in ZusatzdatenPersonenTyp
+	2012-09-20 sml  NichtNatuerlichePerson um VollzugAttributes erweitert
+	2012-09-11 sml  Kardinalität EVBStatus auf 0..1 geändert
+					Kardinalität TypeText von 0..n auf 0..1 geändert
+	2012-08-20 hoa  AdressCode/Subcode/Objektnummer hinzugefügt
+	2012-08-08 sml	Branche hinzugefügt
+	2012-08-07 sml	kein mixed Content bei den Zusatzdaten mehr möglich
+	2012-08-06 sml	eigener Namespace für UR-Persondata
+	2012-07-05 sml	Any-Attribute und Any-Elemente nach AGII-Empfehlung durch die konkreten ersetzt.
+	2012-06-14 sml	Affix wieder auf unbounded (vgl. URSucheService UDB)
+-->
+
+
+
+<wsdl:definitions name="URSuche"
+  targetNamespace="urn:at:statistik:ur:ws"
+  xmlns:tns="urn:at:statistik:ur:ws"
+  xmlns:sw="http://reference.e-government.gv.at/namespace/xml-sw/1#"
+  xmlns:ud="http://statistik.at/namespace/ur/stammdaten/4#"
+  xmlns:soapbinding="http://schemas.xmlsoap.org/wsdl/soap/"
+  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <wsdl:documentation> Dieses WSDL-Dokument beschreibt den
+    XML-Search-Service. </wsdl:documentation>
+  <wsdl:types>
+    <xsd:schema>
+      <xsd:import
+        namespace="http://reference.e-government.gv.at/namespace/xml-sw/1#"
+        schemaLocation="schema/urs-v5-xml-sw.xsd"/>
+      <xsd:import 
+      	namespace="http://reference.e-government.gv.at/namespace/xml-sw/1#" 
+     	 schemaLocation="schema/specific/urs-v5-CustomFault.xsd"/>
+    </xsd:schema>
+  </wsdl:types>
+  <wsdl:message name="SearchByExample">
+    <wsdl:documentation>
+      Nachricht, die für eine Suchanfrage
+      vom Typ Search by Example vom Client abgesendet wird
+    </wsdl:documentation>
+    <wsdl:part name="body" element="sw:SearchByExample"/>
+  </wsdl:message>
+  <wsdl:message name="SearchById">
+    <wsdl:documentation> Nachricht, die für eine Suchanfrage
+      vom Typ Search by Id vom Client abgesendet wird 
+    </wsdl:documentation>
+    <wsdl:part name="body" element="sw:SearchById"/>
+  </wsdl:message>
+  
+  <!-- FAULT -->
+  <wsdl:message name="XmlSwFault">
+    <wsdl:documentation>ServiceFault
+    </wsdl:documentation>
+    <wsdl:part name="fault" element="sw:XmlSwFault"/>
+  </wsdl:message>
+  
+  <wsdl:message name="SearchResponse">
+    <wsdl:documentation> Nachricht, die vom Server als
+      Antwort auf eine der beiden Suchanfragen
+      zurückgesendet wird
+    </wsdl:documentation>
+    <wsdl:part name="body" element="sw:SearchResponse"/>
+  </wsdl:message>
+  <wsdl:portType name="URSuche">
+    <wsdl:operation name="searchByExample">
+      <wsdl:documentation> Operation für den Abfragetyp
+        Search by Example
+      </wsdl:documentation>
+      <wsdl:input message="tns:SearchByExample"/>
+      <wsdl:output message="tns:SearchResponse"/>
+       <!-- FAULT -->
+      <wsdl:fault name="XmlSwFault" message="tns:XmlSwFault"/>
+     
+    </wsdl:operation>
+
+    <wsdl:operation name="searchById">
+      <wsdl:documentation> Operation für den Abfragetyp
+        Search by Id
+      </wsdl:documentation>
+      <wsdl:input message="tns:SearchById"/>
+      <wsdl:output message="tns:SearchResponse"/>
+      <!-- FAULT -->
+      <wsdl:fault name="XmlSwFault" message="tns:XmlSwFault"/>
+      
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="URSucheServiceSoapBinding"
+    type="tns:URSuche">
+    <wsdl:documentation> Definition des Binding für den
+      Search Service
+    </wsdl:documentation>
+    <soapbinding:binding style="document"
+      transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="searchByExample">
+      <soapbinding:operation
+        soapAction=""
+        style="document"/>
+      <wsdl:input>
+        <soapbinding:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output>
+        <soapbinding:body use="literal"/>
+      </wsdl:output>
+       <!-- FAULT -->
+	  <wsdl:fault name="XmlSwFault">
+		<soapbinding:fault use="literal" name="XmlSwFault"/> 
+	  </wsdl:fault>
+    </wsdl:operation>
+    <wsdl:operation name="searchById">
+      <soapbinding:operation
+        soapAction=""
+        style="document"/>
+      <wsdl:input>
+        <soapbinding:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output>
+        <soapbinding:body use="literal"/>
+      </wsdl:output>
+      <!-- FAULT -->
+	  <wsdl:fault name="XmlSwFault">
+		<soapbinding:fault use="literal" name="XmlSwFault" /> 
+	  </wsdl:fault>
+      
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="URSucheService">
+    <wsdl:port binding="tns:URSucheServiceSoapBinding"
+      name="URSucheService">
+      <soapbinding:address
+        location="http://localhost:9081/URV/services/URSucheService"
+      />
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>
diff --git a/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachAendDat_Request.xml b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachAendDat_Request.xml
new file mode 100644
index 0000000..47321a2
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachAendDat_Request.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="../schema_strict/all_strict_soap.xsd"> 
+    <soapenv:Header>
+        <secExt:Security xmlns:secExt="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
+            <pvpToken version="1.8" xmlns="http://egov.gv.at/pvp1.xsd">
+                <authenticate>
+                    <userPrincipal>
+                        <userId>beispiel.user@portal.statistik.gv.at</userId>
+                    </userPrincipal>
+                </authenticate>
+                <authorize>
+                    <role value="UR-Nutzer"/>
+                </authorize>
+            </pvpToken>
+        </secExt:Security>
+    </soapenv:Header>
+    <soapenv:Body>
+        <ns2:SearchByExample
+            xmlns="http://reference.e-government.gv.at/namespace/persondata/de/20040201#"
+            xmlns:ns2="http://reference.e-government.gv.at/namespace/xml-sw/1#" xmlns:ns3="http://statistik.at/namespace/ur/stammdaten/4#">
+            <ns2:SearchRequestId>96c7ec50-275a-4e9d-86c6-84a710825a77</ns2:SearchRequestId>
+            <ns2:SearchCriteria>
+              <ns3:SucheUnternehmenNachAendDatRequest xmlns="http://statistik.at/namespace/ur/stammdaten/4#">
+                <aendDat>2014-03-04</aendDat>
+              </ns3:SucheUnternehmenNachAendDatRequest>
+            </ns2:SearchCriteria>
+        </ns2:SearchByExample>
+    </soapenv:Body>
+</soapenv:Envelope>
diff --git a/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachAendDat_Response.xml b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachAendDat_Response.xml
new file mode 100644
index 0000000..06d1bd7
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachAendDat_Response.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="../schema_strict/all_strict_soap.xsd"> 
+
+	<soapenv:Body>
+		<ns2:SearchResponse
+			xmlns="http://reference.e-government.gv.at/namespace/persondata/de/20040201#"
+			xmlns:ns2="http://reference.e-government.gv.at/namespace/xml-sw/1#" 
+			xmlns:ns3="http://statistik.at/namespace/ur/stammdaten/4#">
+			<ns2:SearchRequestId>96c7ec50-275a-4e9d-86c6-84a710825a77</ns2:SearchRequestId>
+			<ns2:ResultInfo>
+				<ns2:FoundRecords>4</ns2:FoundRecords>
+				<ns2:ReturnedRecords>4</ns2:ReturnedRecords>
+			</ns2:ResultInfo>
+		    <ns2:ResultRecords>
+			    <ns2:ResultRecord id="1108395143">
+			        <PersonenDaten>
+			            <NichtNatuerlichePerson>
+			                <Identification>
+			                    <Value>R013M717Y</Value>
+			                    <Type>KUR</Type>
+			                    <ns3:TypeText>Kennziffer des Unternehmensregisters</ns3:TypeText>
+			                </Identification>
+			            </NichtNatuerlichePerson>
+			            <Zusatzdaten>
+			                <ns3:AendDat>2014-03-04T16:04:40.446+02:00</ns3:AendDat>
+			            </Zusatzdaten>
+			        </PersonenDaten>
+			    </ns2:ResultRecord>
+			    <ns2:ResultRecord id="1109548064">
+			        <PersonenDaten>
+			            <NichtNatuerlichePerson>
+			                <Identification>
+			                    <Value>R014D487B</Value>
+			                    <Type>KUR</Type>
+			                    <ns3:TypeText>Kennziffer des Unternehmensregisters</ns3:TypeText>
+			                </Identification>
+			            </NichtNatuerlichePerson>
+			            <Zusatzdaten>
+			                <ns3:AendDat>2014-03-04T16:04:40.446+02:00</ns3:AendDat>
+			            </Zusatzdaten>
+			        </PersonenDaten>
+			    </ns2:ResultRecord>
+			    <ns2:ResultRecord id="1110773212">
+			        <PersonenDaten>
+			            <NichtNatuerlichePerson>
+			                <Identification>
+			                    <Value>R043L591K</Value>
+			                    <Type>KUR</Type>
+			                    <ns3:TypeText>Kennziffer des Unternehmensregisters</ns3:TypeText>
+			                </Identification>
+			            </NichtNatuerlichePerson>
+			            <Zusatzdaten>
+			                <ns3:AendDat>2012-05-04T16:04:40.446+02:00</ns3:AendDat>
+			            </Zusatzdaten>
+			        </PersonenDaten>
+			    </ns2:ResultRecord>
+			    <ns2:ResultRecord id="1121149578">
+			        <PersonenDaten>
+			            <NichtNatuerlichePerson>
+			                <Identification>
+			                    <Value>R066C812C</Value>
+			                    <Type>KUR</Type>
+			                    <ns3:TypeText>Kennziffer des Unternehmensregisters</ns3:TypeText>
+			                </Identification>
+			            </NichtNatuerlichePerson>
+			            <Zusatzdaten>
+			                <ns3:AendDat>2014-03-04T16:04:40.446+02:00</ns3:AendDat>
+			            </Zusatzdaten>
+			        </PersonenDaten>
+			    </ns2:ResultRecord>
+			</ns2:ResultRecords>
+		</ns2:SearchResponse>
+	</soapenv:Body>
+</soapenv:Envelope>
diff --git a/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachBpk_Request.xml b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachBpk_Request.xml
new file mode 100644
index 0000000..1534856
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachBpk_Request.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="../schema_strict/all_strict_soap.xsd"> 
+    <soapenv:Header>
+        <secExt:Security xmlns:secExt="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
+            <pvpToken version="1.8" xmlns="http://egov.gv.at/pvp1.xsd">
+                <authenticate>
+                    <userPrincipal>
+                        <userId>beispiel.user@portal.statistik.gv.at</userId>
+                    </userPrincipal>
+                </authenticate>
+                <authorize>
+                    <role value="UR-Nutzer"/>
+                </authorize>
+            </pvpToken>
+        </secExt:Security>
+    </soapenv:Header>
+    <soapenv:Body>
+        <ns2:SearchByExample
+            xmlns="http://reference.e-government.gv.at/namespace/persondata/de/20040201#"
+            xmlns:ns2="http://reference.e-government.gv.at/namespace/xml-sw/1#" xmlns:ns3="http://statistik.at/namespace/ur/stammdaten/4#">
+            <ns2:SearchRequestId>96c7ec50-275a-4e9d-86c6-84a710825a77</ns2:SearchRequestId>
+            <ns2:SearchCriteria>
+              <ns3:SucheUnternehmenNachBpkRequest xmlns="http://statistik.at/namespace/ur/stammdaten/4#">
+                <bpkWTUREncoded>spwAeUM/n8okpsROzLSxNUn/U6Sr+/evE9rs0xI7WsRO79dSf4OBRS/q3LvAtxUmB7ZHyUUF/kVIxpjA4SRWs=</bpkWTUREncoded>
+                <nurAktive>true</nurAktive>
+              </ns3:SucheUnternehmenNachBpkRequest>
+            </ns2:SearchCriteria>
+        </ns2:SearchByExample>
+    </soapenv:Body>
+</soapenv:Envelope>
diff --git a/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachBpk_Response.xml b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachBpk_Response.xml
new file mode 100644
index 0000000..88de290
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachBpk_Response.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="../schema_strict/all_strict_soap.xsd">
+	<soapenv:Body>
+		<ns2:SearchResponse
+			xmlns="http://reference.e-government.gv.at/namespace/persondata/de/20040201#"
+			xmlns:ns2="http://reference.e-government.gv.at/namespace/xml-sw/1#"
+			xmlns:ns3="http://statistik.at/namespace/ur/stammdaten/4#">
+			<ns2:SearchRequestId>96c7ec50-275a-4e9d-86c6-84a710825a77</ns2:SearchRequestId>
+			<ns2:ResultInfo>
+				<ns2:FoundRecords>1</ns2:FoundRecords>
+				<ns2:ReturnedRecords>1</ns2:ReturnedRecords>
+			</ns2:ResultInfo>
+			<ns2:ResultRecords>
+				<ns2:ResultRecord id="3343621710">
+					<PersonenDaten>
+						<NichtNatuerlichePerson>
+							<Identification>
+								<Value>9110001021537</Value>
+								<Type>ERJ</Type>
+								<ns3:TypeText>Ordnungsnummer aus dem ERsB</ns3:TypeText>
+							</Identification>
+							<Identification>
+								<Value>R011S390Q</Value>
+								<Type>KUR</Type>
+								<ns3:TypeText>Kennziffer des Unternehmensregisters</ns3:TypeText>
+							</Identification>
+							<Identification>
+								<Value>9110001021537</Value>
+								<Type>SEK</Type>
+								<ns3:TypeText>Sekundär ID</ns3:TypeText>
+							</Identification>
+							<VollerName>Maxima Musterfrau</VollerName>
+							<ns3:Rechtsform>
+								<ns3:ReForm>1</ns3:ReForm>
+								<ns3:ReFormText>Einzelunternehmen</ns3:ReFormText>
+								<ns3:ReFormExtern>101</ns3:ReFormExtern>
+							</ns3:Rechtsform>
+						</NichtNatuerlichePerson>
+						<TypisiertePostAdresse>
+							<PostAdresse>
+								<Staatscode>AUT</Staatscode>
+								<Postleitzahl>1220</Postleitzahl>
+								<Gemeinde>Wien</Gemeinde>
+								<Gemeindekennziffer>90001</Gemeindekennziffer>
+								<Ortschaft>Wien</Ortschaft>
+								<Zustelladresse>
+									<Strassenname>Prandaugasse</Strassenname>
+									<Orientierungsnummer>10/2</Orientierungsnummer>
+								</Zustelladresse>
+							</PostAdresse>
+							<ns3:Typ>ZUSTELLADRESSE</ns3:Typ>
+						</TypisiertePostAdresse>
+						<Zusatzdaten>
+							<PersonenDaten>
+								<Identification>
+									<Value>A</Value>
+									<Type>PNR</Type>
+									<TypeText>Personennummer</TypeText>
+								</Identification>
+								<Zusatzdaten>
+									<ns3:EvbStatus>J</ns3:EvbStatus>
+									<ns3:Funktion>
+										<ns3:FktName>101</ns3:FktName>
+										<ns3:FktNameText>Inhaber</ns3:FktNameText>
+										<ns3:FktRegel>
+											<ns3:FktRegelVon>2012-06-15</ns3:FktRegelVon>
+											<ns3:FktRegelText>vertritt seit 15.06.2012 selbständig</ns3:FktRegelText>
+										</ns3:FktRegel>
+									</ns3:Funktion>
+								</Zusatzdaten>
+							</PersonenDaten>
+						</Zusatzdaten>
+					</PersonenDaten>
+				</ns2:ResultRecord>
+			</ns2:ResultRecords>
+		</ns2:SearchResponse>
+	</soapenv:Body>
+</soapenv:Envelope>
diff --git a/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachId_ERsB_Request.xml b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachId_ERsB_Request.xml
new file mode 100644
index 0000000..c40f9e6
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachId_ERsB_Request.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="../schema_strict/all_strict_soap.xsd"> 
+    <soapenv:Header>
+        <secExt:Security xmlns:secExt="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
+            <pvpToken version="1.8" xmlns="http://egov.gv.at/pvp1.xsd">
+                <authenticate>
+                    <userPrincipal>
+                        <userId>beispiel.user@portal.statistik.gv.at</userId>
+                    </userPrincipal>
+                </authenticate>
+                <authorize>
+                    <role value="UR-Nutzer"/>
+                </authorize>
+            </pvpToken>
+        </secExt:Security>
+    </soapenv:Header>
+    <soapenv:Body>
+        <ns2:SearchByExample
+            xmlns="http://reference.e-government.gv.at/namespace/persondata/de/20040201#"
+            xmlns:ns2="http://reference.e-government.gv.at/namespace/xml-sw/1#" xmlns:ns3="http://statistik.at/namespace/ur/stammdaten/4#">
+            <ns2:SearchRequestId>96c7ec50-275a-4e9d-86c6-84a710825a77</ns2:SearchRequestId>
+            <ns2:ResultCriteria>
+              <ns2:ExtraResultCriteria>
+                <ns3:ErsbAttribute>true</ns3:ErsbAttribute>
+              </ns2:ExtraResultCriteria>
+            </ns2:ResultCriteria> 
+            <ns2:SearchCriteria>
+                <ns3:SucheUnternehmenNachIdRequest xmlns="http://statistik.at/namespace/ur/stammdaten/4#">
+                   <version>V3.0</version>
+                   <erj>9110001021537</erj>
+                   <mitHistorie>false</mitHistorie>
+                </ns3:SucheUnternehmenNachIdRequest>
+            </ns2:SearchCriteria>
+        </ns2:SearchByExample>
+    </soapenv:Body>
+</soapenv:Envelope>
diff --git a/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachId_ERsB_Response.xml b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachId_ERsB_Response.xml
new file mode 100644
index 0000000..2113034
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachId_ERsB_Response.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+ 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns="http://statistik.at/namespace/ersb/1#"
+		xmlns:pd="http://reference.e-government.gv.at/namespace/persondata/de/20040201#"
+		xmlns:ersb="http://statistik.at/namespace/ersb/1#" 
+		xmlns:ns3="http://statistik.at/namespace/ur/stammdaten/4#"
+		xsi:noNamespaceSchemaLocation="../schema_strict/all_strict_soap.xsd">
+	<soapenv:Body>
+		<ns2:SearchResponse
+			xmlns="http://reference.e-government.gv.at/namespace/persondata/de/20040201#"
+			xmlns:ns2="http://reference.e-government.gv.at/namespace/xml-sw/1#">
+			<ns2:SearchRequestId>96c7ec50-275a-4e9d-86c6-84a710825a77</ns2:SearchRequestId>
+			<ns2:ResultInfo>
+				<ns2:FoundRecords>1</ns2:FoundRecords>
+				<ns2:ReturnedRecords>1</ns2:ReturnedRecords>
+			</ns2:ResultInfo>
+			<ns2:ResultRecords>
+				<ns2:ResultRecord id="3343621710">
+					<PersonenDaten>
+						<NichtNatuerlichePerson>
+							<Identification>
+								<Value>9110001021537</Value>
+								<Type>ERJ</Type>
+								<ns3:TypeText>Ordnungsnummer aus dem ERsB</ns3:TypeText>
+								<ns3:Beginn quText="Ergänzungsregister für sonstige Betroffene" quelle="ESB">2012-08-20+02:00</ns3:Beginn>
+							</Identification>
+							<Identification>
+								<Value>R011S390Q</Value>
+								<Type>KUR</Type>
+								<ns3:TypeText>Kennziffer des Unternehmensregisters</ns3:TypeText>
+								<ns3:Beginn quText="Unternehmensregister" quelle="UR">2012-08-20+02:00</ns3:Beginn>
+							</Identification>
+							<Identification>
+								<Value>9110001021537</Value>
+								<Type>SEK</Type>
+								<ns3:TypeText>Sekundär ID</ns3:TypeText>
+								<ns3:Beginn quText="Unternehmensregister" quelle="UR">2012-10-03+02:00</ns3:Beginn>
+							</Identification>
+							<Identification>
+								<Value>0002074662</Value>
+								<Type>SID</Type>
+								<ns3:TypeText>Subjektidentifikationsnummer</ns3:TypeText>
+								<ns3:Beginn quText="Steuer" quelle="ST">2012-08-20+02:00</ns3:Beginn>
+							</Identification>
+							<VollerName>Maxima Musterfrau</VollerName>
+							<Rechtsform>1</Rechtsform>
+							<ns3:UntName ns3:vollzugBeginn="v2">
+								<ns3:VollerName>Maxima Musterfrau</ns3:VollerName>
+							</ns3:UntName>
+							<ns3:Rechtsform ns3:vollzugBeginn="v1">
+								<ns3:ReForm>1</ns3:ReForm>
+								<ns3:ReFormText>Einzelunternehmen</ns3:ReFormText>
+								<ns3:ReFormExtern>101</ns3:ReFormExtern>
+								<ns3:ReFormExternText>Einzelunternehmen</ns3:ReFormExternText>
+							</ns3:Rechtsform>
+						</NichtNatuerlichePerson>
+						<TypisiertePostAdresse ns3:vollzugBeginn="v1">
+							<PostAdresse>
+								<Staatscode>AUT</Staatscode>
+								<Postleitzahl>1220</Postleitzahl>
+								<Gemeinde>Wien</Gemeinde>
+								<Gemeindekennziffer>90001</Gemeindekennziffer>
+								<Ortschaft>Wien</Ortschaft>
+								<Zustelladresse>
+									<Strassenname>Prandaugasse</Strassenname>
+									<Orientierungsnummer>10/2</Orientierungsnummer>
+								</Zustelladresse>
+							</PostAdresse>
+							<ns3:Typ>SITZ</ns3:Typ>
+						</TypisiertePostAdresse>
+						<Zusatzdaten>
+							<ns3:Bestandszeitraum ns3:vollzugBeginn="v1">
+							<ns3:BestandVon>2010-06-12</ns3:BestandVon>
+							</ns3:Bestandszeitraum>
+							<ns3:Bestandsnachweis ns3:vollzugBeginn="v1">Vertrag vom 11.10.2007</ns3:Bestandsnachweis>
+							<ns3:Vertretung ns3:vollzugBeginn="v1">Jedes vertretungsbefugte Organ vertritt selbständig</ns3:Vertretung>
+							<ns3:Rechtstatsachen ns3:vollzugBeginn="v1">
+								<ns3:RT_Nummer>001</ns3:RT_Nummer>
+								<ns3:RT_Code>0999</ns3:RT_Code>
+								<ns3:RT_Text>Rechtstatsachentext zum Unternehmen</ns3:RT_Text>
+							</ns3:Rechtstatsachen>
+							<ns3:Branche art="H">
+								<ns3:Oenace jahr="2008">0210</ns3:Oenace>
+								<ns3:OenaceText>Forstwirtschaft</ns3:OenaceText>
+								<ns3:Beginn quText="Ergänzungsregister für Sonstige Betroffene" quelle="ESB">2012-08-20+02:00</ns3:Beginn>
+							</ns3:Branche>
+							<PersonenDaten>
+								<NatuerlichePerson ns3:vollzugBeginn="v2">
+									<Identification>
+										<Value>A</Value>
+										<Type>PNR</Type>
+										<ns3:TypeText>Personennummer</ns3:TypeText>
+									</Identification>
+									<PersonenName>
+										<Vorname>Maxima</Vorname>
+										<Familienname>Musterfrau</Familienname>
+										<Affix position="prefix">Mag.Dr.</Affix>
+									</PersonenName>
+									<Geburtsdatum>1950-08-01</Geburtsdatum>
+								</NatuerlichePerson>
+								<TypisiertePostAdresse ns3:vollzugBeginn="v2">
+									<PostAdresse>
+										<Staatscode>AUT</Staatscode>
+										<Postleitzahl>1050</Postleitzahl>
+										<Gemeinde>Wien</Gemeinde>
+										<Gemeindekennziffer>90001</Gemeindekennziffer>
+										<Ortschaft>Wien</Ortschaft>
+										<Zustelladresse>
+											<Strassenname>Brandmayergasse</Strassenname>
+											<Orientierungsnummer>2/10</Orientierungsnummer>
+										</Zustelladresse>
+									</PostAdresse>
+									<ns3:Typ>ZUSTELLADRESSE</ns3:Typ>
+								</TypisiertePostAdresse>
+								<Zusatzdaten>
+									<ns3:EvbStatus>J</ns3:EvbStatus>
+									<ns3:Funktion ns3:vollzugBeginn="v2">
+										<ns3:FktName>101</ns3:FktName>
+										<ns3:FktNameText>Inhaber</ns3:FktNameText>
+										<ns3:FktRegel ns3:vollzugBeginn="v2">
+											<ns3:FktRegelVon>2010-06-12</ns3:FktRegelVon>
+											<ns3:FktRegelBis>2999-12-31</ns3:FktRegelBis>
+											<ns3:FktRegelText>Vertritt seit 18.12.2010 selbständig</ns3:FktRegelText>
+										</ns3:FktRegel>
+										<ns3:Rechtstatsachen ns3:vollzugBeginn="v2">
+											<ns3:RT_Nummer>001</ns3:RT_Nummer>
+											<ns3:RT_Code>0999</ns3:RT_Code>
+											<ns3:RT_Text>Rechtstatsachentext zur Funktion</ns3:RT_Text>
+										</ns3:Rechtstatsachen>
+									</ns3:Funktion>
+									<ns3:Rechtstatsachen ns3:vollzugBeginn="v2">
+										<ns3:RT_Nummer>001</ns3:RT_Nummer>
+										<ns3:RT_Code>0999</ns3:RT_Code>
+										<ns3:RT_Text>Rechtstatsachentext zur Person</ns3:RT_Text>
+									</ns3:Rechtstatsachen>
+								</Zusatzdaten>
+							</PersonenDaten>
+							<ns3:Vollzug id="v1" nummer="1" status="V">
+								<ns3:Antrag quelle="XYZ" quText="Quellenname">2012-06-01+01:00</ns3:Antrag>
+								<ns3:Vollzug quelle="XYZ" quText="Quellenname">2012-06-01+01:00</ns3:Vollzug>
+							</ns3:Vollzug>
+							<ns3:Vollzug id="v2" nummer="2" status="V">
+								<ns3:Antrag quelle="XYZ" quText="Quellenname">2012-06-15+01:00</ns3:Antrag>
+								<ns3:Vollzug quelle="XYZ" quText="Quellenname">2012-06-15+01:00</ns3:Vollzug>
+							</ns3:Vollzug>
+						</Zusatzdaten>
+					</PersonenDaten>
+				</ns2:ResultRecord>
+			</ns2:ResultRecords>
+		</ns2:SearchResponse>
+	</soapenv:Body>
+</soapenv:Envelope>
diff --git a/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachId_Request.xml b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachId_Request.xml
new file mode 100644
index 0000000..234f519
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachId_Request.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="../schema_strict/all_strict_soap.xsd"> 
+    <soapenv:Header>
+        <secExt:Security xmlns:secExt="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
+            <pvpToken version="1.8" xmlns="http://egov.gv.at/pvp1.xsd">
+                <authenticate>
+                    <userPrincipal>
+                        <userId>beispiel.user@portal.statistik.gv.at</userId>
+                    </userPrincipal>
+                </authenticate>
+                <authorize>
+                    <role value="UR-Nutzer"/>
+                </authorize>
+            </pvpToken>
+        </secExt:Security>
+    </soapenv:Header>
+    <soapenv:Body>
+        <ns2:SearchByExample
+            xmlns="http://reference.e-government.gv.at/namespace/persondata/de/20040201#"
+            xmlns:ns2="http://reference.e-government.gv.at/namespace/xml-sw/1#" xmlns:ns3="http://statistik.at/namespace/ur/stammdaten/4#">
+            <ns2:SearchRequestId>96c7ec50-275a-4e9d-86c6-84a710825a77</ns2:SearchRequestId>
+            <ns2:SearchCriteria>
+                <ns3:SucheUnternehmenNachIdRequest xmlns="http://statistik.at/namespace/ur/stammdaten/4#">
+                	<sek>9110001021537</sek>
+                	<mitHistorie>true</mitHistorie>
+                </ns3:SucheUnternehmenNachIdRequest>
+            </ns2:SearchCriteria>
+        </ns2:SearchByExample>
+    </soapenv:Body>
+</soapenv:Envelope>
diff --git a/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachId_Response.xml b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachId_Response.xml
new file mode 100644
index 0000000..463ad21
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachId_Response.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="../schema_strict/all_strict_soap.xsd">
+	<soapenv:Body>
+		<ns2:SearchResponse
+			xmlns="http://reference.e-government.gv.at/namespace/persondata/de/20040201#"
+			xmlns:ns2="http://reference.e-government.gv.at/namespace/xml-sw/1#"
+			xmlns:ns3="http://statistik.at/namespace/ur/stammdaten/4#">
+			<ns2:SearchRequestId>96c7ec50-275a-4e9d-86c6-84a710825a77</ns2:SearchRequestId>
+			<ns2:ResultInfo>
+				<ns2:FoundRecords>1</ns2:FoundRecords>
+				<ns2:ReturnedRecords>1</ns2:ReturnedRecords>
+			</ns2:ResultInfo>
+			<ns2:ResultRecords>
+				<ns2:ResultRecord id="3343621710471672029696195">
+					<PersonenDaten xmlns="http://reference.e-government.gv.at/namespace/persondata/de/20040201#">
+						<NichtNatuerlichePerson>
+							<Identification>
+								<Value>9110001021537</Value>
+								<Type>ERJ</Type>
+								<ns3:TypeText>Ordnungsnummer aus dem ERsB</ns3:TypeText>
+								<ns3:Beginn quText="Ergänzungsregister für Sonstige Betroffene" quelle="ESB">2012-08-20+02:00</ns3:Beginn>
+							</Identification>
+							<Identification>
+								<Value>R011S390Q</Value>
+								<Type>KUR</Type>
+								<ns3:TypeText>Kennziffer des Unternehmensregisters</ns3:TypeText>
+								<ns3:Beginn quText="Unternehmensregister" quelle="UR">2012-08-20+02:00</ns3:Beginn>
+							</Identification>
+							<Identification>
+								<Value>9110001021537</Value>
+								<Type>SEK</Type>
+								<ns3:TypeText>Sekundär ID</ns3:TypeText>
+								<ns3:Beginn quText="Unternehmensregister" quelle="UR">2012-10-03+02:00</ns3:Beginn>
+							</Identification>
+							<Identification>
+								<Value>0002074662</Value>
+								<Type>SID</Type>
+								<ns3:TypeText>Subjektidentifikationsnummer</ns3:TypeText>
+								<ns3:Beginn quText="Steuer" quelle="ST">2012-08-20+02:00</ns3:Beginn>
+							</Identification>
+							<VollerName>Maxima Musterfrau</VollerName>
+							<Rechtsform>1</Rechtsform>
+							<ns3:UntName ns3:vollzugBeginn="v1" ns3:vollzugEnde="v2">
+								<ns3:VollerName>Max Mustermann</ns3:VollerName>
+							</ns3:UntName>
+							<ns3:UntName ns3:vollzugBeginn="v2">
+								<ns3:VollerName>Maxima Musterfrau</ns3:VollerName>
+							</ns3:UntName>
+							<ns3:Rechtsform ns3:vollzugBeginn="v1">
+								<ns3:ReForm>1</ns3:ReForm>
+								<ns3:ReFormText>Einzelunternehmen</ns3:ReFormText>
+								<ns3:ReFormExtern>101</ns3:ReFormExtern>
+								<ns3:ReFormExternText>Einzelunternehmen</ns3:ReFormExternText>
+							</ns3:Rechtsform>
+						</NichtNatuerlichePerson>
+						<TypisiertePostAdresse ns3:vollzugBeginn="v1">
+							<PostAdresse>
+								<Staatscode>AUT</Staatscode>
+								<Postleitzahl>1220</Postleitzahl>
+								<Gemeinde>Wien</Gemeinde>
+								<Gemeindekennziffer>90001</Gemeindekennziffer>
+								<Ortschaft>Wien</Ortschaft>
+								<Zustelladresse>
+									<Strassenname>Prandaugasse</Strassenname>
+									<Orientierungsnummer>10/2</Orientierungsnummer>
+									<Nutzungseinheitlaufnummer>1</Nutzungseinheitlaufnummer>
+									<AdressRegisterEintrag>
+										<Adresscode>1234567</Adresscode>
+										<Subcode>123</Subcode>
+										<Objektnummer>1234567</Objektnummer>
+									</AdressRegisterEintrag>
+								</Zustelladresse>
+							</PostAdresse>
+							<ns3:Typ>SITZ</ns3:Typ>
+						</TypisiertePostAdresse>
+						<Zusatzdaten>
+							<ns3:Branche art="H">
+								<ns3:Oenace jahr="2008">0210</ns3:Oenace>
+								<ns3:OenaceText>Forstwirtschaft</ns3:OenaceText>
+								<ns3:Beginn quText="Ergänzungsregister für Sonstige Betroffene" quelle="ESB">2012-08-20+02:00</ns3:Beginn>
+							</ns3:Branche>
+							<PersonenDaten>
+								<NatuerlichePerson ns3:vollzugBeginn="v1">
+									<Identification>
+										<Value>A</Value>
+										<Type>PNR</Type>
+										<ns3:TypeText>Personennummer</ns3:TypeText>
+									</Identification>
+									<PersonenName>
+										<Vorname>Max</Vorname>
+										<Familienname>Mustermann</Familienname>
+										<Affix position="prefix">Mag.Dr.</Affix>
+									</PersonenName>
+									<Geburtsdatum>1950-08-01</Geburtsdatum>
+								</NatuerlichePerson>
+								<TypisiertePostAdresse ns3:vollzugBeginn="v1">
+									<PostAdresse>
+										<Staatscode>AUT</Staatscode>
+										<Postleitzahl>1050</Postleitzahl>
+										<Gemeinde>Wien</Gemeinde>
+										<Gemeindekennziffer>90001</Gemeindekennziffer>
+										<Ortschaft>Wien</Ortschaft>
+										<Zustelladresse>
+											<Strassenname>Brandmayergasse</Strassenname>
+											<Orientierungsnummer>2/10</Orientierungsnummer>
+										</Zustelladresse>
+									</PostAdresse>
+									<ns3:Typ>ZUSTELLADRESSE</ns3:Typ>
+								</TypisiertePostAdresse>
+								<Zusatzdaten>
+									<ns3:EvbStatus>N</ns3:EvbStatus>
+									<ns3:Funktion ns3:vollzugBeginn="v1" ns3:vollzugEnde="v2">
+										<ns3:FktName>101</ns3:FktName>
+										<ns3:FktNameText>Inhaber</ns3:FktNameText>
+										<ns3:FktRegel ns3:vollzugBeginn="v1" ns3:vollzugEnde="v2">
+											<ns3:FktRegelVon>2010-06-12</ns3:FktRegelVon>
+											<ns3:FktRegelBis>2999-12-31</ns3:FktRegelBis>
+											<ns3:FktRegelText>vertritt seit 18.12.2010 selbständig</ns3:FktRegelText>
+										</ns3:FktRegel>
+									</ns3:Funktion>
+								</Zusatzdaten>
+							</PersonenDaten>
+							<PersonenDaten>
+								<NatuerlichePerson ns3:vollzugBeginn="v2">
+									<Identification>
+										<Value>B</Value>
+										<Type>PNR</Type>
+										<ns3:TypeText>Personennummer</ns3:TypeText>
+									</Identification>
+									<PersonenName>
+										<Vorname>Maxima</Vorname>
+										<Familienname>Musterfrau</Familienname>
+										<Affix position="prefix">Mag.Dr.</Affix>
+									</PersonenName>
+									<Geburtsdatum>1950-08-01</Geburtsdatum>
+								</NatuerlichePerson>
+								<TypisiertePostAdresse ns3:vollzugBeginn="v2">
+									<PostAdresse>
+										<Staatscode>AUT</Staatscode>
+										<Postleitzahl>1050</Postleitzahl>
+										<Gemeinde>Wien</Gemeinde>
+										<Gemeindekennziffer>90001</Gemeindekennziffer>
+										<Ortschaft>Wien</Ortschaft>
+										<Zustelladresse>
+											<Strassenname>Brandmayergasse</Strassenname>
+											<Orientierungsnummer>2/10</Orientierungsnummer>
+										</Zustelladresse>
+									</PostAdresse>
+									<ns3:Typ>ZUSTELLADRESSE</ns3:Typ>
+								</TypisiertePostAdresse>
+								<Zusatzdaten>
+									<ns3:EvbStatus>J</ns3:EvbStatus>
+									<ns3:Funktion ns3:vollzugBeginn="v2">
+										<ns3:FktName>101</ns3:FktName>
+										<ns3:FktNameText>Inhaber</ns3:FktNameText>
+										<ns3:FktRegel ns3:vollzugBeginn="v3">
+											<ns3:FktRegelVon>2013-01-01</ns3:FktRegelVon>
+											<ns3:FktRegelBis>2999-12-31</ns3:FktRegelBis>
+											<ns3:FktRegelText>vertritt seit 01.01.2013 gemeinsam mit einem Geschäftsführer.</ns3:FktRegelText>
+										</ns3:FktRegel>
+									</ns3:Funktion>
+								</Zusatzdaten>
+							</PersonenDaten>
+							<ns3:Vollzug id="v1" nummer="1" status="V">
+								<ns3:Antrag quelle="XYZ" quText="Quellenname">2012-06-01+01:00</ns3:Antrag>
+								<ns3:Vollzug quelle="XYZ" quText="Quellenname">2012-06-01+01:00</ns3:Vollzug>
+							</ns3:Vollzug>
+							<ns3:Vollzug id="v2" nummer="2" status="V">
+								<ns3:Antrag quelle="XYZ" quText="Quellenname">2012-06-15+01:00</ns3:Antrag>
+								<ns3:Vollzug quelle="XYZ" quText="Quellenname">2012-06-15+01:00</ns3:Vollzug>
+							</ns3:Vollzug>
+							<ns3:Vollzug id="v3" nummer="3" status="V">
+								<ns3:Antrag quelle="XYZ" quText="Quellenname">2012-12-15+01:00</ns3:Antrag>
+								<ns3:Vollzug quelle="XYZ" quText="Quellenname">2012-12-15+01:00</ns3:Vollzug>
+							</ns3:Vollzug>
+						</Zusatzdaten>
+					</PersonenDaten>
+				</ns2:ResultRecord>
+			</ns2:ResultRecords>
+		</ns2:SearchResponse>
+	</soapenv:Body>
+</soapenv:Envelope>
diff --git a/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachId_mitHistorie_Response.xml b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachId_mitHistorie_Response.xml
new file mode 100644
index 0000000..fd25713
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachId_mitHistorie_Response.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="../schema_strict/all_strict_soap.xsd"> 
+	<soapenv:Body>
+		<ns2:SearchResponse
+			xmlns="http://reference.e-government.gv.at/namespace/persondata/de/20040201#"
+			xmlns:ns2="http://reference.e-government.gv.at/namespace/xml-sw/1#"
+			xmlns:ns3="http://statistik.at/namespace/ur/stammdaten/4#">
+			<ns2:SearchRequestId>96c7ec50-275a-4e9d-86c6-84a710825a77</ns2:SearchRequestId>
+			<ns2:ResultInfo>
+				<ns2:FoundRecords>1</ns2:FoundRecords>
+				<ns2:ReturnedRecords>1</ns2:ReturnedRecords>
+			</ns2:ResultInfo>
+			<ns2:ResultRecords>
+				<ns2:ResultRecord id="3343621710">
+					<PersonenDaten xmlns="http://reference.e-government.gv.at/namespace/persondata/de/20040201#">
+						<NichtNatuerlichePerson>
+							<Identification>
+								<Value>9110001021537</Value>
+								<Type>ERJ</Type>
+								<ns3:TypeText>Ordnungsnummer aus dem ERsB</ns3:TypeText>
+								<ns3:Beginn quText="Ergänzungsregister für Sonstige Betroffene" quelle="ESB">2012-08-20+02:00</ns3:Beginn>
+							</Identification>
+							<Identification>
+								<Value>R011S390Q</Value>
+								<Type>KUR</Type>
+								<ns3:TypeText>Kennziffer des Unternehmensregisters</ns3:TypeText>
+								<ns3:Beginn quText="Unternehmensregister" quelle="UR">2012-08-20+02:00</ns3:Beginn>
+							</Identification>
+							<Identification>
+								<Value>9110001021537</Value>
+								<Type>SEK</Type>
+								<ns3:TypeText>Sekundär ID</ns3:TypeText>
+								<ns3:Beginn quText="Unternehmensregister" quelle="UR">2012-10-03+02:00</ns3:Beginn>
+							</Identification>
+							<Identification>
+								<Value>0002074662</Value>
+								<Type>SID</Type>
+								<ns3:TypeText>Subjektidentifikationsnummer</ns3:TypeText>
+								<ns3:Beginn quText="Steuer" quelle="ST">2012-08-20+02:00</ns3:Beginn>
+							</Identification>
+							<VollerName>Maxima Musterfrau</VollerName>
+							<Rechtsform>1</Rechtsform>
+							<ns3:UntName ns3:vollzugBeginn="v1" ns3:vollzugEnde="v2">
+								<ns3:VollerName>Max Mustermann</ns3:VollerName>
+							</ns3:UntName>
+							<ns3:UntName ns3:vollzugBeginn="v2">
+								<ns3:VollerName>Maxima Musterfrau</ns3:VollerName>
+							</ns3:UntName>
+							<ns3:Rechtsform ns3:vollzugBeginn="v1">
+								<ns3:ReForm>1</ns3:ReForm>
+								<ns3:ReFormText>Einzelunternehmen</ns3:ReFormText>
+								<ns3:ReFormExtern>101</ns3:ReFormExtern>
+								<ns3:ReFormExternText>Einzelunternehmen</ns3:ReFormExternText>
+							</ns3:Rechtsform>
+						</NichtNatuerlichePerson>
+						<TypisiertePostAdresse ns3:vollzugBeginn="v1">
+							<PostAdresse>
+								<Staatscode>AUT</Staatscode>
+								<Postleitzahl>1220</Postleitzahl>
+								<Gemeinde>Wien</Gemeinde>
+								<Gemeindekennziffer>90001</Gemeindekennziffer>
+								<Ortschaft>Wien</Ortschaft>
+								<Zustelladresse>
+									<Strassenname>Prandaugasse</Strassenname>
+									<Orientierungsnummer>10/2</Orientierungsnummer>
+								</Zustelladresse>
+							</PostAdresse>
+							<ns3:Typ>SITZ</ns3:Typ>
+						</TypisiertePostAdresse>
+						<Zusatzdaten>
+							<ns3:Branche art="H">
+								<ns3:Oenace jahr="2008">0210</ns3:Oenace>
+								<ns3:OenaceText>Forstwirtschaft</ns3:OenaceText>
+								<ns3:Beginn quText="Ergänzungsregister für Sonstige Betroffene" quelle="ESB">2012-08-20+02:00</ns3:Beginn>
+							</ns3:Branche>
+							<PersonenDaten>
+								<NatuerlichePerson ns3:vollzugBeginn="v1">
+									<Identification>
+										<Value>A</Value>
+										<Type>PNR</Type>
+										<ns3:TypeText>Personennummer</ns3:TypeText>
+									</Identification>
+									<PersonenName>
+										<Vorname>Max</Vorname>
+										<Familienname>Mustermann</Familienname>
+										<Affix position="prefix">Mag.Dr.</Affix>
+									</PersonenName>
+									<Geburtsdatum>1950-08-01</Geburtsdatum>
+								</NatuerlichePerson>
+								<TypisiertePostAdresse ns3:vollzugBeginn="v1">
+									<PostAdresse>
+										<Staatscode>AUT</Staatscode>
+										<Postleitzahl>1050</Postleitzahl>
+										<Gemeinde>Wien</Gemeinde>
+										<Gemeindekennziffer>90001</Gemeindekennziffer>
+										<Ortschaft>Wien</Ortschaft>
+										<Zustelladresse>
+											<Strassenname>Brandmayergasse</Strassenname>
+											<Orientierungsnummer>2/10</Orientierungsnummer>
+										</Zustelladresse>
+									</PostAdresse>
+									<ns3:Typ>ZUSTELLADRESSE</ns3:Typ>
+								</TypisiertePostAdresse>
+								<Zusatzdaten>
+									<ns3:EvbStatus>N</ns3:EvbStatus>
+									<ns3:Funktion ns3:vollzugBeginn="v1" ns3:vollzugEnde="v2">
+										<ns3:FktName>101</ns3:FktName>
+										<ns3:FktNameText>Inhaber</ns3:FktNameText>
+										<ns3:FktRegel ns3:vollzugBeginn="v1" ns3:vollzugEnde="v2">
+											<ns3:FktRegelVon>2010-06-12</ns3:FktRegelVon>
+											<ns3:FktRegelBis>2999-12-31</ns3:FktRegelBis>
+											<ns3:FktRegelText>vertritt seit 18.12.2010 selbständig</ns3:FktRegelText>
+										</ns3:FktRegel>
+									</ns3:Funktion>
+								</Zusatzdaten>
+							</PersonenDaten>
+							<PersonenDaten>
+								<NatuerlichePerson ns3:vollzugBeginn="v2">
+									<Identification>
+										<Value>B</Value>
+										<Type>PNR</Type>
+										<ns3:TypeText>Personennummer</ns3:TypeText>
+									</Identification>
+									<PersonenName>
+										<Vorname>Maxima</Vorname>
+										<Familienname>Musterfrau</Familienname>
+										<Affix position="prefix">Mag.Dr.</Affix>
+									</PersonenName>
+									<Geburtsdatum>1950-08-01</Geburtsdatum>
+								</NatuerlichePerson>
+								<TypisiertePostAdresse ns3:vollzugBeginn="v2">
+									<PostAdresse>
+										<Staatscode>AUT</Staatscode>
+										<Postleitzahl>1050</Postleitzahl>
+										<Gemeinde>Wien</Gemeinde>
+										<Gemeindekennziffer>90001</Gemeindekennziffer>
+										<Ortschaft>Wien</Ortschaft>
+										<Zustelladresse>
+											<Strassenname>Brandmayergasse</Strassenname>
+											<Orientierungsnummer>2/10</Orientierungsnummer>
+										</Zustelladresse>
+									</PostAdresse>
+									<ns3:Typ>ZUSTELLADRESSE</ns3:Typ>
+								</TypisiertePostAdresse>
+								<Zusatzdaten>
+									<ns3:EvbStatus>J</ns3:EvbStatus>
+									<ns3:Funktion ns3:vollzugBeginn="v2">
+										<ns3:FktName>101</ns3:FktName>
+										<ns3:FktNameText>Inhaber</ns3:FktNameText>
+										<ns3:FktRegel ns3:vollzugBeginn="v2" ns3:vollzugEnde="v3">
+											<ns3:FktRegelVon>2012-06-15</ns3:FktRegelVon>
+											<ns3:FktRegelBis>2012-12-31</ns3:FktRegelBis>
+											<ns3:FktRegelText>vertritt seit 15.06.2012 selbständig</ns3:FktRegelText>
+										</ns3:FktRegel>
+										<ns3:FktRegel ns3:vollzugBeginn="v3">
+											<ns3:FktRegelVon>2013-01-01</ns3:FktRegelVon>
+											<ns3:FktRegelBis>2999-12-31</ns3:FktRegelBis>
+											<ns3:FktRegelText>vertritt seit 01.01.2013 gemeinsam mit einem Geschäftsführer.</ns3:FktRegelText>
+										</ns3:FktRegel>
+									</ns3:Funktion>
+								</Zusatzdaten>
+							</PersonenDaten>
+							<ns3:Vollzug id="v1" nummer="1" status="V">
+								<ns3:Antrag quelle="XYZ" quText="Quellenname">2012-06-01+01:00</ns3:Antrag>
+								<ns3:Vollzug quelle="XYZ" quText="Quellenname">2012-06-01+01:00</ns3:Vollzug>
+							</ns3:Vollzug>
+							<ns3:Vollzug id="v2" nummer="2" status="V">
+								<ns3:Antrag quelle="XYZ" quText="Quellenname">2012-06-15+01:00</ns3:Antrag>
+								<ns3:Vollzug quelle="XYZ" quText="Quellenname">2012-06-15+01:00</ns3:Vollzug>
+							</ns3:Vollzug>
+							<ns3:Vollzug id="v3" nummer="3" status="V">
+								<ns3:Antrag quelle="XYZ" quText="Quellenname">2012-12-15+01:00</ns3:Antrag>
+								<ns3:Vollzug quelle="XYZ" quText="Quellenname">2012-12-15+01:00</ns3:Vollzug>
+							</ns3:Vollzug>
+						</Zusatzdaten>
+					</PersonenDaten>
+				</ns2:ResultRecord>
+			</ns2:ResultRecords>
+		</ns2:SearchResponse>
+	</soapenv:Body>
+</soapenv:Envelope>
diff --git a/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachIds_Request.xml b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachIds_Request.xml
new file mode 100644
index 0000000..c7a7725
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachIds_Request.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="../schema_strict/all_strict_soap.xsd"> 
+    <soapenv:Header>
+        <secExt:Security xmlns:secExt="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
+            <pvpToken version="1.8" xmlns="http://egov.gv.at/pvp1.xsd">
+                <authenticate>
+                    <userPrincipal>
+                        <userId>beispiel.user@portal.statistik.gv.at</userId>
+                    </userPrincipal>
+                </authenticate>
+                <authorize>
+                    <role value="UR-Nutzer"/>
+                </authorize>
+            </pvpToken>
+        </secExt:Security>
+    </soapenv:Header>
+    <soapenv:Body>
+        <ns2:SearchByExample
+            xmlns="http://reference.e-government.gv.at/namespace/persondata/de/20040201#"
+            xmlns:ns2="http://reference.e-government.gv.at/namespace/xml-sw/1#" xmlns:ns3="http://statistik.at/namespace/ur/stammdaten/4#">
+            <ns2:SearchRequestId>96c7ec50-275a-4e9d-86c6-84a710825a77</ns2:SearchRequestId>
+            <ns2:SearchCriteria>
+                <ns3:SucheUnternehmenNachIdsRequest xmlns="http://statistik.at/namespace/ur/stammdaten/4#">
+                	<ns3:kur>R013D398E</ns3:kur>
+                	<ns3:fbn>359546a</ns3:fbn>
+                	<ns3:zvr>572374315</ns3:zvr>
+                	<ns3:erj>1234567890123</ns3:erj>
+               </ns3:SucheUnternehmenNachIdsRequest>
+            </ns2:SearchCriteria>
+        </ns2:SearchByExample>
+    </soapenv:Body>
+</soapenv:Envelope>
diff --git a/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachIds_Response.xml b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachIds_Response.xml
new file mode 100644
index 0000000..d51caf8
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachIds_Response.xml
@@ -0,0 +1,368 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="../schema_strict/all_strict_soap.xsd">
+	<soapenv:Body>
+		<ns2:SearchResponse xmlns="http://reference.e-government.gv.at/namespace/persondata/de/20040201#"
+			xmlns:ns2="http://reference.e-government.gv.at/namespace/xml-sw/1#"
+			xmlns:ns3="http://statistik.at/namespace/ur/stammdaten/4#">
+			<ns2:SearchRequestId>96c7ec50-275a-4e9d-86c6-84a710825a77</ns2:SearchRequestId>
+			<ns2:ResultInfo>
+				<ns2:FoundRecords>4</ns2:FoundRecords>
+				<ns2:ReturnedRecords>4</ns2:ReturnedRecords>
+			</ns2:ResultInfo>
+			<ns2:ResultRecords>
+				<ns2:ResultRecord id="3343621710">
+					<PersonenDaten>
+						<NichtNatuerlichePerson>
+							<Identification>
+								<Value>R211S487S</Value>
+								<Type>KUR</Type>
+								<ns3:TypeText>Kennziffer des Unternehmensregisters</ns3:TypeText>
+							</Identification>
+							<Identification>
+								<Value>9110002967919</Value>
+								<Type>ERJ</Type>
+								<ns3:TypeText>Ordnungsnummer aus dem ERsB</ns3:TypeText>
+							</Identification>
+							<Identification>
+								<Value>9110002967919</Value>
+								<Type>SEK</Type>
+								<ns3:TypeText>Sekundär ID</ns3:TypeText>
+							</Identification>
+							<VollerName>Verfassungsgerichtshof</VollerName>
+							<ns3:Rechtsform>
+								<ns3:ReForm>7</ns3:ReForm>
+								<ns3:ReFormText>Öffentlich rechtliche Körperschaft</ns3:ReFormText>
+								<ns3:ReFormExtern>311</ns3:ReFormExtern>
+							</ns3:Rechtsform>
+						</NichtNatuerlichePerson>
+						<TypisiertePostAdresse>
+							<PostAdresse>
+								<Staatscode>AUT</Staatscode>
+								<Postleitzahl>1010</Postleitzahl>
+								<Ortschaft>Wien</Ortschaft>
+								<Zustelladresse>
+									<Strassenname>Freyung</Strassenname>
+									<Orientierungsnummer>8</Orientierungsnummer>
+								</Zustelladresse>
+							</PostAdresse>
+							<ns3:Typ>ZUSTELLADRESSE</ns3:Typ>
+						</TypisiertePostAdresse>
+						<Zusatzdaten>
+							<ns3:Gesperrt>true</ns3:Gesperrt>
+							<ns3:Dubletten>
+								<ns3:art>M</ns3:art>
+							</ns3:Dubletten>
+						</Zusatzdaten>
+					</PersonenDaten>
+				</ns2:ResultRecord>
+				<ns2:ResultRecord id="3343621710">
+					<PersonenDaten>
+						<NichtNatuerlichePerson>
+							<Identification>
+								<Value>572374315</Value>
+								<Type>ZVR</Type>
+								<ns3:TypeText>ZVR-Zahl</ns3:TypeText>
+								<ns3:Beginn quText="Vereinsregister" quelle="VR">2012-08-20+02:00</ns3:Beginn>
+							</Identification>
+							<Identification>
+								<Value>R211S487S</Value>
+								<Type>KUR</Type>
+								<ns3:TypeText>Kennziffer des Unternehmensregisters</ns3:TypeText>
+								<ns3:Beginn quText="Unternehmensregister" quelle="UR">2012-08-20+02:00</ns3:Beginn>
+							</Identification>
+							<Identification>
+								<Value>9110002037568</Value>
+								<Type>SEK</Type>
+								<ns3:TypeText>Sekundär ID</ns3:TypeText>
+								<ns3:Beginn quText="Unternehmensregister" quelle="UR">2012-10-03+02:00</ns3:Beginn>
+							</Identification>
+							<VollerName>Verein für gute Zusammenarbeit</VollerName>
+							<Rechtsform>12</Rechtsform>
+							<ns3:UntName ns3:vollzugBeginn="v2">
+								<ns3:VollerName>Verein für gute Zusammenarbeit</ns3:VollerName>
+							</ns3:UntName>
+							<ns3:Rechtsform ns3:vollzugBeginn="v1">
+								<ns3:ReForm>12</ns3:ReForm>
+								<ns3:ReFormText>Verein</ns3:ReFormText>
+								<ns3:ReFormExtern>501</ns3:ReFormExtern>
+								<ns3:ReFormExternText>Verein</ns3:ReFormExternText>
+							</ns3:Rechtsform>
+						</NichtNatuerlichePerson>
+						<TypisiertePostAdresse ns3:vollzugBeginn="v1">
+							<PostAdresse>
+								<Staatscode>AUT</Staatscode>
+								<Postleitzahl>2345</Postleitzahl>
+								<Gemeinde>Mödling</Gemeinde>
+								<Gemeindekennziffer>31717</Gemeindekennziffer>
+								<Ortschaft>Brunn am Gebirge</Ortschaft>
+								<Zustelladresse>
+									<Strassenname>Andreas Hofer Straße</Strassenname>
+									<Orientierungsnummer>5</Orientierungsnummer>
+								</Zustelladresse>
+							</PostAdresse>
+							<ns3:Typ>SITZ</ns3:Typ>
+						</TypisiertePostAdresse>
+						<Zusatzdaten>
+							<ns3:Dubletten>
+								<ns3:art>M</ns3:art>
+							</ns3:Dubletten>
+							<PersonenDaten>
+								<NatuerlichePerson ns3:vollzugBeginn="v2">
+									<Identification>
+										<Value>A</Value>
+										<Type>PNR</Type>
+										<ns3:TypeText>Personennummer</ns3:TypeText>
+									</Identification>
+									<PersonenName>
+										<Vorname>Johannes</Vorname>
+										<Familienname>Gutberger</Familienname>
+									</PersonenName>
+									<Geburtsdatum>1945-08-23</Geburtsdatum>
+								</NatuerlichePerson>
+								<TypisiertePostAdresse ns3:vollzugBeginn="v2">
+									<PostAdresse>
+										<Staatscode>AUT</Staatscode>
+										<Postleitzahl>2345</Postleitzahl>
+										<Gemeinde>Mödling</Gemeinde>
+										<Gemeindekennziffer>31717</Gemeindekennziffer>
+										<Ortschaft>Brunn am Gebirge</Ortschaft>
+										<Zustelladresse>
+											<Strassenname>Wiener Straße</Strassenname>
+											<Orientierungsnummer>15</Orientierungsnummer>
+											<Nutzungseinheitlaufnummer>1</Nutzungseinheitlaufnummer>
+											<AdressRegisterEintrag>
+												<Adresscode>1234567</Adresscode>
+												<Subcode>123</Subcode>
+												<Objektnummer>1234567</Objektnummer>
+											</AdressRegisterEintrag>
+										</Zustelladresse>
+									</PostAdresse>
+									<ns3:Typ>ZUSTELLADRESSE</ns3:Typ>
+								</TypisiertePostAdresse>
+								<Zusatzdaten>
+									<ns3:EvbStatus>U</ns3:EvbStatus>
+									<ns3:Funktion ns3:vollzugBeginn="v2">
+										<ns3:FktName>200</ns3:FktName>
+										<ns3:FktNameText>Schriftführer</ns3:FktNameText>
+										<ns3:FktRegel ns3:vollzugBeginn="v2">
+											<ns3:FktRegelText>vertritt seit 23.03.2011 selbständig</ns3:FktRegelText>
+										</ns3:FktRegel>
+									</ns3:Funktion>
+								</Zusatzdaten>
+							</PersonenDaten>
+							<ns3:Vollzug id="v1" nummer="1" status="V">
+								<ns3:Antrag quelle="XYZ" quText="Quellenname">2012-06-01+01:00</ns3:Antrag>
+								<ns3:Vollzug quelle="XYZ" quText="Quellenname">2012-06-01+01:00</ns3:Vollzug>
+							</ns3:Vollzug>
+							<ns3:Vollzug id="v2" nummer="2" status="V">
+								<ns3:Antrag quelle="XYZ" quText="Quellenname">2012-06-15+01:00</ns3:Antrag>
+								<ns3:Vollzug quelle="XYZ" quText="Quellenname">2012-06-15+01:00</ns3:Vollzug>
+							</ns3:Vollzug>
+						</Zusatzdaten>
+					</PersonenDaten>
+				</ns2:ResultRecord>
+				<ns2:ResultRecord id="3343621710">
+					<PersonenDaten>
+						<NichtNatuerlichePerson>
+							<Identification>
+								<Value>359546a</Value>
+								<Type>FBN</Type>
+								<ns3:TypeText>Firmenbuchnummer</ns3:TypeText>
+								<ns3:Beginn quText="Firmenbuch" quelle="FB">2012-08-20+02:00</ns3:Beginn>
+							</Identification>
+							<Identification>
+								<Value>R467A012W</Value>
+								<Type>KUR</Type>
+								<ns3:TypeText>Kennziffer des Unternehmensregisters</ns3:TypeText>
+								<ns3:Beginn quText="Unternehmensregister" quelle="UR">2012-08-20+02:00</ns3:Beginn>
+							</Identification>
+							<Identification>
+								<Value>9110005437599</Value>
+								<Type>SEK</Type>
+								<ns3:TypeText>Sekundär ID</ns3:TypeText>
+								<ns3:Beginn quText="Unternehmensregister" quelle="UR">2012-10-03+02:00</ns3:Beginn>
+							</Identification>
+							<VollerName>Wir gewinnen GesmbH</VollerName>
+							<Rechtsform>9</Rechtsform>
+							<ns3:UntName ns3:vollzugBeginn="v3">
+								<ns3:VollerName>Wir gewinnen GesmbH</ns3:VollerName>
+							</ns3:UntName>
+							<ns3:Rechtsform ns3:vollzugBeginn="v3">
+								<ns3:ReForm>9</ns3:ReForm>
+								<ns3:ReFormText>G.m.b.H.</ns3:ReFormText>
+								<ns3:ReFormExtern>209</ns3:ReFormExtern>
+								<ns3:ReFormExternText>Gesellschaft mit beschränkter Haftung</ns3:ReFormExternText>
+							</ns3:Rechtsform>
+						</NichtNatuerlichePerson>
+						<TypisiertePostAdresse ns3:vollzugBeginn="v3">
+							<PostAdresse>
+								<Staatscode>AUT</Staatscode>
+								<Postleitzahl>1010</Postleitzahl>
+								<Gemeinde>Wien</Gemeinde>
+								<Gemeindekennziffer>90001</Gemeindekennziffer>
+								<Ortschaft>Wien</Ortschaft>
+								<Zustelladresse>
+									<Strassenname>Schwarzenbergstraߟe</Strassenname>
+									<Orientierungsnummer>12</Orientierungsnummer>
+								</Zustelladresse>
+							</PostAdresse>
+							<ns3:Typ>SITZ</ns3:Typ>
+						</TypisiertePostAdresse>
+						<Zusatzdaten>
+							<ns3:Branche art="H">
+								<ns3:Oenace jahr="2008">9200</ns3:Oenace>
+								<ns3:OenaceText>Spiel-, Wett- und Lotteriewesen</ns3:OenaceText>
+								<ns3:Beginn quText="Unternehmensregister" quelle="UR">2012-01-01</ns3:Beginn>
+							</ns3:Branche>
+							<PersonenDaten>
+								<NatuerlichePerson ns3:vollzugBeginn="v3">
+									<Identification>
+										<Value>A</Value>
+										<Type>PNR</Type>
+										<ns3:TypeText>Personennummer</ns3:TypeText>
+									</Identification>
+									<PersonenName>
+										<Vorname>Detlev</Vorname>
+										<Familienname>Gans</Familienname>
+									</PersonenName>
+									<Geburtsdatum>1986-02-15</Geburtsdatum>
+								</NatuerlichePerson>
+								<TypisiertePostAdresse ns3:vollzugBeginn="v3">
+									<PostAdresse>
+										<Staatscode>AUT</Staatscode>
+										<Postleitzahl>1190</Postleitzahl>
+										<Gemeinde>Wien</Gemeinde>
+										<Gemeindekennziffer>90001</Gemeindekennziffer>
+										<Ortschaft>Wien</Ortschaft>
+										<Zustelladresse>
+											<Strassenname>Unterer Schreiberweg</Strassenname>
+											<Orientierungsnummer>34/1</Orientierungsnummer>
+										</Zustelladresse>
+									</PostAdresse>
+									<ns3:Typ>ZUSTELLADRESSE</ns3:Typ>
+								</TypisiertePostAdresse>
+								<Zusatzdaten>
+									<ns3:EvbStatus>J</ns3:EvbStatus>
+									<ns3:Funktion ns3:vollzugBeginn="v3">
+										<ns3:FktName>104</ns3:FktName>
+										<ns3:FktNameText>Geschäftsführer</ns3:FktNameText>
+									</ns3:Funktion>
+								</Zusatzdaten>
+							</PersonenDaten>
+							<ns3:Vollzug id="v3" nummer="1" status="V">
+								<ns3:Antrag quelle="XYZ" quText="Quellenname">2001-05-12+01:00</ns3:Antrag>
+								<ns3:Vollzug quelle="XYZ" quText="Quellenname">2001-05-16+01:00</ns3:Vollzug>
+							</ns3:Vollzug>
+						</Zusatzdaten>
+					</PersonenDaten>
+				</ns2:ResultRecord>
+				<ns2:ResultRecord id="3343621710">
+					<PersonenDaten>
+						<NichtNatuerlichePerson>
+							<Identification>
+								<Value>9110001021537</Value>
+								<Type>ERJ</Type>
+								<ns3:TypeText>Ordnungsnummer aus dem ERsB</ns3:TypeText>
+								<ns3:Beginn quText="Ergänzungsregister für sonstige Betroffene" quelle="ESB">2012-08-20+02:00</ns3:Beginn>
+							</Identification>
+							<Identification>
+								<Value>R013D398E</Value>
+								<Type>KUR</Type>
+								<ns3:TypeText>Kennziffer des Unternehmensregisters</ns3:TypeText>
+								<ns3:Beginn quText="Unternehmensregister" quelle="UR">2012-08-20+02:00</ns3:Beginn>
+							</Identification>
+							<Identification>
+								<Value>9110001021537</Value>
+								<Type>SEK</Type>
+								<ns3:TypeText>Sekundär ID</ns3:TypeText>
+								<ns3:Beginn quText="Unternehmensregister" quelle="UR">2012-10-03+02:00</ns3:Beginn>
+							</Identification>
+							<Identification>
+								<Value>0002074662</Value>
+								<Type>SID</Type>
+								<ns3:TypeText>Subjektidentifikationsnummer</ns3:TypeText>
+								<ns3:Beginn quText="Steuer" quelle="ST">2012-08-20+02:00</ns3:Beginn>
+							</Identification>
+							<VollerName>Maxima Musterfrau</VollerName>
+							<Rechtsform>1</Rechtsform>
+							<ns3:UntName ns3:vollzugBeginn="v5">
+								<ns3:VollerName>Maxima Musterfrau</ns3:VollerName>
+							</ns3:UntName>
+							<ns3:Rechtsform ns3:vollzugBeginn="v4">
+								<ns3:ReForm>1</ns3:ReForm>
+								<ns3:ReFormText>Einzelunternehmen</ns3:ReFormText>
+								<ns3:ReFormExtern>101</ns3:ReFormExtern>
+								<ns3:ReFormExternText>Einzelunternehmen</ns3:ReFormExternText>
+							</ns3:Rechtsform>
+						</NichtNatuerlichePerson>
+						<TypisiertePostAdresse ns3:vollzugBeginn="v4">
+							<PostAdresse>
+								<Staatscode>AUT</Staatscode>
+								<Postleitzahl>1220</Postleitzahl>
+								<Gemeinde>Wien</Gemeinde>
+								<Gemeindekennziffer>90001</Gemeindekennziffer>
+								<Ortschaft>Wien</Ortschaft>
+								<Zustelladresse>
+									<Strassenname>Prandaugasse</Strassenname>
+									<Orientierungsnummer>10/2</Orientierungsnummer>
+								</Zustelladresse>
+							</PostAdresse>
+							<ns3:Typ>SITZ</ns3:Typ>
+						</TypisiertePostAdresse>
+						<Zusatzdaten>
+							<PersonenDaten>
+								<NatuerlichePerson ns3:vollzugBeginn="v5">
+									<Identification>
+										<Value>A</Value>
+										<Type>PNR</Type>
+										<ns3:TypeText>Personennummer</ns3:TypeText>
+									</Identification>
+									<PersonenName>
+										<Vorname>Maxima</Vorname>
+										<Familienname>Musterfrau</Familienname>
+										<Affix position="prefix">Mag.Dr.</Affix>
+									</PersonenName>
+									<Geburtsdatum>1950-08-01</Geburtsdatum>
+								</NatuerlichePerson>
+								<TypisiertePostAdresse ns3:vollzugBeginn="v5">
+									<PostAdresse>
+										<Staatscode>AUT</Staatscode>
+										<Postleitzahl>1050</Postleitzahl>
+										<Gemeinde>Wien</Gemeinde>
+										<Gemeindekennziffer>90001</Gemeindekennziffer>
+										<Ortschaft>Wien</Ortschaft>
+										<Zustelladresse>
+											<Strassenname>Brandmayergasse</Strassenname>
+											<Orientierungsnummer>2/10</Orientierungsnummer>
+										</Zustelladresse>
+									</PostAdresse>
+									<ns3:Typ>ZUSTELLADRESSE</ns3:Typ>
+								</TypisiertePostAdresse>
+								<Zusatzdaten>
+									<ns3:EvbStatus>J</ns3:EvbStatus>
+									<ns3:Funktion ns3:vollzugBeginn="v5">
+										<ns3:FktName>101</ns3:FktName>
+										<ns3:FktNameText>Inhaber</ns3:FktNameText>
+										<ns3:FktRegel ns3:vollzugBeginn="v5">
+											<ns3:FktRegelText>vertritt seit 15.06.2012 selbständig</ns3:FktRegelText>
+										</ns3:FktRegel>
+									</ns3:Funktion>
+								</Zusatzdaten>
+							</PersonenDaten>
+							<ns3:Vollzug id="v4" nummer="1" status="V">
+								<ns3:Antrag quelle="XYZ" quText="Quellenname">2012-06-01+01:00</ns3:Antrag>
+								<ns3:Vollzug quelle="XYZ" quText="Quellenname">2012-06-01+01:00</ns3:Vollzug>
+							</ns3:Vollzug>
+							<ns3:Vollzug id="v5" nummer="2" status="V">
+								<ns3:Antrag quelle="XYZ" quText="Quellenname">2012-06-15+01:00</ns3:Antrag>
+								<ns3:Vollzug quelle="XYZ" quText="Quellenname">2012-06-15+01:00</ns3:Vollzug>
+							</ns3:Vollzug>
+						</Zusatzdaten>
+					</PersonenDaten>
+				</ns2:ResultRecord>
+			</ns2:ResultRecords>
+		</ns2:SearchResponse>
+	</soapenv:Body>
+</soapenv:Envelope>
diff --git a/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachMerkmalen_Request.xml b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachMerkmalen_Request.xml
new file mode 100644
index 0000000..cb00668
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachMerkmalen_Request.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="../schema_strict/all_strict_soap.xsd"> 
+    <soapenv:Header>
+        <secExt:Security xmlns:secExt="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
+            <pvpToken version="1.8" xmlns="http://egov.gv.at/pvp1.xsd">
+                <authenticate>
+                    <userPrincipal>
+                        <userId>beispiel.user@portal.statistik.gv.at</userId>
+                    </userPrincipal>
+                </authenticate>
+                <authorize>
+                    <role value="UR-Nutzer"/>
+                </authorize>
+            </pvpToken>
+        </secExt:Security>
+    </soapenv:Header>
+    <soapenv:Body>
+        <ns2:SearchByExample
+            xmlns="http://reference.e-government.gv.at/namespace/persondata/de/20040201#"
+            xmlns:ns2="http://reference.e-government.gv.at/namespace/xml-sw/1#" xmlns:ns3="http://statistik.at/namespace/ur/stammdaten/4#">
+            <ns2:SearchRequestId>96c7ec50-275a-4e9d-86c6-84a710825a77</ns2:SearchRequestId>
+            <ns2:SearchCriteria>
+                 <ns3:SucheUnternehmenRequest xmlns="http://statistik.at/namespace/ur/stammdaten/4#">
+                    <unternehmensdaten>
+                        <phonetisch>true</phonetisch>
+                        <untName>austrian*</untName>
+                        <rechtsform>8</rechtsform>
+                    </unternehmensdaten>
+                </ns3:SucheUnternehmenRequest>
+            </ns2:SearchCriteria>
+        </ns2:SearchByExample>
+    </soapenv:Body>
+</soapenv:Envelope>
diff --git a/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachMerkmalen_Response.xml b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachMerkmalen_Response.xml
new file mode 100644
index 0000000..9ccbbda
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/examples/example_SucheUnternehmenNachMerkmalen_Response.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="../schema_strict/all_strict_soap.xsd">
+	<soapenv:Body>
+		<ns2:SearchResponse
+			xmlns="http://reference.e-government.gv.at/namespace/persondata/de/20040201#"
+			xmlns:ns2="http://reference.e-government.gv.at/namespace/xml-sw/1#" xmlns:ns3="http://statistik.at/namespace/ur/stammdaten/4#">
+			<ns2:SearchRequestId>96c7ec50-275a-4e9d-86c6-84a710825a77</ns2:SearchRequestId>
+			<ns2:ResultInfo>
+				<ns2:FoundRecords>4</ns2:FoundRecords>
+				<ns2:ReturnedRecords>4</ns2:ReturnedRecords>
+			</ns2:ResultInfo>
+			<ns2:ResultRecords>
+				<ns2:ResultRecord id="1154410638">
+					<PersonenDaten>
+						<NichtNatuerlichePerson>
+							<Identification>
+								<Value>R012W1121</Value>
+								<Type>KUR</Type>
+								<ns3:TypeText>Kennziffer des Unternehmensregisters</ns3:TypeText>
+							</Identification>
+							<Identification>
+								<Value>034109k</Value>
+								<Type>FBN</Type>
+								<ns3:TypeText>Firmenbuchnummer</ns3:TypeText>
+							</Identification>
+							<Identification>
+								<Value>9110002967919</Value>
+								<Type>SEK</Type>
+								<ns3:TypeText>Sekundär ID</ns3:TypeText>
+							</Identification>
+							<VollerName>ams AG</VollerName>
+							<ns3:Rechtsform>
+								<ns3:ReForm>8</ns3:ReForm>
+								<ns3:ReFormText>AG</ns3:ReFormText>
+								<ns3:ReFormExtern>208</ns3:ReFormExtern>
+							</ns3:Rechtsform>
+						</NichtNatuerlichePerson>
+						<TypisiertePostAdresse>
+							<PostAdresse>
+								<Postleitzahl>8141</Postleitzahl>
+								<Ortschaft>Unterpremstätten</Ortschaft>
+								<Zustelladresse>
+									<Strassenname>Tobelbader Straße</Strassenname>
+									<Orientierungsnummer>30</Orientierungsnummer>
+								</Zustelladresse>
+							</PostAdresse>
+							<ns3:Typ>ZUSTELLADRESSE</ns3:Typ>
+						</TypisiertePostAdresse>
+					</PersonenDaten>
+				</ns2:ResultRecord>
+				<ns2:ResultRecord id="1157266070">
+					<PersonenDaten>
+						<NichtNatuerlichePerson>
+							<Identification>
+								<Value>R009Y717F</Value>
+								<Type>KUR</Type>
+								<ns3:TypeText>Kennziffer des Unternehmensregisters</ns3:TypeText>
+							</Identification>
+							<Identification>
+								<Value>111000k</Value>
+								<Type>FBN</Type>
+								<ns3:TypeText>Firmenbuchnummer</ns3:TypeText>
+							</Identification>
+							<Identification>
+								<Value>9110002954321</Value>
+								<Type>SEK</Type>
+								<ns3:TypeText>Sekundär ID</ns3:TypeText>
+							</Identification>
+							<VollerName>Austrian Airlines AG</VollerName>
+							<ns3:Rechtsform>
+								<ns3:ReForm>8</ns3:ReForm>
+								<ns3:ReFormText>AG</ns3:ReFormText>
+								<ns3:ReFormExtern>208</ns3:ReFormExtern>
+							</ns3:Rechtsform>
+						</NichtNatuerlichePerson>
+						<TypisiertePostAdresse>
+							<PostAdresse>
+								<Postleitzahl>1300</Postleitzahl>
+								<Ortschaft>Wien-Flughafen</Ortschaft>
+								<Zustelladresse>
+									<Strassenname>Office Park 2</Strassenname>
+								</Zustelladresse>
+							</PostAdresse>
+							<ns3:Typ>ZUSTELLADRESSE</ns3:Typ>
+						</TypisiertePostAdresse>
+					</PersonenDaten>
+				</ns2:ResultRecord>
+				<ns2:ResultRecord id="1167693946">
+					<PersonenDaten>
+						<NichtNatuerlichePerson>
+							<Identification>
+								<Value>R025H153A</Value>
+								<Type>KUR</Type>
+								<ns3:TypeText>Kennziffer des Unternehmensregisters</ns3:TypeText>
+							</Identification>
+							<Identification>
+								<Value>301642t</Value>
+								<Type>FBN</Type>
+								<ns3:TypeText>Firmenbuchnummer</ns3:TypeText>
+							</Identification>
+							<Identification>
+								<Value>9110002912345</Value>
+								<Type>SEK</Type>
+								<ns3:TypeText>Sekundär ID</ns3:TypeText>
+							</Identification>
+							<VollerName>Austrian Equities Industrie- beteiligungen AG</VollerName>
+							<Rechtsform>AG</Rechtsform>
+						</NichtNatuerlichePerson>
+						<TypisiertePostAdresse>
+							<PostAdresse>
+								<Postleitzahl>1010</Postleitzahl>
+								<Ortschaft>Wien</Ortschaft>
+								<Zustelladresse>
+									<Strassenname>Kohlmarkt</Strassenname>
+									<Orientierungsnummer>3</Orientierungsnummer>
+								</Zustelladresse>
+							</PostAdresse>
+							<ns3:Typ>ZUSTELLADRESSE</ns3:Typ>
+						</TypisiertePostAdresse>
+					</PersonenDaten>
+				</ns2:ResultRecord>
+				<ns2:ResultRecord id="1159462544">
+					<PersonenDaten>
+						<NichtNatuerlichePerson>
+							<Identification>
+								<Value>R015S386C</Value>
+								<Type>KUR</Type>
+								<ns3:TypeText>Kennziffer des Unternehmensregisters</ns3:TypeText>
+							</Identification>
+							<Identification>
+								<Value>177696v</Value>
+								<Type>FBN</Type>
+								<ns3:TypeText>Firmenbuchnummer</ns3:TypeText>
+							</Identification>
+							<Identification>
+								<Value>9110007968175</Value>
+								<Type>SEK</Type>
+								<ns3:TypeText>Sekundär ID</ns3:TypeText>
+							</Identification>
+							<VollerName>Austrian Power Grid AG</VollerName>
+							<Rechtsform>AG</Rechtsform>
+						</NichtNatuerlichePerson>
+						<TypisiertePostAdresse>
+							<PostAdresse>
+								<Postleitzahl>1220</Postleitzahl>
+								<Ortschaft>Wien</Ortschaft>
+								<Zustelladresse>
+									<Strassenname>Wagramer Straße</Strassenname>
+									<Orientierungsnummer>19</Orientierungsnummer>
+								</Zustelladresse>
+							</PostAdresse>
+							<ns3:Typ>ZUSTELLADRESSE</ns3:Typ>
+						</TypisiertePostAdresse>
+					</PersonenDaten>
+				</ns2:ResultRecord>
+			</ns2:ResultRecords>
+		</ns2:SearchResponse>
+	</soapenv:Body>
+</soapenv:Envelope>
diff --git a/src/main/resources/wsdl/ur_V5/schema/specific/urs-v5-CustomFault.xsd b/src/main/resources/wsdl/ur_V5/schema/specific/urs-v5-CustomFault.xsd
new file mode 100644
index 0000000..b30f2f7
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/schema/specific/urs-v5-CustomFault.xsd
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+	xmlns="http://reference.e-government.gv.at/namespace/xml-sw/1#" 
+	targetNamespace="http://reference.e-government.gv.at/namespace/xml-sw/1#">
+	
+  <xs:include schemaLocation="../urs-v5-xml-sw.xsd"/>
+
+  <xs:element name="XmlSwFault" type="CustomFaultType"/>
+  
+  <xs:element name="Message" type="CustomFaultType"/>
+
+  <xs:complexType name="CustomFaultType" final="extension">
+    <xs:annotation>
+      <xs:documentation>CustomFault reporting structure</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="Code" type="xs:integer"/>
+      <xs:element name="Reason" type="xs:string" maxOccurs="unbounded"/>
+      <xs:element name="Help" type="xs:string" minOccurs="0"/>
+      <xs:element ref="FaultHint" minOccurs="0" maxOccurs="unbounded"/>
+    
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>
diff --git a/src/main/resources/wsdl/ur_V5/schema/urs-v5-CustomFault.xsd b/src/main/resources/wsdl/ur_V5/schema/urs-v5-CustomFault.xsd
new file mode 100644
index 0000000..b30f2f7
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/schema/urs-v5-CustomFault.xsd
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+	xmlns="http://reference.e-government.gv.at/namespace/xml-sw/1#" 
+	targetNamespace="http://reference.e-government.gv.at/namespace/xml-sw/1#">
+	
+  <xs:include schemaLocation="../urs-v5-xml-sw.xsd"/>
+
+  <xs:element name="XmlSwFault" type="CustomFaultType"/>
+  
+  <xs:element name="Message" type="CustomFaultType"/>
+
+  <xs:complexType name="CustomFaultType" final="extension">
+    <xs:annotation>
+      <xs:documentation>CustomFault reporting structure</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="Code" type="xs:integer"/>
+      <xs:element name="Reason" type="xs:string" maxOccurs="unbounded"/>
+      <xs:element name="Help" type="xs:string" minOccurs="0"/>
+      <xs:element ref="FaultHint" minOccurs="0" maxOccurs="unbounded"/>
+    
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>
diff --git a/src/main/resources/wsdl/ur_V5/schema/urs-v5-PersonData.xsd b/src/main/resources/wsdl/ur_V5/schema/urs-v5-PersonData.xsd
new file mode 100644
index 0000000..0f38bd4
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/schema/urs-v5-PersonData.xsd
@@ -0,0 +1,510 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+	Header der Originaldatei:
+	Generisches Schema zum Speichern und Austauschen von Personendaten
+    (c) 2001-2002 Chief Information Office Austria, Stabsstelle IKT-Strategie des Bundes, BM֖LS
+    Kontakt: Peter Reichstädter (peter.reichstaedter@cio.gv.at), Arno Hollosi (arno.hollosi@cio.gv.at)
+    Die freie Verwendung dieses Schemas in Applikationen (behördenintern, kommerziell, privat) ist erlaubt und erwünscht.
+-->  
+<?xml-stylesheet type="text/xsl" href="getelementnames.xslt"?>
+
+<xs:schema targetNamespace="http://reference.e-government.gv.at/namespace/persondata/de/20040201#"
+	xmlns="http://reference.e-government.gv.at/namespace/persondata/de/20040201#" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:uri="http://statistik.at/namespace/ur/stammdaten/4#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"
+	elementFormDefault="qualified" attributeFormDefault="unqualified"
+	version="1.0.0">
+
+	<!-- Import der UR-basic -->
+	<xs:import namespace="http://statistik.at/namespace/ur/stammdaten/4#"
+		schemaLocation="urs-v5-suche.xsd" />
+
+
+	<xs:annotation>
+		<xs:documentation>This version of person deploys only global elements.
+			All types derived from abstract types have been replaced by
+			substitution groups</xs:documentation>
+	</xs:annotation>
+	<!-- ### signed structure of a person ### -->
+	<xs:element name="AbstractPersonData" type="AbstractPersonType">
+		<xs:annotation>
+			<xs:documentation>Abstraktes PersonenDaten Element, nur auf englisch
+				verfügbar, nicht direkt benützen sondern PersonenDaten benutzen
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<xs:element name="PersonenDaten" type="PersonenDatenTyp"
+		substitutionGroup="AbstractPersonData">
+		<xs:annotation>
+			<xs:documentation>Signierte Personendatenstruktur</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<!-- ### base type for person data ### -->
+	<xs:element name="Person" type="AbstractPersonType">
+		<xs:annotation>
+			<xs:documentation>Abstraktes Personen Element, nur auf englisch
+				verfügbar, nicht direkt benützen sondern NatuerlichePerson o.
+				NichtNatuerlichePerson benutzen</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+	<!-- ### physical person and corporate body ### -->
+	<xs:element name="NatuerlichePerson" type="NatuerlichePersonTyp"
+		substitutionGroup="Person">
+		<xs:annotation>
+			<xs:documentation>Natuerliche Person entspricht PhysicalPerson, ist
+				eine Ableitung von Person (abstract)</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<xs:element name="NichtNatuerlichePerson" type="NichtNatuerlichePersonTyp"
+		substitutionGroup="Person">
+		<xs:annotation>
+			<xs:documentation>NichtNatuerlichePerson entspricht CorporatzeBody,
+				ist Ableitung von Person (abstract)</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<!--### complex child elements of person, also available as standalone ### -->
+	<xs:element name="PersonenName" type="PersonenNameTyp">
+		<xs:annotation>
+			<xs:documentation>Container für diverse Namensbestandteile,
+				entspricht Name in der englischen Version</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+
+
+	<!-- ### adress data for various types of communications ### -->
+	<xs:element name="Address" type="AbstractAddressType">
+		<xs:annotation>
+			<xs:documentation>Abstraktes Address Element, nur auf Englisch
+				verfügbar, nicht direkt benützen sondern PostAdresse,
+				InternetAdresse, etc benutzen</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+	<xs:element name="PostAdresse" type="PostAdresseTyp"
+		substitutionGroup="Address">
+		<xs:annotation>
+			<xs:documentation>Post oder ZMR Adresse, entspricht PostalAddress,
+				ist Ableitung von Address (abstract)</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<xs:element name="TypisiertePostAdresse" type="TypisiertePostAdresseTyp"
+		substitutionGroup="Address">
+		<xs:annotation>
+			<xs:documentation>Typisierte Post oder ZMRAdresse, entspricht
+				TypedPostalAddress, ist Ableitung von Address (abstract)
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<!--### elements of simple type #### -->
+	<xs:element name="Geburtsdatum" type="GeburtsdatumTyp">
+		<xs:annotation>
+			<xs:documentation>Geburtsdatum, entspricht DateOfBirth
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+
+	<!--### Complex types ### -->
+
+
+	<!-- UR Spezialisierung des PersonenDatenTyp -->
+	<xs:complexType name="PersonenDatenTyp">
+		<xs:annotation>
+			<xs:documentation>Container um eine Person und ihre Adressen zu
+				speichern</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="AbstractPersonType">
+				<xs:sequence>
+					<!-- UR-Spezialisierung -->
+					<xs:element ref="NichtNatuerlichePerson" />
+
+					<!-- UR-Spezialisierung -->
+					<xs:element ref="TypisiertePostAdresse" minOccurs="0"
+						maxOccurs="unbounded" />
+
+					<xs:element name="Zusatzdaten" minOccurs="0">
+						<!-- UR Erweiterung: kein mixed Content bei den Zusatzdaten -->
+						<xs:complexType mixed="false">
+							<xs:sequence minOccurs="0">
+								<!-- Erweiterung UR -->
+								<xs:element ref="uri:AendDat" minOccurs="0"
+									maxOccurs="1" />
+								<xs:element ref="uri:Gesperrt" minOccurs="0"
+									maxOccurs="1" />
+								<xs:element ref="uri:Dubletten" minOccurs="0"
+									maxOccurs="1" />
+								<xs:element ref="uri:Bestandszeitraum" minOccurs="0"
+									maxOccurs="unbounded" />
+								<xs:element ref="uri:Taetigkeitszeitraum" minOccurs="0" 
+									maxOccurs="unbounded" />
+								<xs:element ref="uri:Bestandsnachweis" minOccurs="0"
+									maxOccurs="unbounded" />
+								<xs:element ref="uri:Vertretung" minOccurs="0"
+									maxOccurs="unbounded" />
+								<xs:element ref="uri:Rechtstatsachen" minOccurs="0"
+									maxOccurs="unbounded" />
+								<xs:element ref="uri:Branche" minOccurs="0"
+									maxOccurs="unbounded" />
+								<xs:element name="PersonenDaten" type="PersonenDatenZusatzdatenTyp"
+									minOccurs="0" maxOccurs="unbounded" />
+								<xs:element ref="uri:Vollzug" minOccurs="0"
+									maxOccurs="unbounded" />
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<!-- UR Spezialisierung für natürliche und nichtnatürliche Personen in den 
+		Zusatzdaten -->
+	<xs:complexType name="PersonenDatenZusatzdatenTyp">
+		<xs:annotation>
+			<xs:documentation>Container um eine Person und ihre Adressen zu
+				speichern</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="AbstractPersonType">
+				<xs:sequence>
+					<!-- UR-Spezialisierung -->
+					<xs:choice minOccurs="0">
+						<xs:element ref="NichtNatuerlichePerson" />
+						<xs:element ref="NatuerlichePerson" />
+					</xs:choice>
+					<!-- UR-Spezialisierung -->
+					<xs:element ref="TypisiertePostAdresse" minOccurs="0"
+						maxOccurs="unbounded" />
+
+				  <xs:element name="Zusatzdaten" type="ZusatzdatenPersonenTyp" minOccurs="0"/>
+
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<xs:complexType name="ZusatzdatenPersonenTyp">
+		
+							<xs:sequence>
+								<!-- Erweiterung UR -->
+								<xs:element ref="uri:EvbStatus" minOccurs="0"
+									maxOccurs="1" />
+								<xs:element ref="uri:Funktion" minOccurs="0"
+									maxOccurs="unbounded" />
+								<xs:element ref="uri:Rechtstatsachen" minOccurs="0"
+									maxOccurs="unbounded" />
+							</xs:sequence>
+					
+	</xs:complexType>
+
+
+	<xs:complexType name="IdentificationType">
+		<xs:annotation>
+			<xs:documentation>Container für beliebige Identifikationsmerkmale,
+				besteht aus Type und Value Unterelementen, aus technischen Gründen
+				nur auf Englisch verfügbar</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Value">
+				<xs:annotation>
+					<xs:documentation>actual value of the identifier.
+					</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:string">
+							<xs:attribute name="Id" type="xs:ID" use="optional" />
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Type" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>type of value (eg 'ZMR', 'SV-Nummer',
+						'Martrikelnummer', database identification, ...)
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+
+			<!-- Erweiterung UR -->
+			<xs:element ref="uri:TypeText" minOccurs="0" maxOccurs="1" />
+			<xs:element ref="uri:Beginn" minOccurs="0" maxOccurs="1" />
+			<xs:element ref="uri:Ende" minOccurs="0" maxOccurs="1" />
+
+		</xs:sequence>
+		<xs:attribute name="Id" type="xs:ID" use="optional" />
+	</xs:complexType>
+
+
+
+	<xs:complexType name="AbstractPersonType">
+		<xs:annotation>
+			<xs:documentation>main structure of person data</xs:documentation>
+		</xs:annotation>
+		<xs:choice minOccurs="0">
+			<xs:element name="Identification" type="IdentificationType"
+				minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>unique identification entities</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:choice>
+		<xs:attribute name="Id" type="xs:ID" use="optional" />
+	</xs:complexType>
+
+
+	<xs:complexType name="NatuerlichePersonTyp">
+		<xs:annotation>
+			<xs:documentation>entspricht PhysicalPersonType</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="AbstractPersonType">
+				<xs:sequence minOccurs="0">
+					<xs:element ref="PersonenName" minOccurs="0" />
+					<xs:element ref="Geburtsdatum" minOccurs="0" />
+				</xs:sequence>
+				<!-- Erweiterung UR -->
+				<xs:attributeGroup ref="uri:VollzugAttributes" />
+			</xs:extension>
+
+		</xs:complexContent>
+	</xs:complexType>
+
+
+
+
+	<xs:complexType name="NichtNatuerlichePersonTyp">
+		<xs:annotation>
+			<xs:documentation>entspricht CorporateBodyType</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="AbstractPersonType">
+				<xs:sequence minOccurs="0">
+					<xs:element name="VollerName" type="xs:token" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>name of corporate body (whole name)
+							</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+
+
+					<xs:element name="Rechtsform" type="xs:anyURI"
+						minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>type of company (eg AG, OHG, ...)
+							</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+
+
+					<!-- Erweiterung UR -->
+					<xs:element ref="uri:UntName" minOccurs="0" maxOccurs="unbounded" />
+					<xs:element ref="uri:Rechtsform" minOccurs="0"
+						maxOccurs="unbounded" />
+				</xs:sequence>
+				<!-- Erweiterung UR -->
+				<xs:attributeGroup ref="uri:VollzugAttributes" />
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+
+
+	<xs:complexType name="PersonenNameTyp">
+		<xs:annotation>
+			<xs:documentation>entspricht NameType</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Vorname" type="xs:string" minOccurs="1"
+				maxOccurs="1" />
+			<xs:element name="Familienname" minOccurs="1" maxOccurs="1">
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:string">
+							<xs:attribute name="primaer" default="undefiniert">
+								<xs:simpleType>
+									<xs:restriction base="xs:string">
+										<xs:enumeration value="wahr" />
+										<xs:enumeration value="falsch" />
+										<xs:enumeration value="undefiniert" />
+									</xs:restriction>
+								</xs:simpleType>
+							</xs:attribute>
+							<xs:attribute name="prefix" type="xs:string" />
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Affix" minOccurs="0" maxOccurs="unbounded">
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:string">
+							<xs:attribute name="typ" use="optional">
+								<xs:simpleType>
+									<xs:restriction base="xs:string">
+										<xs:enumeration value="akademischerGrad" />
+										<xs:enumeration value="Adelstitel" />
+										<xs:enumeration value="FamiliennamenAffix" />
+										<xs:enumeration value="Anrede" />
+										<xs:enumeration value="Generation" />
+										<xs:enumeration value="Qualifikation" />
+									</xs:restriction>
+								</xs:simpleType>
+							</xs:attribute>
+							<xs:attribute name="position" use="optional">
+								<xs:simpleType>
+									<xs:restriction base="xs:string">
+										<xs:enumeration value="prefix" />
+										<xs:enumeration value="suffix" />
+									</xs:restriction>
+								</xs:simpleType>
+							</xs:attribute>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+
+
+
+	<xs:complexType name="AbstractAddressType">
+		<xs:annotation>
+			<xs:documentation>Struktur des Abstrakten Address Elements
+			</xs:documentation>
+		</xs:annotation>
+
+		<xs:attribute name="Id" type="xs:ID" use="optional" />
+	</xs:complexType>
+
+
+
+	<xs:complexType name="TypisiertePostAdresseTyp">
+		<xs:annotation>
+			<xs:documentation>entspricht TypedPostalAddressType
+			</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="AbstractAddressType">
+				<xs:sequence minOccurs="0">
+					<xs:element ref="PostAdresse" />
+					<!-- Erweiterung UR -->
+					<xs:element ref="uri:Typ" minOccurs="1" maxOccurs="1" />
+				</xs:sequence>
+				<!-- Erweiterung UR -->
+				<xs:attributeGroup ref="uri:VollzugAttributes" />
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+
+	<xs:complexType name="PostAdresseTyp">
+		<xs:annotation>
+			<xs:documentation>entspricht PostalAddressType</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="AbstractAddressType">
+				<xs:sequence>
+					<xs:element name="Staatscode" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Staatencode, ISO Code oder internationaler Post
+								code, entspricht CountryCode</xs:documentation>
+						</xs:annotation>
+						<xs:simpleType>
+							<xs:restriction base="xs:string">
+								<xs:pattern value="[A-Z]{3}" />
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+					<xs:element name="Postleitzahl" type="xs:token"
+						minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>entspricht PostalCode</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+
+					<xs:element name="Gemeinde" type="xs:string" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>entspricht Municipality</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Gemeindekennziffer" minOccurs="0" />
+					<xs:element name="Ortschaft" type="xs:token" minOccurs="0" />
+					<xs:element name="Zustelladresse" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Zustelladresse oder ZMRAdresse, entspricht
+								DeliveryAddress</xs:documentation>
+						</xs:annotation>
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Strassenname" type="xs:string"
+									minOccurs="0">
+									<xs:annotation>
+										<xs:documentation>Bei Ortschaften ohne Straßenname steht hier
+											Ortschaftsname, entspricht StreetName</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+								<xs:element name="Orientierungsnummer" type="xs:string"
+									minOccurs="0">
+									<xs:annotation>
+										<xs:documentation>Hausnummer oder Konskriptionsnummer, z.B.
+											10, 124a, 78-80. Entpricht BuildingNumber</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+								<xs:element name="Nutzungseinheitlaufnummer" type="xs:string" minOccurs="0">
+									<xs:annotation>
+										<xs:documentation>zmr use only</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+								<xs:element name="AdressRegisterEintrag" minOccurs="0">
+									<xs:annotation>
+										<xs:documentation>Addressregister database keys used to identify Addresses</xs:documentation>
+									</xs:annotation>
+									<xs:complexType>
+										<xs:sequence>
+											<xs:element name="Adresscode" type="string7"/>
+											<xs:element name="Subcode" type="string3" minOccurs="0"/>
+											<xs:element name="Objektnummer" type="string7" minOccurs="0"/>
+										</xs:sequence>
+									</xs:complexType>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+
+
+	<!-- ### auxiliary types ### -->
+	<xs:simpleType name="GeburtsdatumTyp">
+		<xs:annotation>
+			<xs:documentation>einfacher Datentyp für Daten (union): Tag und/oder
+				Monta können ausgelassen werden, entspricht DayOfBirthType
+			</xs:documentation>
+		</xs:annotation>
+		<xs:union memberTypes="xs:date xs:gYearMonth xs:gYear" />
+	</xs:simpleType>
+
+	<!-- ### strings of defined maximum lenght for use with ZMR address #### -->
+	<xs:simpleType name="string3">
+		<xs:restriction base="xs:string">
+			<xs:maxLength value="3"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="string7">
+		<xs:restriction base="xs:string">
+			<xs:maxLength value="7"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+</xs:schema>
diff --git a/src/main/resources/wsdl/ur_V5/schema/urs-v5-basicTypes.xsd b/src/main/resources/wsdl/ur_V5/schema/urs-v5-basicTypes.xsd
new file mode 100644
index 0000000..e8661ca
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/schema/urs-v5-basicTypes.xsd
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsd:schema targetNamespace="http://statistik.at/namespace/ur/stammdaten/4#"
+	xmlns:std="http://statistik.at/namespace/ur/stammdaten/4#" 
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:st="http://statistik.at/namespace/ur/simpleTypes/2#"
+	elementFormDefault="qualified">
+ 
+	<xsd:import namespace="http://statistik.at/namespace/ur/simpleTypes/2#"
+		schemaLocation="urs-v5-simpleTypes.xsd" />
+	
+
+	<!--  Responseelemente -->
+
+	<xsd:attribute name="vollzugBeginn" type="xsd:IDREF" />
+	<xsd:attribute name="vollzugEnde" type="xsd:IDREF" />
+
+	<xsd:attributeGroup name="VollzugAttributes">
+		<xsd:attribute ref="std:vollzugBeginn" use="optional" />
+		<xsd:attribute ref="std:vollzugEnde"   use="optional"/>
+	</xsd:attributeGroup>
+
+	<xsd:element name="Beginn" type="std:QuellenType"/>
+	<xsd:element name="Ende" type="std:QuellenType"/>
+	<xsd:element name="Vollzug" type="std:Vollzug" />
+
+	<xsd:element name="TypeText" type="xsd:string" />
+	<xsd:element name="UntName" type="std:UntNameVollzug" />
+	<xsd:element name="Rechtsform" type="std:RechtsformVollzug" />
+	<xsd:element name="Bestandszeitraum" type="std:BestandszeitraumVollzug" />
+	<xsd:element name="Taetigkeitszeitraum" type="std:TaetigkeitszeitraumVollzug" />
+	<xsd:element name="Bestandsnachweis" type="std:BestandsnachweisVollzug" />
+	<xsd:element name="Vertretung" type="std:VertretungVollzug" />
+	<xsd:element name="Rechtstatsachen" type="std:RechtstatsachenVollzug" />
+	<xsd:element name="Funktion" type="std:FunktionVollzug" />
+	<xsd:element name="Branche" type="std:Branche" />
+	<xsd:element name="AendDat" type="xsd:dateTime" />
+	<xsd:element name="Gesperrt" type="xsd:boolean" />
+	<xsd:element name="Dubletten" type="std:Dubletten" />
+	
+	<xsd:element name="bpkWTUR" type="xsd:string" />
+	<xsd:element name="Typ" type="st:AdressTyp" />
+	<xsd:element name="EvbStatus" type="st:EvbStatusTyp" />
+
+	<xsd:complexType name="UntName" abstract="true">
+		<xsd:sequence>
+			<xsd:element name="VollerName" type="st:UntNameTyp"
+				minOccurs="1" maxOccurs="1" />	
+		</xsd:sequence>	
+	</xsd:complexType>
+	
+	
+	<xsd:complexType name="UntNameVollzug">
+		<xsd:complexContent>
+			<xsd:extension base="std:UntName">
+				<!-- Vollzug Attribute -->
+				<xsd:attributeGroup ref="std:VollzugAttributes" />	
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+		 
+	<xsd:complexType name="Rechtsform" abstract="true">
+		<xsd:sequence>
+			<xsd:element name="ReForm" type="st:RechtsformTyp"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="ReFormText" type="st:RechtsformTextTyp"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="ReFormExtern" type="st:RechtsformTyp"
+				minOccurs="1" maxOccurs="1" />
+			<xsd:element name="ReFormExternText" type="st:RechtsformTextTyp"
+				minOccurs="0" maxOccurs="1" />
+		</xsd:sequence>
+	</xsd:complexType>
+
+
+	<xsd:complexType name="RechtsformVollzug">
+		<xsd:complexContent>
+			<xsd:extension base="std:Rechtsform">
+				<!-- Vollzug Attribute -->
+				<xsd:attributeGroup ref="std:VollzugAttributes" />	
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+
+	<xsd:complexType name="Bestandszeitraum" abstract="true">
+		<xsd:sequence>
+			<xsd:element name="BestandVon" type="xsd:date"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="BestandBis" type="xsd:date"
+				minOccurs="0" maxOccurs="1" />
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="BestandszeitraumVollzug">
+		<xsd:complexContent>
+			<xsd:extension base="std:Bestandszeitraum">
+				<!-- Vollzug Attribute -->
+				<xsd:attributeGroup ref="std:VollzugAttributes" />	
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:complexType name="Taetigkeitszeitraum" abstract="true">
+		<xsd:sequence>
+			<xsd:element name="TaetigVon" type="xsd:date"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="TaetigBis" type="xsd:date"
+				minOccurs="0" maxOccurs="1" />
+		</xsd:sequence>
+	</xsd:complexType>
+	
+	<xsd:complexType name="TaetigkeitszeitraumVollzug">
+		<xsd:complexContent>
+			<xsd:extension base="std:Taetigkeitszeitraum">
+				<!-- Vollzug Attribute -->
+				<xsd:attributeGroup ref="std:VollzugAttributes" />	
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:complexType name="Bestandsnachweis" abstract="true">
+		<xsd:simpleContent>
+			<xsd:extension base="xsd:string">
+		</xsd:extension>
+		</xsd:simpleContent>
+	</xsd:complexType>
+
+	<xsd:complexType name="BestandsnachweisVollzug">
+		<xsd:complexContent>
+			<xsd:extension base="std:Bestandsnachweis">
+				<!-- Vollzug Attribute -->
+				<xsd:attributeGroup ref="std:VollzugAttributes" />	
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+
+	<xsd:complexType name="Vertretung" abstract="true">
+		<xsd:simpleContent>
+			<xsd:extension base="xsd:string">
+			</xsd:extension>
+		</xsd:simpleContent>
+	</xsd:complexType>
+
+	<xsd:complexType name="VertretungVollzug">
+		<xsd:complexContent>
+			<xsd:extension base="std:Vertretung">
+				<!-- Vollzug Attribute -->
+				<xsd:attributeGroup ref="std:VollzugAttributes" />	
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:complexType name="Rechtstatsachen" abstract="true">
+		<xsd:sequence>
+			<xsd:element name="RT_Nummer" type="st:RT_NummerTyp"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="RT_Code" type="st:RT_CodeTyp"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="RT_Text" type="xsd:string"
+				minOccurs="0" maxOccurs="1" />
+		</xsd:sequence>
+	</xsd:complexType>
+	
+	<xsd:complexType name="RechtstatsachenVollzug">
+		<xsd:complexContent>
+			<xsd:extension base="std:Rechtstatsachen">
+				<!-- Vollzug Attribute -->
+				<xsd:attributeGroup ref="std:VollzugAttributes" />	
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+
+	<xsd:complexType name="Vollzug">
+		<xsd:sequence>
+			<xsd:element name="Antrag"  type="std:VollzugElem" minOccurs="1" maxOccurs="1" />
+			<xsd:element name="Vollzug" type="std:VollzugElem" minOccurs="0" maxOccurs="1" />
+			<xsd:element name="Zurueckstellung" type="std:VollzugElem" minOccurs="0" maxOccurs="1" />
+		</xsd:sequence>
+		<xsd:attribute name="id" type="xsd:ID" use="required" />
+		<xsd:attribute name="nummer" type="xsd:integer" use="required" />
+		<xsd:attribute name="status" type="st:VollzugStatusTyp" use="required" />
+	</xsd:complexType>
+
+	<xsd:complexType name="VollzugElem">
+		<xsd:simpleContent>
+			<xsd:extension base="xsd:date">
+				<xsd:attribute name="quelle" type="st:QuelleTyp" use="required" />
+				<xsd:attribute name="quText" use="required" />
+			</xsd:extension>
+		</xsd:simpleContent>	
+	</xsd:complexType>
+
+	<xsd:complexType name="QuellenType">
+		<xsd:simpleContent>
+			<xsd:extension base="xsd:date">
+				<xsd:attribute name="quelle" type="st:QuelleTyp" use="required"/>
+				<xsd:attribute name="quText" use="required"/>
+			</xsd:extension>
+		</xsd:simpleContent>
+	</xsd:complexType>
+
+	<xsd:complexType name="Funktion" abstract="true">
+		<xsd:sequence>
+			<xsd:element name="FktName" type="st:FunktionTyp"
+				minOccurs="1" maxOccurs="1" />
+			<xsd:element name="FktNameText" type="st:FunktionTextTyp"
+				minOccurs="0" maxOccurs="1" />
+		</xsd:sequence>
+	</xsd:complexType>
+	
+	<xsd:complexType name="FunktionVollzug">
+		<xsd:complexContent>
+			<xsd:extension base="std:Funktion">
+				<xsd:sequence>
+					<xsd:element name="FktRegel" type="std:FktRegelTypVollzug"
+						minOccurs="0" maxOccurs="unbounded" />
+					<xsd:element name="Rechtstatsachen" type="std:RechtstatsachenVollzug"
+						minOccurs="0" maxOccurs="unbounded" />
+				</xsd:sequence>
+				<xsd:attributeGroup ref="std:VollzugAttributes" />	
+			</xsd:extension>
+					
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	
+	
+	<xsd:complexType name="FktRegelTyp" abstract="true">
+		<xsd:sequence>
+			<xsd:element name="FktRegelVon" type="xsd:date"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="FktRegelBis" type="xsd:date"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="FktRegelText" type="st:FktRegelTextTyp"
+				minOccurs="0" maxOccurs="1" />
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="FktRegelTypVollzug">
+		<xsd:complexContent>
+			<xsd:extension base="std:FktRegelTyp">
+				<!-- Vollzug Attribute -->
+				<xsd:attributeGroup ref="std:VollzugAttributes" />	
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+
+	<xsd:complexType name="Branche">
+		<xsd:sequence>
+			<xsd:element name="Oenace" type="std:OenaceType"
+				minOccurs="1" maxOccurs="1" />
+			<xsd:element name="OenaceText" type="xsd:string"
+				minOccurs="1" maxOccurs="1" />
+			<xsd:element name="Beginn" 				type="std:QuellenType" 	
+				minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="Ende" 				type="std:QuellenType" 	
+				minOccurs="0" maxOccurs="1"/>
+		</xsd:sequence>
+		<xsd:attribute name="art" type="st:OenaceArtTyp" use="required" />
+	</xsd:complexType>
+	
+
+	<xsd:complexType name="OenaceType">
+		<xsd:simpleContent>
+			<xsd:extension base="st:OenaceCodeTyp">
+				<xsd:attribute name="jahr" type="st:OenaceJahrTyp"
+					use="required" />
+			</xsd:extension>
+		</xsd:simpleContent>
+	</xsd:complexType>
+	
+	<xsd:complexType name="Dubletten">
+		<xsd:sequence>
+			<xsd:element name="art" type="st:ArtDublette" />
+			<xsd:element name="kurMaster" minOccurs="0" type="st:KurTyp" />
+			<xsd:element name="kurSlave"  minOccurs="0" maxOccurs="unbounded" type="st:KurTyp"/>
+		</xsd:sequence>
+	</xsd:complexType>
+
+
+	
+
+
+</xsd:schema>
diff --git a/src/main/resources/wsdl/ur_V5/schema/urs-v5-simpleTypes.xsd b/src/main/resources/wsdl/ur_V5/schema/urs-v5-simpleTypes.xsd
new file mode 100644
index 0000000..ecc7499
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/schema/urs-v5-simpleTypes.xsd
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<schema targetNamespace="http://statistik.at/namespace/ur/simpleTypes/2#" 
+	version="1.0" xmlns:tns="http://statistik.at/namespace/ur/simpleTypes/2#" 
+	xmlns="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified">
+
+	<!-- ******************************************************************************* -->
+	<!-- Allegemeine Typen                                                               -->
+	<!-- ******************************************************************************* -->
+	
+		<simpleType name="VersionTyp">
+		<annotation>
+			<documentation>
+				Versionsnummer
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<maxLength value="10" />
+		</restriction>
+	</simpleType>
+
+		<simpleType name="QuelleTyp">
+		<annotation>
+			<documentation>
+				Identifikationsnummer eines Quellregisters
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<maxLength value="10" />
+		</restriction>
+	</simpleType>
+	
+		<simpleType name="VollzugStatusTyp">
+		<annotation>
+			<documentation>
+				Status des Vollzugsobjektes
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<enumeration value="A" />
+			<enumeration value="V" />
+			<enumeration value="Z" />
+		</restriction>
+	</simpleType>
+
+		<simpleType name="ErgebnisVollzugStatusTyp">
+		<annotation>
+			<documentation>
+				Im Ergebnis berücksichtigte Status des Vollzugsobjektes
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<enumeration value="V" />
+			<enumeration value="AZV" />
+		</restriction>
+	</simpleType>
+
+<!-- 
+	<simpleType name="AktionTyp">
+		<annotation>
+			<documentation>
+				Unterscheidung zwischen zu beendenden und neu anzulegenden Merkmalsgruppen
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<enumeration value="NEU" />
+			<enumeration value="ALT" />
+		</restriction>
+	</simpleType>
+ -->
+
+	<!-- ******************************************************************************* -->
+	<!-- Typen für Unternehmensmerkmale                                                  -->
+	<!-- ******************************************************************************* -->
+	
+	<simpleType name="KurTyp">
+		<annotation>
+			<documentation>
+				UR Kennziffer eines Unternehmens
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<pattern value="R[0-9]{3}[A-Z][0-9]{3}[A-Z0-9]"/>
+			<length value="9"/>
+		</restriction>
+	</simpleType>
+
+	<simpleType name="FbnTyp">
+		<annotation>
+			<documentation>
+				Firmenbuchnummer
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<pattern value="[0-9]{6}[a-z]"/>
+			<length value="7"/>
+		</restriction>
+	</simpleType>
+
+	<simpleType name="ZvrTyp">
+		<annotation>
+			<documentation>
+				Vereinsregisternummer
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<pattern value="[0-9]{9}"/>
+			<length value="9"/>
+		</restriction>
+	</simpleType>
+
+	<simpleType name="ErjTyp">
+		<annotation>
+			<documentation>
+				Ordnungsnummer aus dem ERsB
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<pattern value="[0-9]{13}"/>
+			<length value="13"/>
+		</restriction>
+	</simpleType>
+
+	<simpleType name="SekTyp">
+		<annotation>
+			<documentation>
+				Sekundär ID
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<pattern value="[0-9]{13}"/>
+			<length value="13"/>
+		</restriction>
+	</simpleType>
+
+	<simpleType name="UntNameTyp">
+		<annotation>
+			<documentation>
+				Bezeichnung eines Unternehmens
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<maxLength value="255" />
+		</restriction>
+	</simpleType>
+	
+	<simpleType name="BpkTyp">
+		<annotation>
+			<documentation>
+				unverschlüsseltes bPK
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<maxLength value="28" />
+		</restriction>
+	</simpleType>
+	
+	<simpleType name="BpkEncodedTyp">
+		<annotation>
+			<documentation>
+				verschlüsseltes bPK (base64 codiert)
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<maxLength value="172" />
+		</restriction>
+	</simpleType>
+	
+	<simpleType name="RechtsformTyp">
+		<annotation>
+			<documentation>
+				Rechtsformcode eines Unternehmens
+			</documentation>
+		</annotation>
+		<restriction base="integer">
+			<minInclusive value="0" />
+			<maxInclusive value="9999" />
+		</restriction>
+	</simpleType>
+	
+	<simpleType name="RechtsformTextTyp">
+		<annotation>
+			<documentation>
+				Langtext der Rechtsform eines Unternehmens
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<maxLength value="100" />
+		</restriction>
+	</simpleType>
+
+	<simpleType name="IdArtTyp">
+		<annotation>
+			<documentation>
+				Art eines externen Schlüssels
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<length value="3" />
+		</restriction>
+	</simpleType>
+
+	<simpleType name="IdTyp">
+		<annotation>
+			<documentation>
+				Wert eines externen Schlüssels
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<maxLength value="60" />
+		</restriction>
+	</simpleType>
+	
+	<simpleType name="OenaceJahrTyp">
+		<annotation>
+			<documentation>
+				Jahr des ֖NACE-Systems
+			</documentation>
+		</annotation>
+		<restriction base="integer">
+			<enumeration value="2008" />
+			<minInclusive value="1000" />
+			<maxInclusive value="9999" />
+		</restriction>
+	</simpleType>
+
+	<simpleType name="OenaceCodeTyp">
+		<annotation>
+			<documentation>
+				֖NACE - Branchenkennzahl
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<maxLength value="10" />
+		</restriction>
+	</simpleType>
+
+	<simpleType name="OenaceArtTyp">
+		<annotation>
+			<documentation>
+				Art der ֖NACE (Haupt-/Nebentätigkeit)
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<enumeration value="H" />
+			<enumeration value="N" />
+		</restriction>
+	</simpleType>
+	
+	<simpleType name="RT_NummerTyp">
+		<annotation>
+			<documentation>
+				Rechtstatsachen-Nummer
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<maxLength value="3" />
+		</restriction>
+	</simpleType>
+		
+	<simpleType name="RT_CodeTyp">
+		<annotation>
+			<documentation>
+				Rechtstatsachen-Code
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<maxLength value="4" />
+		</restriction>
+	</simpleType>
+		
+	<!-- ******************************************************************************* -->
+	<!-- Typen für Adressmerkmale                                                        -->
+	<!-- ******************************************************************************* -->
+	
+	<simpleType name="StrasseTyp">
+		<annotation>
+			<documentation>
+				Strassenname
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<maxLength value="100" />
+		</restriction>
+	</simpleType>
+	
+	<simpleType name="HNrTyp">
+		<annotation>
+			<documentation>
+				Hausnummer
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<maxLength value="100" />
+		</restriction>
+	</simpleType>
+	
+	<simpleType name="PlzTyp">
+		<annotation>
+			<documentation>
+				Postleitzahl
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<maxLength value="10" />
+		</restriction>
+	</simpleType>
+	
+	<simpleType name="OrtTyp">
+		<annotation>
+			<documentation>
+				Ortsname
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<maxLength value="50" />
+		</restriction>
+	</simpleType>
+	
+	<simpleType name="GemnrTyp">
+		<annotation>
+			<documentation>
+				Gemeindekennziffer
+			</documentation>
+		</annotation>
+		<restriction base="integer">
+			<minInclusive value="10000" />
+			<maxInclusive value="99999" />
+		</restriction>
+	</simpleType>
+	
+	<simpleType name="LandTyp">
+		<annotation>
+			<documentation>
+				Landescode gem. ISO 3166 ALPHA-3
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<length value="3" />
+		</restriction>
+	</simpleType>
+		
+	<simpleType name="AdressTyp">
+		<annotation>
+			<documentation>
+				AdressTyp
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<enumeration value="SITZ"/>
+			<enumeration value="ZUSTELLADRESSE"/>
+		</restriction>
+	</simpleType>
+	
+	<!-- ******************************************************************************* -->
+	<!-- Typen für Personenmerkmale                                                      -->
+	<!-- ******************************************************************************* -->
+	
+	<simpleType name="NachnameTyp">
+		<annotation>
+			<documentation>
+				Nachname der vertretungsbefugten Person
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<maxLength value="100" />
+		</restriction>
+	</simpleType>
+	
+	<simpleType name="VornameTyp">
+		<annotation>
+			<documentation>
+				Vorname der vertretungsbefugten Person
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<maxLength value="100" />
+		</restriction>
+	</simpleType>
+	
+	<simpleType name="TitelTyp">
+		<annotation>
+			<documentation>
+				Titel der vertretungsbefugten Person
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<maxLength value="50" />
+		</restriction>
+	</simpleType>
+	
+	<simpleType name="FunktionTyp">
+		<annotation>
+			<documentation>
+				Funktionscode der vertretungsbefugten Person
+			</documentation>
+		</annotation>
+		<restriction base="integer">
+			<minInclusive value="0" />
+			<maxInclusive value="9999" />
+		</restriction>
+	</simpleType>
+	
+	<simpleType name="FunktionTextTyp">
+		<annotation>
+			<documentation>
+				Funktionsbezeichnung der vertretungsbefugten Person
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<maxLength value="100" />
+		</restriction>
+	</simpleType>
+
+	<simpleType name="FktRegelTextTyp">
+		<annotation>
+			<documentation>
+				Funktionsregeltext für vertretungsbefugte Person
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<maxLength value="2000" />
+		</restriction>
+	</simpleType>
+
+
+	<simpleType name="VertretungsbefugnisTyp">
+		<annotation>
+			<documentation>
+				Art der Vertretungsbefugnis
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<maxLength value="40" />
+		</restriction>
+	</simpleType>
+	
+	<simpleType name="EvbStatusTyp">
+		<annotation>
+			<documentation>
+				Einzelvertretungsbefugnis
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<enumeration value="J" />
+			<enumeration value="N" />
+			<enumeration value="U" />		
+		</restriction>
+	</simpleType>
+	
+	<simpleType name="ArtDublette">
+		<annotation>
+			<documentation>
+				ArtDublette
+			</documentation>
+		</annotation>
+		<restriction base="string">
+			<enumeration value="M"/>
+			<enumeration value="S"/>
+		</restriction>
+	</simpleType>
+	
+</schema>
\ No newline at end of file
diff --git a/src/main/resources/wsdl/ur_V5/schema/urs-v5-suche.xsd b/src/main/resources/wsdl/ur_V5/schema/urs-v5-suche.xsd
new file mode 100644
index 0000000..880251c
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/schema/urs-v5-suche.xsd
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsd:schema targetNamespace="http://statistik.at/namespace/ur/stammdaten/4#"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:st="http://statistik.at/namespace/ur/simpleTypes/2#"
+	xmlns:std="http://statistik.at/namespace/ur/stammdaten/4#" 
+	elementFormDefault="qualified">
+
+	<xsd:import namespace="http://statistik.at/namespace/ur/simpleTypes/2#"
+		schemaLocation="urs-v5-simpleTypes.xsd" />
+
+	<xsd:include schemaLocation="urs-v5-basicTypes.xsd" />
+
+
+	<!-- Requestobjekte -->
+
+	<xsd:element name="SucheUnternehmenRequest" type="std:SucheUnternehmenRequest">
+		<xsd:annotation>
+			<xsd:documentation>
+				Suche nach Unternehmen durch Angabe von
+				Suchkriterien
+	</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+
+
+	<xsd:complexType name="SucheUnternehmenRequest">
+		<xsd:sequence>
+			<xsd:element name="version" type="st:VersionTyp"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="unternehmensdaten" type="std:SucheUnternehmensdaten"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="branche" type="std:SucheBranche"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="personendaten" type="std:SuchePersonendaten"
+				minOccurs="0" maxOccurs="1" />
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="SucheUnternehmensdaten">
+		<xsd:sequence>
+			<xsd:element name="phonetisch" type="xsd:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="untName" type="st:UntNameTyp"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="rechtsform" type="st:RechtsformTyp"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="id" type="st:IdTyp" minOccurs="0"
+				maxOccurs="1" />
+			<xsd:element name="idArt" type="st:IdArtTyp" minOccurs="0"
+				maxOccurs="1" />
+			<xsd:element name="strasse" type="st:StrasseTyp"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="hNr" type="st:HNrTyp" minOccurs="0"
+				maxOccurs="1" />
+			<xsd:element name="ort" type="st:OrtTyp" minOccurs="0"
+				maxOccurs="1" />
+			<xsd:element name="gemnr" type="st:GemnrTyp" minOccurs="0"
+				maxOccurs="1" />
+			<xsd:element name="plz" type="st:PlzTyp" minOccurs="0"
+				maxOccurs="1" />
+			<xsd:element name="land" type="st:LandTyp" minOccurs="0"
+				maxOccurs="1" />
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="SucheBranche">
+		<xsd:sequence>
+			<xsd:element name="oenaceJahr" type="st:OenaceJahrTyp"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="oenaceCode" type="st:OenaceCodeTyp"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="oenaceArt" type="st:OenaceArtTyp"
+				minOccurs="0" maxOccurs="1" />
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="SuchePersonendaten">
+		<xsd:sequence>
+			<xsd:element name="phonetisch" type="xsd:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="nachname" type="st:NachnameTyp"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="vorname" type="st:VornameTyp"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="gebDatum" type="xsd:date" minOccurs="0"
+				maxOccurs="1" />
+			<xsd:element name="strasse" type="st:StrasseTyp"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="hNr" type="st:HNrTyp" minOccurs="0"
+				maxOccurs="1" />
+			<xsd:element name="ort" type="st:OrtTyp" minOccurs="0"
+				maxOccurs="1" />
+			<xsd:element name="gemnr" type="st:GemnrTyp" minOccurs="0"
+				maxOccurs="1" />
+			<xsd:element name="plz" type="st:PlzTyp" minOccurs="0"
+				maxOccurs="1" />
+			<xsd:element name="land" type="st:LandTyp" minOccurs="0"
+				maxOccurs="1" />
+			<xsd:element name="stammzahl" type="st:IdTyp" minOccurs="0" 
+				maxOccurs="1" />
+			<xsd:element name="stammregister" type="st:IdArtTyp" minOccurs="0" 
+				maxOccurs="1" />
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:element name="SucheUnternehmenNachIdsRequest" type="std:SucheUnternehmenNachIdsRequest">
+		<xsd:annotation>
+			<xsd:documentation>
+				Stammdatenabfrage für Unternehmen durch Angabe
+				einer oder mehrerer UR Kennziffern
+			</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+
+	<xsd:complexType name="SucheUnternehmenNachIdsRequest">
+		<xsd:sequence>
+			<xsd:element name="version" type="st:VersionTyp"
+				minOccurs="0" maxOccurs="1" />
+				<xsd:element name="kur" type="st:KurTyp" 
+					minOccurs="0" maxOccurs="unbounded" />
+				<xsd:element name="fbn" type="st:FbnTyp" 
+					minOccurs="0" maxOccurs="unbounded" />
+				<xsd:element name="zvr" type="st:ZvrTyp" 
+					minOccurs="0" maxOccurs="unbounded" />
+				<xsd:element name="erj" type="st:ErjTyp" 
+					minOccurs="0" maxOccurs="unbounded" />
+				<xsd:element name="sek" type="st:SekTyp" 
+					minOccurs="0" maxOccurs="unbounded" />
+				<xsd:element name="mitHistorie" type="xsd:boolean" default="false"
+					minOccurs="0" maxOccurs="1" />
+			<xsd:element name="vollzugStatus" type="st:ErgebnisVollzugStatusTyp"
+				minOccurs="0" maxOccurs="1" />
+		</xsd:sequence>
+	</xsd:complexType>
+
+
+	<xsd:element name="SucheUnternehmenNachIdRequest" type="std:SucheUnternehmenNachIdRequest">
+		<xsd:annotation>
+			<xsd:documentation>
+				Stammdatenabfrage für einzelnes Unternehmen -
+				optional mit Stichtag und / oder Historie
+			</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+
+	<xsd:complexType name="SucheUnternehmenNachIdRequest">
+		<xsd:sequence>
+			<xsd:element name="version" type="st:VersionTyp"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:choice>
+				<xsd:element name="kur" type="st:KurTyp" />
+				<xsd:element name="fbn" type="st:FbnTyp" />
+				<xsd:element name="zvr" type="st:ZvrTyp" />
+				<xsd:element name="erj" type="st:ErjTyp" />
+				<xsd:element name="sek" type="st:SekTyp" />
+			</xsd:choice>
+			<xsd:element name="URV_pdf" type="xsd:boolean" minOccurs="0"
+				maxOccurs="1" default="false" />
+			<xsd:element name="stichtag" type="xsd:date" minOccurs="0"
+				maxOccurs="1" />
+			<xsd:element name="mitHistorie" type="xsd:boolean" default="false"
+				maxOccurs="1" />
+			<xsd:element name="vollzugStatus" type="st:ErgebnisVollzugStatusTyp"
+				minOccurs="0" maxOccurs="1" />
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:element name="SucheUnternehmenNachBpkRequest" type="std:SucheUnternehmenNachBpkRequest">
+		<xsd:annotation>
+			<xsd:documentation>
+				Suche nach Vertretungsbefugnissen von Personen in
+				Unternehmen mithilfe
+				des unverschlüsselten WT-UR bPK
+			</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+
+	<xsd:complexType name="SucheUnternehmenNachBpkRequest">
+		<xsd:sequence>
+			<xsd:element name="version" type="st:VersionTyp"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:choice>
+				<xsd:element name="bpkWTUR" type="st:BpkTyp" minOccurs="1"
+					maxOccurs="1" />
+				<xsd:element name="bpkWTUREncoded" type="st:BpkEncodedTyp"
+					minOccurs="1" maxOccurs="1" />
+			</xsd:choice>
+			<xsd:element name="nurAktive" type="xsd:boolean"
+				minOccurs="0" maxOccurs="1" />
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:element name="SucheUnternehmenNachAendDatRequest"
+		type="std:SucheUnternehmenNachAendDatRequest">
+		<xsd:annotation>
+			<xsd:documentation>
+				Suche nach geänderten Unternehmen
+			</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+
+	<xsd:complexType name="SucheUnternehmenNachAendDatRequest">
+		<xsd:sequence>
+			<xsd:element name="version" type="st:VersionTyp"
+				minOccurs="0" maxOccurs="1" />
+			<xsd:element name="aendDat" type="xsd:date" minOccurs="1"
+				maxOccurs="1" />
+		</xsd:sequence>
+	</xsd:complexType>
+	
+	
+	<xsd:element name="ErsbAttribute" type="xsd:boolean" default="false"/>
+	
+	<xsd:element name="URV_pdf" type="xsd:base64Binary" />
+	
+</xsd:schema>
+	
\ No newline at end of file
diff --git a/src/main/resources/wsdl/ur_V5/schema/urs-v5-xml-sw.xsd b/src/main/resources/wsdl/ur_V5/schema/urs-v5-xml-sw.xsd
new file mode 100644
index 0000000..00a3555
--- /dev/null
+++ b/src/main/resources/wsdl/ur_V5/schema/urs-v5-xml-sw.xsd
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Header der Originaldatei:
+
+****************************************************
+
+File      xml-sw.xsd
+
+Version   1.0 / 23.03.2004
+
+Author    Franz-Josef Herpers / fjh consulting
+
+Copyright (c) 2004, 2005 Bundeskanzleramt ֖sterreich
+
+****************************************************
+
+-->
+<xs:schema targetNamespace="http://reference.e-government.gv.at/namespace/xml-sw/1#"
+ xmlns="http://reference.e-government.gv.at/namespace/xml-sw/1#" 
+ xmlns:urs="http://statistik.at/namespace/ur/stammdaten/4#"
+ xmlns:pd="http://reference.e-government.gv.at/namespace/persondata/de/20040201#"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.0">
+  
+  <xs:include schemaLocation="specific/urs-v5-CustomFault.xsd"/>
+  
+   <xs:import 
+  	namespace="http://statistik.at/namespace/ur/stammdaten/4#" 
+  	schemaLocation="urs-v5-suche.xsd" />
+   <xs:import 
+  	namespace="http://reference.e-government.gv.at/namespace/persondata/de/20040201#" 
+  	schemaLocation="urs-v5-PersonData.xsd" />
+  
+  
+  <!-- Element Declarations (complex) -->
+  <xs:element name="SearchByExample" type="SearchByExampleType">
+    <xs:annotation>
+      <xs:documentation>Wurzelelement für Suchabfragen vom Typ "Search by Example"</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="SearchById" type="SearchByIdType">
+    <xs:annotation>
+      <xs:documentation>Wurzelelement für Suchabfragen vom Typ "Search by Id"  </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="SearchRequestId" type="xs:string">
+    <xs:annotation>
+      <xs:documentation>Eindeutige ID zur Identifikation des Request bei asynchroner Kommunikation</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="SearchRequestInfo" type="SearchRequestInfoType">
+    <xs:annotation>
+      <xs:documentation>Container für alle Metainformationen einer Suchanfrage</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="SortKeys" type="SortKeysType">
+    <xs:annotation>
+      <xs:documentation>Ermöglicht die Angabe von Schlüsseln, nach denen die Ergebnismenge sortiert sein soll.</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="SearchResponse" type="SearchResponseType">
+    <xs:annotation>
+      <xs:documentation>Wurzelelement für das Ergebnis einer Suchanfrage</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="ResultInfo" type="ResultInfoType">
+    <xs:annotation>
+      <xs:documentation>Metainfos zur Ergebnismenge</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="RecordId" type="xs:nonNegativeInteger">
+    <xs:annotation>
+      <xs:documentation>ID eines Datensatzes. Sie muss übereinstimmen mit der ID eines Datensatzes (Wert des id-Attributs eines ResultRecord-Elements), den der Server in einem vorhergehenden Request zurückgeliefert hat.</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="ResultRecords">
+    <xs:annotation>
+      <xs:documentation>Container-Element für die zurückgegebene Ergebnissätze  </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="ResultRecord" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="SearchCriteria" type="SearchCriteriaType">
+    <xs:annotation>
+      <xs:documentation>Container-Element für die Suchkriterien. Diese sind applikationsspezifisch. Zulässig sind daher beliebige Elemente aus anderen Namensräumen. Optional kann eine ResultSetId übermittelt werden, falls der Server das Vorhalten von vorherigen Abfrageergebnissen unterstützt und in der initialen Response eine ResultSetId mitgesendet hat.</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="ResultCriteria" type="ResultCriteriaType">
+    <xs:annotation>
+      <xs:documentation>Fasst verschiedene Kriterien zur Behandlung und Auslieferung der gefundenen Ergebnissätze zusammen. Eigene können hinzugefügt werden.</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="SortKey" type="SortKeyType">
+    <xs:annotation>
+      <xs:documentation>Repräsentiert einen Sortierschlüssel. Die Reihenfolge der einzelnen Schlüssel bestimmt die Sortiergewichtung.</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="ExtraResultCriteria">
+    <xs:annotation>
+      <xs:documentation>Dient als Erweiterungspunkt. Container für weitere selbst definierte Ergebniskriterien. Server, die hier aufgeführte Kriterien nicht unterstützen, können diese schweigend ignorieren.</xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="false">
+      <xs:sequence>
+       	<xs:element minOccurs="0" maxOccurs="1" ref="urs:ErsbAttribute" />
+       </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="ExtraResultInfo">
+    <xs:annotation>
+      <xs:documentation>Dient als Erqeiterungspunkt. Container für weitere selbst definierte Ergebnisinformationen.</xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="false">
+      <xs:sequence>    
+       <!-- 
+        <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+      -->
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="ResultRecord">
+    <xs:annotation>
+      <xs:documentation> Container-Element für einen Ergebnissatz</xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:sequence>
+         <!-- Erweiterung UR -->
+	   	 <xs:element ref="pd:PersonenDaten" />
+		 <xs:element ref="urs:URV_pdf" minOccurs="0" maxOccurs="1"/>
+		  
+		  
+      </xs:sequence>
+      <xs:attribute name="id" type="xs:nonNegativeInteger" use="optional"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="PaymentInfo" type="PaymentInfoType">
+    <xs:annotation>
+      <xs:documentation>Container-Element für Zahlungs- und  Verrechnungsinformationen bei kostenpflichtigen Suchanfragen</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="RecordFieldList">
+    <xs:annotation>
+      <xs:documentation>Hier kann auf implementierungsspezifische Weise  angegeben werden, welche Elemente in der Antwort enthalten sein sollen.</xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:sequence>
+      <!-- 
+        <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+      -->
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <!-- Element Declarations (simple) -->
+  <xs:element name="Detail" type="xs:string">
+    <xs:annotation>
+      <xs:documentation>Dient der Angabe zusätzlicher Detailinformationen</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="TimeOut" type="xs:nonNegativeInteger">
+    <xs:annotation>
+      <xs:documentation>Zeit, die der Server die Ergebnismenge vorhalten soll</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="MaxRecords" type="xs:nonNegativeInteger">
+    <xs:annotation>
+      <xs:documentation>Maximale Anzahl gewünschter Ergebnissätze </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="StartRecord" type="xs:nonNegativeInteger">
+    <xs:annotation>
+      <xs:documentation>Position des ersten gewünschten Ergebnissatzes in der Ergebnismenge. In Kombination mit MaxRecords erlaubt dies dem Client, das Ergebnis "portionsweise" abzurufen.</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="Path" type="xs:string">
+    <xs:annotation>
+      <xs:documentation>Ein XPath-Ausdruck, der angibt, nach welchem Element der  Ergebnissätze die Ergebnismenge sortiert sein soll. </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="Ascending" type="xs:boolean">
+    <xs:annotation>
+      <xs:documentation>Gibt die Sortierrichtung an. false bedeutet absteigend, true aufsteigend.</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="CaseSensitive" type="xs:boolean">
+    <xs:annotation>
+      <xs:documentation>Gibt an, ob Groß- und Kleinschreibung mit berücksichtigt werden soll bei der Sortierung.</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="ResultSetId" type="xs:string">
+    <xs:annotation>
+      <xs:documentation>Eindeutige ID, die eine gecachte Ergebnismenge auf dem Server referenziert. Server, die ein solches Szenario unterstützen, können diese ID im Ergebnis ausliefern.</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="FoundRecords" type="xs:nonNegativeInteger">
+    <xs:annotation>
+      <xs:documentation>Anzahl der gefundenen Ergebnissätze</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="ReturnedRecords" type="xs:nonNegativeInteger">
+    <xs:annotation>
+      <xs:documentation> Anzahl der tatsächlich an den Client zurückgelieferten Ergebnissätze</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="Costs" type="xs:float">
+    <xs:annotation>
+      <xs:documentation>Die Kosten der Anfrage in Euro</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="InvoiceId" type="xs:string">
+    <xs:annotation>
+      <xs:documentation>Eine optionale Verrechnungs-ID wie z.B. die Geschäftszahl</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="AccountedUnits" type="xs:nonNegativeInteger">
+    <xs:annotation>
+      <xs:documentation>Anzahl zu verrechnender Einheiten. Diese muss nicht gleich der Anzahl der ausgelieferten Datensätze sein.</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="TimeStamp" type="xs:dateTime">
+    <xs:annotation>
+      <xs:documentation>Der Timestamp des Servers</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="FaultHint" type="xs:string">
+    <xs:annotation>
+      <xs:documentation>Wrapper-Element zur Aufnahme von Detail-Text der Message Codes im SOAP-detail-Element</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <!-- Complex Types -->
+  <xs:complexType name="SearchByExampleType">
+    <xs:sequence>
+      <xs:element ref="SearchRequestId"/>
+      <xs:element ref="SearchRequestInfo" minOccurs="0"/>
+      <xs:element ref="ResultCriteria" minOccurs="0"/>
+      <xs:element ref="SearchCriteria"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="SearchByIdType">
+    <xs:sequence>
+      <xs:element ref="SearchRequestId"/>
+      <xs:element ref="SearchRequestInfo" minOccurs="0"/>
+      <xs:element ref="RecordId"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="ResultInfoType">
+    <xs:sequence>
+      <xs:element ref="ResultSetId" minOccurs="0"/>
+      <xs:element ref="FoundRecords" minOccurs="0"/>
+      <xs:element ref="ReturnedRecords"/>
+      <xs:element ref="PaymentInfo" minOccurs="0"/>
+      <xs:element ref="ExtraResultInfo" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="SearchResponseType">
+    <xs:sequence>
+      <xs:element ref="SearchRequestId"/>
+      <xs:element ref="Message" minOccurs="0"/>
+      <xs:element ref="ResultInfo"/>
+      <xs:element ref="ResultRecords" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="SearchRequestInfoType">
+    <xs:sequence>
+   <!--  
+      <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+   -->
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="SortKeyType">
+    <xs:sequence>
+      <xs:element ref="Path"/>
+      <xs:element ref="Ascending" minOccurs="0"/>
+      <xs:element ref="CaseSensitive" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="ResultCriteriaType">
+    <xs:sequence>
+      <xs:element ref="MaxRecords" minOccurs="0"/>
+      <xs:element ref="StartRecord" minOccurs="0"/>
+      <xs:element ref="SortKeys" minOccurs="0"/>
+      <xs:element ref="TimeOut" minOccurs="0"/>
+      <xs:element ref="RecordFieldList" minOccurs="0"/>
+      <xs:element ref="ExtraResultCriteria" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="SearchCriteriaType">
+    <xs:sequence>
+      <xs:element ref="ResultSetId" minOccurs="0"/>
+      <!-- Erweiterung UR -->
+   	  <xs:choice>
+	   	  <xs:element ref="urs:SucheUnternehmenNachAendDatRequest" />
+	   	  <xs:element ref="urs:SucheUnternehmenNachBpkRequest" />
+	   	  <xs:element ref="urs:SucheUnternehmenNachIdRequest" />
+	   	  <xs:element ref="urs:SucheUnternehmenNachIdsRequest" />
+	   	  <xs:element ref="urs:SucheUnternehmenRequest" />
+   	  </xs:choice> 
+    
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="SortKeysType">
+    <xs:sequence>
+      <xs:element ref="SortKey" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="PaymentInfoType">
+    <xs:sequence>
+      <xs:element ref="InvoiceId" minOccurs="0"/>
+      <xs:element ref="Costs"/>
+      <xs:element ref="AccountedUnits" minOccurs="0"/>
+      <xs:element ref="TimeStamp"/>
+     <!-- 
+      <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+        <xs:annotation>
+          <xs:documentation>Hier können Elemente für zusätzliche Verrechnungsinformationen hinzugefügt werden.</xs:documentation>
+        </xs:annotation>
+      </xs:any>
+       -->
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>