diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml
index c2f75d2ece2fc0c802226380667a8b01cbfca09c..5dc0f5f991a7daf85c772e40f3a257132e360922 100644
--- a/oaipmh-core/pom.xml
+++ b/oaipmh-core/pom.xml
@@ -195,20 +195,6 @@
 							</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 e3ce56ed571038af7a5f8afae92dec47731d5e4b..db31f0775052acfda09a2607a57c4567b33eb1ba 100644
--- a/oaipmh-core/src/main/resources/bindings.xjb
+++ b/oaipmh-core/src/main/resources/bindings.xjb
@@ -6,6 +6,7 @@
 	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">
+
 	<jxb:bindings schemaLocation="oai_pmh.xsd">
 		<jxb:schemaBindings>
 			<jxb:package name="info.textgrid.middleware.oaipmh" />
@@ -23,10 +24,66 @@
 				namespaceURI="http://purl.org/dc/elements/1.1/" name="dc" />
 		</jxb:bindings>
 	</jxb:bindings>
+
 	<jxb:bindings schemaLocation="openaire.xsd">
 		<jxb:schemaBindings>
 			<jxb:package
 				name="info.textgrid.middleware.oaipmh.openaire" />
 		</jxb:schemaBindings>
 	</jxb:bindings>
+
+	<!-- MIT DIESEM HIER EINKOMMENTIERT, benennt er die Klassen um, scheint 
+		sie aber irgendwo NOCHMAL zu definieren?? -->
+	<jxb:bindings schemaLocation="oaf-common-1.0.xsd">
+		<jxb:schemaBindings>
+			<jxb:package
+				name="info.textgrid.middleware.oaipmh.oaf.common" />
+		</jxb:schemaBindings>
+		<jxb:bindings node="//xs:attribute[@name='classname']">
+			<jxb:property name="OAFClassnameProperty" />
+		</jxb:bindings>
+		<jxb:bindings node="//xs:attribute[@name='classid']">
+			<jxb:property name="OAFClassidProperty" />
+		</jxb:bindings>
+		<jxb:bindings node="//xs:attribute[@name='schemeid']">
+			<jxb:property name="OAFSchemeidProperty" />
+		</jxb:bindings>
+		<jxb:bindings node="//xs:attribute[@name='schemename']">
+			<jxb:property name="OAFSchemenameProperty" />
+		</jxb:bindings>
+	</jxb:bindings>
+
+<!--
+	<jxb:bindings schemaLocation="oaf-org-1.0.xsd">
+		<jxb:schemaBindings>
+			<jxb:package
+				name="info.textgrid.middleware.oaipmh.oaf.org" />
+		</jxb:schemaBindings>
+	</jxb:bindings>
+	<jxb:bindings schemaLocation="oaf-1.0.xsd">
+		<jxb:schemaBindings>
+			<jxb:package
+				name="info.textgrid.middleware.oaipmh.oaf.oaf" />
+		</jxb:schemaBindings>
+	</jxb:bindings>
+	<jxb:bindings schemaLocation="oaf-datasource-1.0.xsd">
+		<jxb:schemaBindings>
+			<jxb:package
+				name="info.textgrid.middleware.oaipmh.oaf.datasource" />
+		</jxb:schemaBindings>
+	</jxb:bindings>
+	<jxb:bindings schemaLocation="oaf-project-1.0.xsd">
+		<jxb:schemaBindings>
+			<jxb:package
+				name="info.textgrid.middleware.oaipmh.oaf.project" />
+		</jxb:schemaBindings>
+	</jxb:bindings>
+	<jxb:bindings schemaLocation="oaf-result-1.0.xsd">
+		<jxb:schemaBindings>
+			<jxb:package
+				name="info.textgrid.middleware.oaipmh.oaf.result" />
+		</jxb:schemaBindings>
+	</jxb:bindings>
+-->
+
 </jxb:bindings>