diff --git a/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml b/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
index 646c6f52094cd3480c68c4fd033b7b0d94060300..4236098166bbffe88171833d6bfd175915d4b0af 100644
--- a/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
+++ b/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
@@ -58,21 +58,20 @@
 		<constructor-arg index="6" value="${AdminMail}" />
 	</bean>
 
-	<bean id="RecordList"
-		class="info.textgrid.middleware.RecordListDeliverer">
+	<bean id="RecordListDC" class="info.textgrid.middleware.RecordListDelivererDC">
 		<!--constructor-arg index="0" ref="ElasticSearchClient" / -->
-		<constructor-arg index="0" value="${fields}" />
-		<constructor-arg index="1" value="${workFields}" />
-		<constructor-arg index="2" value="${textgrid}" />
-		<constructor-arg index="3" value="${dariah}" />
+		<!-- <constructor-arg index="0" value="${fields}" />-->
+		<!-- <constructor-arg index="1" value="${workFields}" /> -->
+		<constructor-arg index="0" value="${textgrid}" />
+		<constructor-arg index="1" value="${dariah}" />
+		<property name="fields" value="${fields}" />
+		<property name="workFields" value="${workFields}" />
+		<!-- <property name="oaiEsClient" value="${formatToFilter}" /> -->
 		<property name="formatField" value="${formatField}" />
 		<property name="formatToFilter" value="${formatToFilter}" />
-		<property name="dateOfObjectCreation"
-			value="${dateOfObjectCreation}" />
-		<property name="relationToFurtherMetadataObject"
-			value="${relationToFurtherMetadataObject}" />
-		<property name="repositoryObjectURIPrefix"
-			value="${repositoryObjectURIPrefix}" />
+		<property name="dateOfObjectCreation" value="${dateOfObjectCreation}" />
+		<property name="relationToFurtherMetadataObject" value="${relationToFurtherMetadataObject}" />
+		<property name="repositoryObjectURIPrefix" value="${repositoryObjectURIPrefix}" />
 		<property name="FieldForRange" value="${rangeField}" />
 		<property name="contributor" value="${contributorList}" />
 		<property name="coverage" value="${coverageList}" />
@@ -84,8 +83,7 @@
 		<property name="languages" value="${languageList}" />
 		<property name="publishers" value="${publisherList}" />
 		<property name="relations" value="${relationList}" />
-		<property name="relationsForWork"
-			value="${relationsForWorkList}" />
+		<property name="relationsForWork" value="${relationsForWorkList}" />
 		<property name="rights" value="${rightsList}" />
 		<property name="sources" value="${sourceList}" />
 		<property name="subjects" value="${subjectList}" />
@@ -93,25 +91,29 @@
 		<property name="types" value="${typeList}" />
 		<property name="modifiedField" value="${modifiedField}" />
 		<property name="identifierField" value="${identifierField}" />
-		<property name="searchResponseSize"
-			value="${searchResponseSize}" />
+		<property name="searchResponseSize" value="${searchResponseSize}" />
+	</bean>
+
+	<bean id="RecordListIDIOM" class="info.textgrid.middleware.RecordListDelivererIDIOM">
+		<constructor-arg index="0" value="${textgrid}" />
+		<constructor-arg index="1" value="${dariah}" />
+		<!-- <property name="oaiEsClient" value="${formatToFilter}" /> -->
 	</bean>
 
 	<bean id="RecordDC" class="info.textgrid.middleware.RecordDelivererDC">
-		<constructor-arg index="0" ref="ElasticSearchClient" />
-		<constructor-arg index="1" value="${workFields}" />
-		<constructor-arg index="2" value="${textgrid}" />
-		<constructor-arg index="3" value="${dariah}" />
+		<!-- <constructor-arg index="0" ref="ElasticSearchClient" /> -->
+		<!-- <constructor-arg index="1" value="${workFields}" /> -->
+		<constructor-arg index="0" value="${textgrid}" />
+		<constructor-arg index="1" value="${dariah}" />
 		<property name="formatField" value="${formatField}" />
 		<property name="formatToFilter" value="${formatToFilter}" />
