diff --git a/deegree-services/deegree-services-csw/src/main/resources/org/deegree/services/csw/exporthandling/extendedCapInspire.xml b/deegree-services/deegree-services-csw/src/main/resources/org/deegree/services/csw/exporthandling/extendedCapInspire.xml
index f4746226d8..f8d49ada5b 100644
--- a/deegree-services/deegree-services-csw/src/main/resources/org/deegree/services/csw/exporthandling/extendedCapInspire.xml
+++ b/deegree-services/deegree-services-csw/src/main/resources/org/deegree/services/csw/exporthandling/extendedCapInspire.xml
@@ -1,129 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<inspire_ds:ExtendedCapabilities
-  xmlns:inspire_ds="http://inspire.europa.eu/networkservice/discovery"
-  xmlns:gmd="http://www.isotc211.org/2005/gmd"
-  xmlns:gml="http://www.opengis.net/gml/3.2"
-  xmlns:gco="http://www.isotc211.org/2005/gco"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <inspire_ds:ResourceLocator>
-    <gmd:onLine>
-      <gmd:CI_OnlineResource>
-        <gmd:linkage>
-          <gmd:URL>${SERVER_ADDRESS}REQUEST=GetCapabilities&amp;SERVICE=CSW&amp;ACCEPTVERSIONS=2.0.2</gmd:URL>
-        </gmd:linkage>
-      </gmd:CI_OnlineResource>
-    </gmd:onLine>
-  </inspire_ds:ResourceLocator>
-  <!--
-    <inspire_ds:MetadataUrl> <gmd:linkage>
-    <gmd:URL>$SERVER-ADRESS?Service=CSW&amp;Request=GetRecordById&amp;Version=2.0.2&amp;id=$OWN_DATASET_ID&amp;outputSchema=http://www.isotc211.org/2005/gmd&amp;elementSetName=full</gmd:URL>
-    </gmd:linkage> </inspire_ds:MetadataUrl>
-  -->
-  <inspire_ds:ResourceType>
-    <gmd:MD_ScopeCode
-      codeListValue="service"
-      codeList="http://standards.iso.org/ittf/ PubliclyAvailableStandards/ISO_19139_Schemas/ resources/Codelist/gmxCodelists.xml#MD_ScopeCode">service</gmd:MD_ScopeCode>
-  </inspire_ds:ResourceType>
-  <inspire_ds:TemporalReference>
-    <gmd:temporalElement>
-      <gmd:EX_TemporalExtent>
-        <gmd:extent>
-          <gml:TimePeriod
-            gml:id="TIMEPERIOD_ID"
-            xsi:type="gml:TimePeriodType">
-            <gml:beginPosition>${SYSTEM_START_DATE}</gml:beginPosition>
-            <gml:endPosition>2100-01-01</gml:endPosition>
-          </gml:TimePeriod>
-        </gmd:extent>
-      </gmd:EX_TemporalExtent>
-    </gmd:temporalElement>
-  </inspire_ds:TemporalReference>
-  <inspire_ds:Conformity>
-    <gmd:specification>
-      <gmd:CI_Citation>
-        <gmd:title>
-          <gco:CharacterString>http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=CELEX:32009R0976:EN:NOT
-          </gco:CharacterString>
-        </gmd:title>
-        <gmd:date>
-          <gmd:CI_Date>
-            <gmd:date>
-              <gco:Date>2009-10-12</gco:Date>
-            </gmd:date>
-            <gmd:dateType>
-              <gmd:CI_DateTypeCode
-                codeListValue="publication"
-                codeList="http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/Codelist/ML_gmxCodelists.xml#CI_DateTypeCode"
-              >publication</gmd:CI_DateTypeCode>
-            </gmd:dateType>
-          </gmd:CI_Date>
-        </gmd:date>
-      </gmd:CI_Citation>
-    </gmd:specification>
-    <gmd:explanation>
-      <gco:CharacterString>See the referenced specification</gco:CharacterString>
-    </gmd:explanation>
-    <gmd:pass
-      gco:nilReason="template"/>
-  </inspire_ds:Conformity>
-  <inspire_ds:Conformity>
-    <gmd:specification>
-      <gmd:CI_Citation>
-        <gmd:title>
-          <gco:CharacterString>http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=CELEX:32008R1205:EN:NOT
-          </gco:CharacterString>
-        </gmd:title>
-        <gmd:date>
-          <gmd:CI_Date>
-            <gmd:date>
-              <gco:Date>2008-12-03</gco:Date>
-            </gmd:date>
-            <gmd:dateType>
-              <gmd:CI_DateTypeCode
-                codeListValue="publication"
-                codeList="http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/Codelist/ML_gmxCodelists.xml#CI_DateTypeCode">publication</gmd:CI_DateTypeCode>
-            </gmd:dateType>
-          </gmd:CI_Date>
-        </gmd:date>
-      </gmd:CI_Citation>
-    </gmd:specification>
-    <gmd:explanation>
-      <gco:CharacterString>See referenced specification</gco:CharacterString>
-    </gmd:explanation>
-    <gmd:pass gco:nilReason="template"/>
-  </inspire_ds:Conformity>
-  <inspire_ds:MetadataPointOfContact>
-    <gmd:organisationName>
-      <gco:CharacterString>${ORGANIZATION_NAME}</gco:CharacterString>
-    </gmd:organisationName>
-    <gmd:contactInfo>
-      <gmd:CI_Contact>
-        <gmd:address>
-          <gmd:CI_Address>
-            <gmd:electronicMailAddress>
-              <gco:CharacterString>${CI_EMAIL_ADDRESS}</gco:CharacterString>
-            </gmd:electronicMailAddress>
-          </gmd:CI_Address>
-        </gmd:address>
-      </gmd:CI_Contact>
-    </gmd:contactInfo>
-    <gmd:role>
-      <gmd:CI_RoleCode
-        codeListValue="pointOfContact"
-        codeList="http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/Codelist/ML_gmxCodelists.xml#CI_RoleCode">pointOfContact</gmd:CI_RoleCode>
-    </gmd:role>
-  </inspire_ds:MetadataPointOfContact>
-  <inspire_ds:MetadataDate>${SYSTEM_START_DATE}</inspire_ds:MetadataDate>
-  <inspire_ds:SpatialDataServiceType>
-    <gco:LocalName codeSpace="INSPIRE">discovery</gco:LocalName>
-  </inspire_ds:SpatialDataServiceType>
-  <inspire_ds:InspireKeywords>
-    <gmd:keyword>
-      <gco:CharacterString>humanCatalogueViewer</gco:CharacterString>
-    </gmd:keyword>
-  </inspire_ds:InspireKeywords>
-  <inspire_ds:Languages>
-    <inspire_ds:Language default="true">eng</inspire_ds:Language>
-  </inspire_ds:Languages>
-  <inspire_ds:CurrentLanguage>eng</inspire_ds:CurrentLanguage>
-</inspire_ds:ExtendedCapabilities>
\ No newline at end of file
+<inspire_ds:ExtendedCapabilities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:inspire_ds="http://inspire.ec.europa.eu/schemas/inspire_ds/1.0" xmlns:inspire_common="http://inspire.ec.europa.eu/schemas/common/1.0" xsi:schemaLocation="http://inspire.ec.europa.eu/schemas/inspire_ds/1.0 http://inspire.ec.europa.eu/schemas/inspire_ds/1.0/inspire_ds.xsd">
+  		<inspire_common:ResourceLocator>
+				<inspire_common:URL>http://www.inspire-geoportal.eu/discovery/csw?SERVICE=CSW&amp;REQUEST=GetCapabilities</inspire_common:URL>
+				<inspire_common:MediaType>application/vnd.ogc.wms_xml</inspire_common:MediaType>
+			</inspire_common:ResourceLocator>
+			<inspire_common:ResourceType>service</inspire_common:ResourceType>
+			<inspire_common:TemporalReference>
+				<inspire_common:TemporalExtent>
+					<inspire_common:IntervalOfDates>
+						<inspire_common:StartingDate>2010-07-01T00:00:00</inspire_common:StartingDate>
+						<inspire_common:EndDate>2011-07-01T00:00:00</inspire_common:EndDate>
+					</inspire_common:IntervalOfDates>
+				</inspire_common:TemporalExtent>
+			</inspire_common:TemporalReference>
+			<inspire_common:Conformity>
+				<inspire_common:Specification xsi:type="inspire_common:citationInspireInteroperabilityRegulation_eng">
+					<inspire_common:Title>COMMISSION REGULATION (EU) No 1089/2010 of 23 November 2010 implementing Directive 2007/2/EC of the European Parliament and of the Council as regards interoperability of spatial data sets and services</inspire_common:Title>
+					<inspire_common:DateOfPublication>2010-12-08</inspire_common:DateOfPublication>
+					<inspire_common:URI>OJ:L:2010:323:0011:0102:EN:PDF</inspire_common:URI>
+					<inspire_common:ResourceLocator>
+						<inspire_common:URL>http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=OJ:L:2010:323:0011:0102:EN:PDF</inspire_common:URL>
+						<inspire_common:MediaType>application/pdf</inspire_common:MediaType>
+					</inspire_common:ResourceLocator>
+				</inspire_common:Specification>
+				<inspire_common:Degree>notEvaluated</inspire_common:Degree>
+			</inspire_common:Conformity>
+			<inspire_common:MetadataPointOfContact>
+				<inspire_common:OrganisationName>European Commission, Joint Research Centre</inspire_common:OrganisationName>
+				<inspire_common:EmailAddress>ioannis.kanellopoulos@jrc.ec.europa.eu</inspire_common:EmailAddress>
+			</inspire_common:MetadataPointOfContact>
+			<inspire_common:MetadataDate>2010-07-15</inspire_common:MetadataDate>
+			<inspire_common:SpatialDataServiceType>discovery</inspire_common:SpatialDataServiceType>
+			<inspire_common:MandatoryKeyword xsi:type="inspire_common:classificationOfSpatialDataService">
+				<inspire_common:KeywordValue>humanCatalogueViewer</inspire_common:KeywordValue>
+			</inspire_common:MandatoryKeyword>
+			<inspire_common:Keyword xsi:type="inspire_common:inspireTheme_eng">
+				<inspire_common:OriginatingControlledVocabulary>
+					<inspire_common:Title>GEMET - INSPIRE themes</inspire_common:Title>
+					<inspire_common:DateOfPublication>2008-06-01</inspire_common:DateOfPublication>
+				</inspire_common:OriginatingControlledVocabulary>
+				<inspire_common:KeywordValue>Orthoimagery</inspire_common:KeywordValue>
+			</inspire_common:Keyword>
+			<inspire_common:SupportedLanguages>
+				<inspire_common:DefaultLanguage>
+					<inspire_common:Language>eng</inspire_common:Language>
+				</inspire_common:DefaultLanguage>
+				<inspire_common:SupportedLanguage>
+					<inspire_common:Language>eng</inspire_common:Language>
+				</inspire_common:SupportedLanguage>
+			</inspire_common:SupportedLanguages>
+			<inspire_common:ResponseLanguage>
+				<inspire_common:Language>eng</inspire_common:Language>
+			</inspire_common:ResponseLanguage>
+			<!--For documentation only since MetadataUrl is an optional element-->
+			<inspire_common:MetadataUrl>
+				<inspire_common:URL>http://www.inspire-geoportal.eu/discovery/csw?Service=CSW&amp;Request=GetRecordById&amp;Version=2.0.2&amp;id=jrc_geoportal_ds_vap-xgeodev&amp;outputSchema=http://www.isotc211.org/2005/gmd&amp;elementSetName=full</inspire_common:URL>
+				<inspire_common:MediaType>application/vnd.ogc.csw_xml</inspire_common:MediaType>
+			</inspire_common:MetadataUrl>
+		</inspire_ds:ExtendedCapabilities>