diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml
index 46b2b4d6593d0a2a3e8adf1013f00b90e138bf37..c2f75d2ece2fc0c802226380667a8b01cbfca09c 100644
--- a/oaipmh-core/pom.xml
+++ b/oaipmh-core/pom.xml
@@ -12,18 +12,18 @@
 	<packaging>jar</packaging>
 	<name>DARIAHDE :: OAI-PMH DataProvider :: Core</name>
 	<url>http://maven.apache.org</url>
-	
+
 	<dependencies>
-    <dependency>
-      <groupId>info.textgrid.utils</groupId>
-      <artifactId>httpclients</artifactId>
-      <version>${textgrid.httpclients.version}</version>
-    </dependency>
-    <dependency>
-    <groupId>org.eclipse.rdf4j</groupId>
-    <artifactId>rdf4j-repository-api</artifactId>
-    <version>3.0.2</version>
-</dependency>
+		<dependency>
+			<groupId>info.textgrid.utils</groupId>
+			<artifactId>httpclients</artifactId>
+			<version>${textgrid.httpclients.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.rdf4j</groupId>
+			<artifactId>rdf4j-repository-api</artifactId>
+			<version>3.0.2</version>
+		</dependency>
 		<dependency>
 			<groupId>info.textgrid.middleware</groupId>
 			<artifactId>crud-common</artifactId>
@@ -108,12 +108,12 @@
 			<version>1.4.5</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.json/json -->
-<dependency>
-    <groupId>org.json</groupId>
-    <artifactId>json</artifactId>
-    <version>20190722</version>
-</dependency>
-		
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20190722</version>
+		</dependency>
+
 	</dependencies>
 	<build>
 		<pluginManagement>
@@ -195,6 +195,20 @@
 							</args>
 						</configuration>
 					</execution>
+					<execution>
+						<id>generate-openaire</id>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+						<configuration>
+							<generatePackage>info.textgrid.middleware.oaipmh.openaire</generatePackage>
+							<generateDirectory>${project.build.directory}/generated-sources/oaipmh/openaire</generateDirectory>
+							<args>
+								<arg>-extension</arg>
+								<arg>-Xnamespace-prefix</arg>
+							</args>
+						</configuration>
+					</execution>
 				</executions>
 				<dependencies>
 					<dependency>
diff --git a/oaipmh-core/src/main/resources/bindings.xjb b/oaipmh-core/src/main/resources/bindings.xjb
index 3914cddfe02b9c91c83bc35bdfaf4ebe79cd12ff..e3ce56ed571038af7a5f8afae92dec47731d5e4b 100644
--- a/oaipmh-core/src/main/resources/bindings.xjb
+++ b/oaipmh-core/src/main/resources/bindings.xjb
@@ -2,6 +2,7 @@
 <jxb:bindings version="1.0"
 	xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:namespace="http://jaxb2-commons.dev.java.net/namespace-prefix"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb https://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
 	http://jaxb2-commons.dev.java.net/namespace-prefix https://raw.githubusercontent.com/Siggen/jaxb2-namespace-prefix/master/src/main/resources/prefix-namespace-schema.xsd">
@@ -22,14 +23,10 @@
 				namespaceURI="http://purl.org/dc/elements/1.1/" name="dc" />
 		</jxb:bindings>
 	</jxb:bindings>
-	<!--jxb:bindings schemaLocation="openaire.xsd">
-	            <jxb:bindings>
-	                    <jxb:nameXmlTransform>
-	                            <jxb:elementName suffix="Element"/>
-	                    </jxb:nameXmlTransform>
-	                    <jxb:bindings node="//xs:attribute[@ref='xml:lang']">
-	                            <jxb:property name="secondlang"/>
-	                    </jxb:bindings>
-	            </jxb:bindings>
-	    </jxb:bindings-->
+	<jxb:bindings schemaLocation="openaire.xsd">
+		<jxb:schemaBindings>
+			<jxb:package
+				name="info.textgrid.middleware.oaipmh.openaire" />
+		</jxb:schemaBindings>
+	</jxb:bindings>
 </jxb:bindings>