-		<property name="dateOfObjectCreation"
-			value="${dateOfObjectCreation}" />
-		<property name="relationToFurtherMetadataObject"
-			value="${relationToFurtherMetadataObject}" />
-		<property name="repositoryObjectURIPrefix"
-			value="${repositoryObjectURIPrefix}" />
+		<!-- <property name="oaiEsClient" value="${formatToFilter}" /> -->
+		<property name="dateOfObjectCreation" value="${dateOfObjectCreation}" />
+		<property name="relationToFurtherMetadataObject" value="${relationToFurtherMetadataObject}" />
+		<property name="repositoryObjectURIPrefix" value="${repositoryObjectURIPrefix}" />
 		<property name="identifierField" value="${identifierField}" />
 		<property name="fields" value="${fields}" />
+		<property name="workFields" value="${workFields}" />
 		<property name="contributor" value="${contributorList}" />
 		<property name="coverage" value="${coverageList}" />
 		<property name="creator" value="${creatorList}" />
@@ -122,20 +124,24 @@
 		<property name="languages" value="${languageList}" />
 		<property name="publishers" value="${publisherList}" />
 		<property name="relations" value="${relationList}" />
-		<property name="relationsForWork"
-			value="${relationsForWorkList}" />
+		<property name="relationsForWork" value="${relationsForWorkList}" />
 		<property name="rights" value="${rightsList}" />
 		<property name="sources" value="${sourceList}" />
 		<property name="subjects" value="${subjectList}" />
 		<property name="titles" value="${titleList}" />
 		<property name="types" value="${typeList}" />
 	</bean>
+	
+	<bean id="RecordDC" class="info.textgrid.middleware.RecordDelivererIDIOM">
+		<constructor-arg index="0" value="${textgrid}" />
+		<constructor-arg index="1" value="${dariah}" />
+		<!-- <property name="oaiEsClient" value="${formatToFilter}" /> -->
+	</bean>
 
-	<bean id="ListIdentifier"
-		class="info.textgrid.middleware.IdentifierListDeliverer">
-		<constructor-arg index="0" ref="ElasticSearchClient" />
-		<constructor-arg index="1" value="${textgrid}" />
-		<constructor-arg index="2" value="${dariah}" />
+	<bean id="ListIdentifierDC"	class="info.textgrid.middleware.IdentifierListDelivererDC">
+		<!-- <constructor-arg index="0" ref="ElasticSearchClient" /> -->
+		<constructor-arg index="0" value="${textgrid}" />
+		<constructor-arg index="1" value="${dariah}" />
 		<property name="formatField" value="${formatField}" />
 		<property name="formatToFilter" value="${formatToFilter}" />
 		<property name="dateOfObjectCreation"
@@ -149,6 +155,12 @@
 		<property name="searchResponseSize"
 			value="${searchResponseSize}" />
 	</bean>
+	
+	<bean id="ListIdentifierIDIOM" class="info.textgrid.middleware.IdentifierListDelivererIDIOM">
+		<!-- <constructor-arg index="0" ref="ElasticSearchClient" /> -->
+		<constructor-arg index="0" value="${textgrid}" />
+		<constructor-arg index="1" value="${dariah}" />
+	</bean>
 
 	<bean id="SetDeliverer"
 		class="info.textgrid.middleware.SetDeliverer">
@@ -183,10 +195,13 @@
 		<constructor-arg ref="RepIdentification" />
 		<constructor-arg ref="RecordAbstract" />
 		<constructor-arg ref="RecordDC" />
-		<constructor-arg ref="RecordList" />
+		<constructor-arg ref="RecordIDIOM" />
+		<constructor-arg ref="RecordListDC" />
+		<constructor-arg ref="RecordListIDIOM" />
 		<constructor-arg ref="MetadataFormatList" />
 		<constructor-arg ref="SetDeliverer" />
-		<constructor-arg ref="ListIdentifier" />
+		<constructor-arg ref="ListIdentifierDC" />
+		<constructor-arg ref="ListIdentifierIDIOM" />
 		<property name="textGrid" value="${textgrid}" />
 		<property name="dariah" value="${dariah}" />
 	</bean>