diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
index 751b38d62075e4c7738c82c21ae37a00cc18a979..01a29c57512cebf3a68b7866576b1af58695a1a0 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
@@ -82,11 +82,20 @@ public class OAIPMHImpl implements OAIPMHProducer {
    * @param identifierList
    * @param identifierListIDIOM
    */
-  public OAIPMHImpl(RepIdentification rep, RecordDelivererDC recDelivDC,
-      RecordDelivererIDIOM recDelivIDIOM, OpenAireRecord openAireRecord, RecordListDelivererDC recordListDC,
-      RecordListDelivererIDIOM recordListIDIOM, OpenAireRecordList openAireRecordList, MetadataFormatListDeliverer metadataFormatList,
-      SetDeliverer setList, IdentifierListDelivererDC identifierList,
-      IdentifierListDelivererIDIOM identifierListIDIOM, OpenAireIdentifierList openAireIdentifierList) {
+  public OAIPMHImpl(
+		  RepIdentification rep, //0
+		  RecordDelivererDC recDelivDC, //1
+		  RecordDelivererIDIOM recDelivIDIOM, //2 
+		  OpenAireRecord openAireRecord, //3
+		  RecordListDelivererDC recordListDC, //4
+		  RecordListDelivererIDIOM recordListIDIOM, //5 
+		  OpenAireRecordList openAireRecordList, //6
+		  MetadataFormatListDeliverer metadataFormatList, //7
+		  SetDeliverer setList, //8
+		  IdentifierListDelivererDC identifierList, //9
+		  IdentifierListDelivererIDIOM identifierListIDIOM, //10 
+		  OpenAireIdentifierList openAireIdentifierList //11
+		  ) {
     this.rep = rep;
     this.recDelivDC = recDelivDC;
     this.recDelivIDIOM = recDelivIDIOM;
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OpenAireRecord.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OpenAireRecord.java
index 4ec1abbf1b11fd28bd604b9e7691fd3f35d4eae1..b46b3f3624dafceaa0c2de2de12963c64a0c599b 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OpenAireRecord.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OpenAireRecord.java
@@ -11,6 +11,7 @@ import org.apache.commons.logging.LogFactory;
 import org.elasticsearch.common.Strings;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.springframework.stereotype.Component;
 
 import info.textgrid.middleware.oaipmh.ContributorType;
 import info.textgrid.middleware.oaipmh.DateType;
@@ -53,6 +54,7 @@ import info.textgrid.middleware.oaipmh.Resource.Titles.Title;
  *
  */
 
+@Component
 public class OpenAireRecord extends RecordDelivererAbstract {
 
     //Logger for errors and info
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java
index 1a419f0a175b97a4f71ddebdc527f380dde814f9..a6bf031e08280dbe5410ed8eff619126579766dd 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java
@@ -9,6 +9,8 @@ import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.search.fetch.subphase.FetchSourceContext;
+import org.springframework.stereotype.Component;
+
 import info.textgrid.middleware.oaipmh.GetRecordType;
 import info.textgrid.middleware.oaipmh.HeaderType;
 import info.textgrid.middleware.oaipmh.RecordType;
@@ -21,6 +23,8 @@ import info.textgrid.middleware.oaipmh.RecordType;
  * @version 2019-10-30
  * @since 2014-02-17
  */
+
+@Component
 public class RecordDelivererDC extends RecordDelivererAbstract {
 
   private String[] fields;
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
index 29d245d8042c04f3bff26ef36eba385d622718b9..d57ee51d47a88c45ddb57e4fcdc649ef7fc44a2e 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
@@ -12,6 +12,7 @@ import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.search.fetch.subphase.FetchSourceContext;
+import org.springframework.stereotype.Component;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 import info.textgrid.middleware.oaipmh.GetRecordType;
@@ -26,6 +27,7 @@ import info.textgrid.middleware.oaipmh.RecordType;
  * @version 2019-03-12
  */
 
+@Component
 public class RecordDelivererIDIOM extends RecordDelivererAbstract {
 
   private String dateOfObjectCreation;
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhDARIAHTest.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhDARIAHTest.java
index fdbc3cd416b66392ccdd58b12dfa11d76434992c..bb4a1f96c6a686c6f6327a075baaecfa25863a3e 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhDARIAHTest.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhDARIAHTest.java
@@ -46,7 +46,8 @@ public class OaiPmhDARIAHTest {
 	      this.rep, OaiPmhDARIAHTest.record, OaiPmhDARIAHTest.recordIDIOM, OaiPmhDARIAHTest.openAireRecord, OaiPmhDARIAHTest.recordList,
 	      OaiPmhDARIAHTest.recordListIDIOM, OaiPmhDARIAHTest.openAireRecordList, OaiPmhDARIAHTest.metadataFormatList,
 	      OaiPmhDARIAHTest.setListDARIAH, OaiPmhDARIAHTest.identifierList, OaiPmhDARIAHTest.identifierListIDIOM, OaiPmhDARIAHTest.openAireIdentifierList);
-	  OAIPMHUtilities settings = new OAIPMHUtilities();
+	  
+  OAIPMHUtilities settings = new OAIPMHUtilities();
 
   /**
    * @throws Exception