diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 9a6d7f5c13..ef3b9e1526 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -486,10 +486,8 @@
       </indentOptions>
     </codeStyleSettings>
     <codeStyleSettings language="Python">
-      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
       <option name="RIGHT_MARGIN" value="80" />
       <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <option name="PARENT_SETTINGS_INSTALLED" value="true" />
       <indentOptions>
         <option name="INDENT_SIZE" value="2" />
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
diff --git a/.run/metis-authentication(.properties).run.xml b/.run/metis-authentication(.properties).run.xml
index c086d4b414..2b70f0317c 100644
--- a/.run/metis-authentication(.properties).run.xml
+++ b/.run/metis-authentication(.properties).run.xml
@@ -2,11 +2,12 @@
   <configuration default="false" name="metis-authentication(.properties)" type="SpringBootApplicationConfigurationType"
     factoryName="Spring Boot">
     <envs>
-      <env name="hibernate.connection.url" value="jdbc:postgresql://localhost:5432/metis-authentication_local"/>
+      <env name="logging.config" value="file:///data/metis-configuration/k8s/common-components/log4j2-xml/log4j2.xml"/>
       <env name="server.servlet.context-path" value="/metis-authentication"/>
       <env name="spring.config.location"
-        value="file:///data/metis-configuration/metis-framework/metis-authentication/metis-authentication-rest/k8s/overlays/local/components/properties/application.properties"/>
-      <env name="logging.config" value="file:///data/metis-configuration/k8s/common-components/log4j2-xml/log4j2.xml"/>
+        value="file:///data/metis-configuration/metis-framework/metis-authentication/metis-authentication-rest/k8s/overlays/test/components/properties/application.properties"/>
+      <env name="truststore.path"
+        value="/data/metis-configuration/k8s/common-components/custom-truststore-jks/custom-truststore.jks"/>
     </envs>
     <module name="metis-authentication-rest"/>
     <option name="SPRING_BOOT_MAIN_CLASS" value="eu.europeana.metis.authentication.rest.Application"/>
diff --git a/.run/metis-core (.properties).run.xml b/.run/metis-core (.properties).run.xml
index bc96545a9e..98d47339b9 100644
--- a/.run/metis-core (.properties).run.xml	
+++ b/.run/metis-core (.properties).run.xml	
@@ -2,13 +2,12 @@
   <configuration default="false" name="metis-core (.properties)" type="SpringBootApplicationConfigurationType"
     factoryName="Spring Boot">
     <envs>
-      <env name="mongo_hosts" value="localhost"/>
-      <env name="rabbitmq.host" value="localhost"/>
-      <env name="redis.host" value="localhost"/>
+      <env name="logging.config" value="file:///data/metis-configuration/k8s/common-components/log4j2-xml/log4j2.xml"/>
       <env name="server.servlet.context-path" value="/metis-core"/>
       <env name="spring.config.location"
-        value="file:///data/metis-configuration/metis-framework/metis-core/metis-core-rest/k8s/overlays/local/components/properties/application.properties"/>
-      <env name="logging.config" value="file:///data/metis-configuration/k8s/common-components/log4j2-xml/log4j2.xml"/>
+        value="file:///data/metis-configuration/metis-framework/metis-core/metis-core-rest/k8s/overlays/test/components/properties/application.properties"/>
+      <env name="truststore.path"
+        value="/data/metis-configuration/k8s/common-components/custom-truststore-jks/custom-truststore.jks"/>
     </envs>
     <module name="metis-core-rest"/>
     <option name="SPRING_BOOT_MAIN_CLASS" value="eu.europeana.metis.core.rest.Application"/>
diff --git a/.run/metis-dereference(.properties).run.xml b/.run/metis-dereference(.properties).run.xml
index 4ec05005ed..6fa1623df6 100644
--- a/.run/metis-dereference(.properties).run.xml
+++ b/.run/metis-dereference(.properties).run.xml
@@ -2,11 +2,12 @@
   <configuration default="false" name="metis-dereference(.properties)" type="SpringBootApplicationConfigurationType"
     factoryName="Spring Boot">
     <envs>
-      <env name="mongo.hosts" value="localhost"/>
+      <env name="logging.config" value="file:///data/metis-configuration/k8s/common-components/log4j2-xml/log4j2.xml"/>
       <env name="server.servlet.context-path" value="/metis-dereference"/>
       <env name="spring.config.location"
-        value="file:///data/metis-configuration/metis-framework/metis-dereference/metis-dereference-rest/k8s/overlays/local/components/properties/application.properties"/>
-      <env name="logging.config" value="file:///data/metis-configuration/k8s/common-components/log4j2-xml/log4j2.xml"/>
+        value="file:///data/metis-configuration/metis-framework/metis-dereference/metis-dereference-rest/k8s/overlays/test/components/properties/application.properties"/>
+      <env name="truststore.path"
+        value="/data/metis-configuration/k8s/common-components/custom-truststore-jks/custom-truststore.jks"/>
     </envs>
     <module name="metis-dereference-rest"/>
     <option name="SPRING_BOOT_MAIN_CLASS" value="eu.europeana.metis.dereference.rest.Application"/>
diff --git a/.run/metis-repository (.properties).run.xml b/.run/metis-repository (.properties).run.xml
index 5a71d54331..537d519165 100644
--- a/.run/metis-repository (.properties).run.xml	
+++ b/.run/metis-repository (.properties).run.xml	
@@ -5,7 +5,9 @@
       <env name="logging.config" value="file:///data/metis-configuration/k8s/common-components/log4j2-xml/log4j2.xml"/>
       <env name="server.servlet.context-path" value="/metis-repository"/>
       <env name="spring.config.location"
-        value="file:///data/metis-configuration/metis-framework/metis-repository/metis-repository-rest/k8s/overlays/local/components/properties/application.properties"/>
+        value="file:///data/metis-configuration/metis-framework/metis-repository/metis-repository-rest/k8s/overlays/test/components/properties/application.properties"/>
+      <env name="truststore.path"
+        value="/data/metis-configuration/k8s/common-components/custom-truststore-jks/custom-truststore.jks"/>
     </envs>
     <module name="metis-repository-rest"/>
     <option name="SPRING_BOOT_MAIN_CLASS" value="eu.europeana.metis.repository.rest.Application"/>
diff --git a/metis-authentication/metis-authentication-common/pom.xml b/metis-authentication/metis-authentication-common/pom.xml
index f0c7832a5f..af03a2ab3b 100644
--- a/metis-authentication/metis-authentication-common/pom.xml
+++ b/metis-authentication/metis-authentication-common/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-authentication</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-authentication-common</artifactId>
 
diff --git a/metis-authentication/metis-authentication-rest-client/pom.xml b/metis-authentication/metis-authentication-rest-client/pom.xml
index 31a7a52b80..e46cb131d9 100644
--- a/metis-authentication/metis-authentication-rest-client/pom.xml
+++ b/metis-authentication/metis-authentication-rest-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-authentication</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-authentication-rest-client</artifactId>
 
diff --git a/metis-authentication/metis-authentication-rest/pom.xml b/metis-authentication/metis-authentication-rest/pom.xml
index f8d1761485..19d983e9d1 100644
--- a/metis-authentication/metis-authentication-rest/pom.xml
+++ b/metis-authentication/metis-authentication-rest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-authentication</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-authentication-rest</artifactId>
 
@@ -58,6 +58,11 @@
       <groupId>eu.europeana.metis</groupId>
       <artifactId>metis-common-utils</artifactId>
     </dependency>
+    <dependency>
+      <groupId>eu.europeana.metis</groupId>
+      <artifactId>metis-common-spring-properties</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>eu.europeana.metis</groupId>
       <artifactId>metis-authentication-common</artifactId>
diff --git a/metis-authentication/metis-authentication-rest/src/main/java/eu/europeana/metis/authentication/rest/config/ApplicationConfiguration.java b/metis-authentication/metis-authentication-rest/src/main/java/eu/europeana/metis/authentication/rest/config/ApplicationConfiguration.java
index a907205490..540040bc1e 100644
--- a/metis-authentication/metis-authentication-rest/src/main/java/eu/europeana/metis/authentication/rest/config/ApplicationConfiguration.java
+++ b/metis-authentication/metis-authentication-rest/src/main/java/eu/europeana/metis/authentication/rest/config/ApplicationConfiguration.java
@@ -3,6 +3,7 @@
 import static eu.europeana.metis.utils.SonarqubeNullcheckAvoidanceUtils.performAction;
 
 import eu.europeana.metis.authentication.dao.PsqlMetisUserDao;
+import eu.europeana.metis.authentication.rest.config.properties.MetisAuthenticationConfigurationProperties;
 import eu.europeana.metis.authentication.service.AuthenticationService;
 import eu.europeana.metis.authentication.user.MetisUser;
 import eu.europeana.metis.authentication.user.MetisUserAccessToken;
@@ -16,24 +17,35 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.lang.invoke.MethodHandles;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import javax.annotation.PreDestroy;
+import metis.common.config.properties.TruststoreConfigurationProperties;
+import metis.common.config.properties.postgres.HibernateConfigurationProperties;
+import metis.common.config.properties.zoho.ZohoConfigurationProperties;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.service.ServiceRegistry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.core.io.Resource;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter;
+import org.springframework.lang.NonNull;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.util.FileCopyUtils;
@@ -47,67 +59,45 @@
  * @since 2017-10-27
  */
 @Configuration
-@Import({ElasticAPMConfiguration.class})
+@EnableConfigurationProperties({
+    ElasticAPMConfiguration.class, TruststoreConfigurationProperties.class,
+    HibernateConfigurationProperties.class, ZohoConfigurationProperties.class,
+    MetisAuthenticationConfigurationProperties.class})
 @ComponentScan(basePackages = {"eu.europeana.metis.authentication.rest.controller"})
 @EnableScheduling
-public class ApplicationConfiguration implements WebMvcConfigurer {
+public class ApplicationConfiguration implements WebMvcConfigurer, ApplicationContextAware {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   @Value("classpath:create_tables.sql")
   private Resource createTablesSqlResource;
 
-  //Custom trustore
-  @Value("${truststore.path}")
-  private String truststorePath;
-  @Value("${truststore.password}")
-  private String truststorePassword;
-  @Value("${metis.access.token.expire.time.in.mins}")
-  private int metisAccessTokenExpireTimeInMins;
-  @Value("${allowed.cors.hosts}")
-  private String[] allowedCorsHosts;
-
-  //Zoho configuration
-  @Value("${zoho.initial.grant.token}")
-  private String zohoInitialGrantToken;
-  @Value("${zoho.refresh.token}")
-  private String zohoRefreshToken;
-  @Value("${zoho.current.user.email}")
-  private String zohoCurrentUserEmail;
-  @Value("${zoho.client.id}")
-  private String zohoClientId;
-  @Value("${zoho.client.secret}")
-  private String zohoClientSecret;
-  @Value("${zoho.redirect.uri}")
-  private String zohoRedirectUri;
-
-  //Hibernate configuration
-  @Value("${hibernate.connection.driver_class}")
-  private String hibernateConnectionDriverClass;
-  @Value("${hibernate.connection.url}")
-  private String hibernateConnectionUrl;
-  @Value("${hibernate.dialect}")
-  private String hibernateDialect;
-  @Value("${hibernate.connection.username}")
-  private String hibernateConnectionUsername;
-  @Value("${hibernate.connection.password}")
-  private String hibernateConnectionPassword;
-  @Value("${hibernate.c3p0.min_size}")
-  private String hibernateC3P0MinSize;
-  @Value("${hibernate.c3p0.max_size}")
-  private String hibernateC3P0MaxSize;
-  @Value("${hibernate.c3p0.timeout}")
-  private String hibernateC3P0Timeout;
-  @Value("${hibernate.c3p0.max_statements}")
-  private String hibernateC3p0MaxStatements;
-
   private SessionFactory sessionFactory;
   private AuthenticationService authenticationService;
   private MetisZohoOAuthPSQLHandler metisZohoOAuthPSQLHandler;
+  private ApplicationContext applicationContext;
+
+  /**
+   * Constructor.
+   *
+   * @param truststoreConfigurationProperties the truststore configuration properties
+   * @throws CustomTruststoreAppender.TrustStoreConfigurationException if the configuration of the truststore failed
+   */
+  @Autowired
+  public ApplicationConfiguration(TruststoreConfigurationProperties truststoreConfigurationProperties)
+      throws TrustStoreConfigurationException {
+    ApplicationConfiguration.initializeApplication(truststoreConfigurationProperties);
+  }
 
+  /**
+   * Get the session factory.
+   *
+   * @param hibernateConfigurationProperties the hibernate configuration properties
+   * @return the session factory
+   * @throws IOException if an I/O error occurs during sql script initialization
+   */
   @Bean
-  public SessionFactory getSessionFactory() throws TrustStoreConfigurationException, IOException {
-    if (StringUtils.isNotEmpty(truststorePath) && StringUtils.isNotEmpty(truststorePassword)) {
-      CustomTruststoreAppender.appendCustomTrustoreToDefault(truststorePath, truststorePassword);
-    }
+  public SessionFactory getSessionFactory(HibernateConfigurationProperties hibernateConfigurationProperties) throws IOException {
 
     org.hibernate.cfg.Configuration configuration = new org.hibernate.cfg.Configuration();
     configuration.addAnnotatedClass(MetisUser.class);
@@ -115,15 +105,17 @@ public SessionFactory getSessionFactory() throws TrustStoreConfigurationExceptio
     configuration.addAnnotatedClass(MetisZohoOAuthToken.class);
 
     //Apply code configuration to allow spring boot to handle the properties injection
-    configuration.setProperty("hibernate.connection.driver_class", hibernateConnectionDriverClass);
-    configuration.setProperty("hibernate.connection.url", hibernateConnectionUrl);
-    configuration.setProperty("hibernate.dialect", hibernateDialect);
-    configuration.setProperty("hibernate.connection.username", hibernateConnectionUsername);
-    configuration.setProperty("hibernate.connection.password", hibernateConnectionPassword);
-    configuration.setProperty("hibernate.c3p0.min_size", hibernateC3P0MinSize);
-    configuration.setProperty("hibernate.c3p0.max_size", hibernateC3P0MaxSize);
-    configuration.setProperty("hibernate.c3p0.timeout", hibernateC3P0Timeout);
-    configuration.setProperty("hibernate.c3p0.max_statements", hibernateC3p0MaxStatements);
+    configuration.setProperty("hibernate.connection.driver_class",
+        hibernateConfigurationProperties.getConnection().getDriverClass());
+    configuration.setProperty("hibernate.connection.url", hibernateConfigurationProperties.getConnection().getUrl());
+    configuration.setProperty("hibernate.connection.username", hibernateConfigurationProperties.getConnection().getUsername());
+    configuration.setProperty("hibernate.connection.password", hibernateConfigurationProperties.getConnection().getPassword());
+    configuration.setProperty("hibernate.dialect", hibernateConfigurationProperties.getDialect());
+    configuration.setProperty("hibernate.c3p0.min_size", hibernateConfigurationProperties.getC3p0().getMinSize());
+    configuration.setProperty("hibernate.c3p0.max_size", hibernateConfigurationProperties.getC3p0().getMaxSize());
+    configuration.setProperty("hibernate.c3p0.timeout", hibernateConfigurationProperties.getC3p0().getTimeout());
+    configuration.setProperty("hibernate.c3p0.max_statements", hibernateConfigurationProperties.getC3p0().getMaxStatements());
+    configuration.setProperty("hibernate.hbm2ddl.auto", hibernateConfigurationProperties.getHbm2ddl().getAuto());
 
     ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()
         .applySettings(configuration.getProperties()).build();
@@ -146,10 +138,42 @@ public SessionFactory getSessionFactory() throws TrustStoreConfigurationExceptio
     return sessionFactory;
   }
 
+  /**
+   * Set the application context.
+   *
+   * @param applicationContext the application context
+   * @throws BeansException if a beans exception occurs
+   */
+  @Override
+  public void setApplicationContext(@NonNull ApplicationContext applicationContext) throws BeansException {
+    this.applicationContext = applicationContext;
+  }
+
+  /**
+   * This method performs the initializing tasks for the application.
+   *
+   * @param truststoreConfigurationProperties The properties.
+   * @throws CustomTruststoreAppender.TrustStoreConfigurationException In case a problem occurred with the truststore.
+   */
+  static void initializeApplication(TruststoreConfigurationProperties truststoreConfigurationProperties)
+      throws CustomTruststoreAppender.TrustStoreConfigurationException {
+
+    // Load the trust store file.
+    if (StringUtils.isNotEmpty(truststoreConfigurationProperties.getPath()) && StringUtils
+        .isNotEmpty(truststoreConfigurationProperties.getPassword())) {
+      CustomTruststoreAppender
+          .appendCustomTruststoreToDefault(truststoreConfigurationProperties.getPath(),
+              truststoreConfigurationProperties.getPassword());
+      LOGGER.info("Custom truststore appended to default truststore");
+    }
+  }
+
   @Override
   public void addCorsMappings(CorsRegistry registry) {
+    MetisAuthenticationConfigurationProperties metisAuthenticationConfigurationProperties =
+        applicationContext.getBean(MetisAuthenticationConfigurationProperties.class);
     registry.addMapping("/**").allowedMethods("GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS")
-            .allowedOrigins(allowedCorsHosts);
+            .allowedOrigins(metisAuthenticationConfigurationProperties.getAllowedCorsHosts());
   }
 
   /**
@@ -170,17 +194,21 @@ public AuthenticationService getAuthenticationService(PsqlMetisUserDao psqlMetis
    * Get the zoho access client.
    *
    * @param sessionFactory the session factory
+   * @param zohoConfigurationProperties the zoho configuration properties
    * @return the zoho access client
    * @throws ZohoException if a zoho configuration error occurred
    */
   @Bean
-  public ZohoAccessClient getZohoAccessClient(SessionFactory sessionFactory) throws ZohoException {
-    metisZohoOAuthPSQLHandler = new MetisZohoOAuthPSQLHandler(sessionFactory, zohoCurrentUserEmail, zohoRefreshToken,
-        zohoClientId, zohoClientSecret);
+  public ZohoAccessClient getZohoAccessClient(SessionFactory sessionFactory,
+      ZohoConfigurationProperties zohoConfigurationProperties) throws ZohoException {
+    metisZohoOAuthPSQLHandler = new MetisZohoOAuthPSQLHandler(sessionFactory, zohoConfigurationProperties.getCurrentUserEmail(),
+        zohoConfigurationProperties.getRefreshToken(),
+        zohoConfigurationProperties.getClientId(), zohoConfigurationProperties.getClientSecret());
 
     final ZohoAccessClient zohoAccessClient = new ZohoAccessClient(metisZohoOAuthPSQLHandler,
-        zohoCurrentUserEmail, zohoClientId, zohoClientSecret, zohoInitialGrantToken,
-        zohoRedirectUri);
+        zohoConfigurationProperties.getCurrentUserEmail(), zohoConfigurationProperties.getClientId(),
+        zohoConfigurationProperties.getClientSecret(), zohoConfigurationProperties.getInitialGrantToken(),
+        zohoConfigurationProperties.getRedirectUri());
     //Make a call to zoho so that the grant token will generate the first pair of access/refresh tokens
     zohoAccessClient.getZohoRecordContactByEmail("");
     return zohoAccessClient;
@@ -190,12 +218,15 @@ public ZohoAccessClient getZohoAccessClient(SessionFactory sessionFactory) throw
    * Get the DAO for metis users.
    *
    * @param sessionFactory the session factory required to initialize the DAO
+   * @param metisAuthenticationConfigurationProperties the metis authentication configuration properties
    * @return the DAO instance for accessing user information
    */
   @Bean
-  public PsqlMetisUserDao getPsqlMetisUserDao(SessionFactory sessionFactory) {
+  public PsqlMetisUserDao getPsqlMetisUserDao(SessionFactory sessionFactory,
+      MetisAuthenticationConfigurationProperties metisAuthenticationConfigurationProperties) {
     PsqlMetisUserDao psqlMetisUserDao = new PsqlMetisUserDao(sessionFactory);
-    psqlMetisUserDao.setAccessTokenExpireTimeInMins(metisAccessTokenExpireTimeInMins);
+    psqlMetisUserDao.setAccessTokenExpireTimeInMins(
+        metisAuthenticationConfigurationProperties.getAccessTokenExpireTimeInMinutes());
     return psqlMetisUserDao;
   }
 
diff --git a/metis-authentication/metis-authentication-rest/src/main/java/eu/europeana/metis/authentication/rest/config/properties/MetisAuthenticationConfigurationProperties.java b/metis-authentication/metis-authentication-rest/src/main/java/eu/europeana/metis/authentication/rest/config/properties/MetisAuthenticationConfigurationProperties.java
new file mode 100644
index 0000000000..2fe1de1086
--- /dev/null
+++ b/metis-authentication/metis-authentication-rest/src/main/java/eu/europeana/metis/authentication/rest/config/properties/MetisAuthenticationConfigurationProperties.java
@@ -0,0 +1,29 @@
+package eu.europeana.metis.authentication.rest.config.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Class using {@link ConfigurationProperties} loading.
+ */
+@ConfigurationProperties(prefix = "metis-authentication")
+public class MetisAuthenticationConfigurationProperties {
+
+  private int accessTokenExpireTimeInMinutes;
+  private String allowedCorsHosts;
+
+  public int getAccessTokenExpireTimeInMinutes() {
+    return accessTokenExpireTimeInMinutes;
+  }
+
+  public void setAccessTokenExpireTimeInMinutes(int accessTokenExpireTimeInMinutes) {
+    this.accessTokenExpireTimeInMinutes = accessTokenExpireTimeInMinutes;
+  }
+
+  public String getAllowedCorsHosts() {
+    return allowedCorsHosts;
+  }
+
+  public void setAllowedCorsHosts(String allowedCorsHosts) {
+    this.allowedCorsHosts = allowedCorsHosts;
+  }
+}
diff --git a/metis-authentication/metis-authentication-rest/src/main/java/eu/europeana/metis/authentication/rest/controller/AuthenticationController.java b/metis-authentication/metis-authentication-rest/src/main/java/eu/europeana/metis/authentication/rest/controller/AuthenticationController.java
index 7fb6f57100..b7793cb890 100644
--- a/metis-authentication/metis-authentication-rest/src/main/java/eu/europeana/metis/authentication/rest/controller/AuthenticationController.java
+++ b/metis-authentication/metis-authentication-rest/src/main/java/eu/europeana/metis/authentication/rest/controller/AuthenticationController.java
@@ -60,8 +60,8 @@ public AuthenticationController(
   /**
    * Register a user using an authorization header.
    *
-   * @param authorization the String provided by an HTTP Authorization header <p> The expected input
-   * should follow the rule Basic Base64Encoded(email:password) </p>
+   * @param authorization the String provided by an HTTP Authorization header <p> The expected input should follow the rule Basic
+   * Base64Encoded(email:password) </p>
    * @throws GenericMetisException which can be one of:
    * <ul>
    * <li>{@link BadContentException} if the authorization header is un-parsable or there is problem
@@ -84,8 +84,8 @@ public void registerUser(@RequestHeader("Authorization") String authorization)
   /**
    * Login functionality, which checks if the user with email exists and generates an access token.
    *
-   * @param authorization the String provided by an HTTP Authorization header <p> The expected input
-   * should follow the rule Basic Base64Encoded(email:password) </p>
+   * @param authorization the String provided by an HTTP Authorization header <p> The expected input should follow the rule Basic
+   * Base64Encoded(email:password) </p>
    * @return {@link MetisUserView}
    * @throws GenericMetisException which can be one of:
    * <ul>
@@ -112,8 +112,8 @@ public MetisUserView loginUser(@RequestHeader("Authorization") String authorizat
   /**
    * Update a users password by authentication with an access token.
    *
-   * @param authorization the String provided by an HTTP Authorization header <p> The expected input
-   * should follow the rule Bearer accessTokenHere </p>
+   * @param authorization the String provided by an HTTP Authorization header <p> The expected input should follow the rule Bearer
+   * accessTokenHere </p>
    * @param oldAndNewPasswordParameters contains the old and new password
    * @throws GenericMetisException which can be one of:
    * <ul>
@@ -133,7 +133,7 @@ public void updateUserPassword(@RequestHeader("Authorization") String authorizat
       throw new BadContentException("oldPassword or newPassword not provided");
     }
     if (oldAndNewPasswordParameters.getOldPassword()
-        .equals(oldAndNewPasswordParameters.getNewPassword())) {
+                                   .equals(oldAndNewPasswordParameters.getNewPassword())) {
       throw new BadContentException("newPassword must be different than oldPassword");
     }
     String accessToken = authenticationService
@@ -151,8 +151,8 @@ public void updateUserPassword(@RequestHeader("Authorization") String authorizat
   /**
    * Delete a user from the system.
    *
-   * @param authorization the String provided by an HTTP Authorization header <p> The expected input
-   * should follow the rule Bearer accessTokenHere </p>
+   * @param authorization the String provided by an HTTP Authorization header <p> The expected input should follow the rule Bearer
+   * accessTokenHere </p>
    * @param emailParameter the class that contains the email parameter to act upon
    * @throws GenericMetisException which can be one of:
    * <ul>
@@ -185,8 +185,8 @@ public void deleteUser(@RequestHeader("Authorization") String authorization,
   /**
    * Update a user by re-retrieving the user from the remote CRM.
    *
-   * @param authorization the String provided by an HTTP Authorization header <p> The expected input
-   * should follow the rule Bearer accessTokenHere </p>
+   * @param authorization the String provided by an HTTP Authorization header <p> The expected input should follow the rule Bearer
+   * accessTokenHere </p>
    * @param emailParameter the class that contains the email parameter to act upon
    * @return updated {@link MetisUserView}
    * @throws GenericMetisException which can be one of:
@@ -222,8 +222,8 @@ public MetisUserView updateUser(@RequestHeader("Authorization") String authoriza
   /**
    * Change the {@link AccountRole} of a user.
    *
-   * @param authorization the String provided by an HTTP Authorization header <p> The expected input
-   * should follow the rule Bearer accessTokenHere </p>
+   * @param authorization the String provided by an HTTP Authorization header <p> The expected input should follow the rule Bearer
+   * accessTokenHere </p>
    * @param emailParameter the class that contains the email parameter to act upon
    * @throws GenericMetisException which can be one of:
    * <ul>
@@ -257,8 +257,8 @@ public void updateUserToMakeAdmin(@RequestHeader("Authorization") String authori
    * Get a user using a user identifier.
    * <p>POST method is used to pass the user identifier through the body</p>
    *
-   * @param authorization the String provided by an HTTP Authorization header <p> The expected input
-   * should follow the rule Bearer accessTokenHere </p>
+   * @param authorization the String provided by an HTTP Authorization header <p> The expected input should follow the rule Bearer
+   * accessTokenHere </p>
    * @param userIdParameter the class that contains the userId parameter to act upon
    * @return the metis user
    * @throws GenericMetisException which can be one of:
@@ -284,8 +284,8 @@ public MetisUserView getUserByUserId(@RequestHeader("Authorization") String auth
   /**
    * Retrieve a user by using an access token.
    *
-   * @param authorization the String provided by an HTTP Authorization header <p> The expected input
-   * should follow the rule Bearer accessTokenHere </p>
+   * @param authorization the String provided by an HTTP Authorization header <p> The expected input should follow the rule Bearer
+   * accessTokenHere </p>
    * @return the corresponding {@link MetisUserView}
    * @throws GenericMetisException which can be one of:
    * <ul>
@@ -309,8 +309,8 @@ public MetisUserView getUserByAccessToken(@RequestHeader("Authorization") String
   /**
    * Retrieve a list of all the users in the system.
    *
-   * @param authorization the String provided by an HTTP Authorization header <p> The expected input
-   * should follow the rule Bearer accessTokenHere </p>
+   * @param authorization the String provided by an HTTP Authorization header <p> The expected input should follow the rule Bearer
+   * accessTokenHere </p>
    * @return the list with all the {@link MetisUserView}s
    * @throws GenericMetisException which can be one of:
    * <ul>
diff --git a/metis-authentication/metis-authentication-rest/src/main/resources/application.properties.example b/metis-authentication/metis-authentication-rest/src/main/resources/application.properties.example
index be0499d78b..12bf7d5027 100644
--- a/metis-authentication/metis-authentication-rest/src/main/resources/application.properties.example
+++ b/metis-authentication/metis-authentication-rest/src/main/resources/application.properties.example
@@ -1,20 +1,24 @@
-#Truststore configuration
-truststore.path=
+#Spring
+logging.config=/data/logging/log4j2.xml
+#logging.config=log4j2.xml
+server.error.whitelabel.enabled=false
+
+#Truststore
+truststore.path=/data/certificates/custom-truststore.jks
 truststore.password=
 
 #Zoho configuration
-#It's retrieved when registering the application on Zoho. It's one use only and every subsequent use shouldn't impact the application
-zoho.initial.grant.token=
-zoho.refresh.token=
-zoho.current.user.email=
-zoho.client.id=
-zoho.client.secret=
-zoho.redirect.uri=
+zoho.initialGrantToken=
+zoho.refreshToken=
+zoho.currentUserEmail=
+zoho.clientId=
+zoho.clientSecret=
+zoho.redirectUri=
 
 #Hibernate configuration
-hibernate.connection.driver_class=org.postgresql.Driver
-hibernate.connection.url=jdbc:
 hibernate.dialect=org.hibernate.dialect.PostgreSQL82Dialect
+hibernate.connection.driver_class=org.postgresql.Driver
+hibernate.connection.url=jdbc:postgresql://
 hibernate.connection.username=
 hibernate.connection.password=
 hibernate.c3p0.min_size=5
@@ -23,26 +27,23 @@ hibernate.c3p0.timeout=1800
 hibernate.c3p0.max_statements=50
 
 #Miscellaneus
-metis.access.token.expire.time.in.mins=10
-allowed.cors.hosts=*
+metis-authentication.accessTokenExpireTimeInMinutes=10
+metis-authentication.allowedCorsHosts=*
 
 #Actuator
 management.endpoint.health.probes.enabled=true
 management.health.livenessState.enabled=true
 management.health.readinessState.enabled=true
 
-#Logging
-logging.config=
-
 # Elastic APM
-elastic.apm.enabled=false
+elastic.apm.enabled=true
 elastic.apm.recording=true
 elastic.apm.instrument=true
 elastic.apm.service_name=metis-authentication
 elastic.apm.server_url=
-elastic.apm.environment=test
+elastic.apm.environment=local
 elastic.apm.application_packages=eu.europeana
 elastic.apm.log_level=ERROR
 elastic.apm.capture_body=all
 elastic.apm.capture_headers=true
-elastic.apm.metrics_interval=5s
\ No newline at end of file
+elastic.apm.metrics_interval=5s
diff --git a/metis-authentication/metis-authentication-service/pom.xml b/metis-authentication/metis-authentication-service/pom.xml
index 0d2525425f..1715e18314 100644
--- a/metis-authentication/metis-authentication-service/pom.xml
+++ b/metis-authentication/metis-authentication-service/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-authentication</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-authentication-service</artifactId>
 
diff --git a/metis-authentication/pom.xml b/metis-authentication/pom.xml
index 6e9669f9a6..eadec94c87 100644
--- a/metis-authentication/pom.xml
+++ b/metis-authentication/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-framework</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-authentication</artifactId>
   <packaging>pom</packaging>
diff --git a/metis-common/metis-common-base/pom.xml b/metis-common/metis-common-base/pom.xml
index d00f4b9fd0..cf45614ca5 100644
--- a/metis-common/metis-common-base/pom.xml
+++ b/metis-common/metis-common-base/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.europeana.metis</groupId>
     <artifactId>metis-common</artifactId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-common-base</artifactId>
 
diff --git a/metis-common/metis-common-mongo/pom.xml b/metis-common/metis-common-mongo/pom.xml
index 8ed299cf25..2c318e197c 100644
--- a/metis-common/metis-common-mongo/pom.xml
+++ b/metis-common/metis-common-mongo/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-common</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-common-mongo</artifactId>
 
diff --git a/metis-common/metis-common-mongo/src/main/java/eu/europeana/metis/mongo/dao/RecordDao.java b/metis-common/metis-common-mongo/src/main/java/eu/europeana/metis/mongo/dao/RecordDao.java
index c6bd4971f9..f4297b1a07 100644
--- a/metis-common/metis-common-mongo/src/main/java/eu/europeana/metis/mongo/dao/RecordDao.java
+++ b/metis-common/metis-common-mongo/src/main/java/eu/europeana/metis/mongo/dao/RecordDao.java
@@ -6,7 +6,7 @@
 import dev.morphia.Morphia;
 import dev.morphia.mapping.Mapper;
 import dev.morphia.mapping.MappingException;
-import dev.morphia.query.experimental.filters.Filters;
+import dev.morphia.query.filters.Filters;
 import eu.europeana.corelib.definitions.edm.beans.FullBean;
 import eu.europeana.corelib.edm.exceptions.MongoDBException;
 import eu.europeana.corelib.edm.exceptions.MongoRuntimeException;
diff --git a/metis-common/metis-common-mongo/src/main/java/eu/europeana/metis/mongo/dao/RecordRedirectDao.java b/metis-common/metis-common-mongo/src/main/java/eu/europeana/metis/mongo/dao/RecordRedirectDao.java
index ec8c51aab6..bbbe05fffb 100644
--- a/metis-common/metis-common-mongo/src/main/java/eu/europeana/metis/mongo/dao/RecordRedirectDao.java
+++ b/metis-common/metis-common-mongo/src/main/java/eu/europeana/metis/mongo/dao/RecordRedirectDao.java
@@ -6,7 +6,7 @@
 import dev.morphia.mapping.DiscriminatorFunction;
 import dev.morphia.mapping.MapperOptions;
 import dev.morphia.mapping.NamingStrategy;
-import dev.morphia.query.experimental.filters.Filters;
+import dev.morphia.query.filters.Filters;
 import eu.europeana.metis.mongo.model.RecordRedirect;
 import eu.europeana.metis.network.ExternalRequestUtil;
 import java.util.List;
diff --git a/metis-common/metis-common-mongo/src/main/java/eu/europeana/metis/mongo/utils/MorphiaUtils.java b/metis-common/metis-common-mongo/src/main/java/eu/europeana/metis/mongo/utils/MorphiaUtils.java
index 74a759eac9..6d2a83c472 100644
--- a/metis-common/metis-common-mongo/src/main/java/eu/europeana/metis/mongo/utils/MorphiaUtils.java
+++ b/metis-common/metis-common-mongo/src/main/java/eu/europeana/metis/mongo/utils/MorphiaUtils.java
@@ -1,7 +1,7 @@
 package eu.europeana.metis.mongo.utils;
 
-import dev.morphia.aggregation.experimental.Aggregation;
-import dev.morphia.aggregation.experimental.AggregationOptions;
+import dev.morphia.aggregation.Aggregation;
+import dev.morphia.aggregation.AggregationOptions;
 import dev.morphia.query.FindOptions;
 import dev.morphia.query.MorphiaCursor;
 import dev.morphia.query.Query;
diff --git a/metis-common/metis-common-mongo/src/test/java/eu/europeana/metis/mongo/utils/MorphiaUtilsTest.java b/metis-common/metis-common-mongo/src/test/java/eu/europeana/metis/mongo/utils/MorphiaUtilsTest.java
index 3ae709f0c5..4f20914577 100644
--- a/metis-common/metis-common-mongo/src/test/java/eu/europeana/metis/mongo/utils/MorphiaUtilsTest.java
+++ b/metis-common/metis-common-mongo/src/test/java/eu/europeana/metis/mongo/utils/MorphiaUtilsTest.java
@@ -1,7 +1,7 @@
 package eu.europeana.metis.mongo.utils;
 
-import static dev.morphia.query.experimental.filters.Filters.eq;
-import static dev.morphia.query.experimental.filters.Filters.or;
+import static dev.morphia.query.filters.Filters.eq;
+import static dev.morphia.query.filters.Filters.or;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -10,8 +10,8 @@
 import com.mongodb.client.model.Collation;
 import dev.morphia.Datastore;
 import dev.morphia.Morphia;
-import dev.morphia.aggregation.experimental.Aggregation;
-import dev.morphia.aggregation.experimental.AggregationOptions;
+import dev.morphia.aggregation.Aggregation;
+import dev.morphia.aggregation.AggregationOptions;
 import dev.morphia.annotations.Entity;
 import dev.morphia.annotations.Id;
 import dev.morphia.query.FindOptions;
@@ -199,4 +199,4 @@ public int hashCode() {
       return result;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/metis-common/metis-common-network/pom.xml b/metis-common/metis-common-network/pom.xml
index db63871a0e..55b0c054ce 100644
--- a/metis-common/metis-common-network/pom.xml
+++ b/metis-common/metis-common-network/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-common</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-common-network</artifactId>
 
diff --git a/metis-common/metis-common-network/src/main/java/eu/europeana/metis/network/AbstractHttpClient.java b/metis-common/metis-common-network/src/main/java/eu/europeana/metis/network/AbstractHttpClient.java
index e30d4144f7..6f64984829 100644
--- a/metis-common/metis-common-network/src/main/java/eu/europeana/metis/network/AbstractHttpClient.java
+++ b/metis-common/metis-common-network/src/main/java/eu/europeana/metis/network/AbstractHttpClient.java
@@ -27,10 +27,12 @@
 import org.apache.hc.client5.http.protocol.RedirectLocations;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.ProtocolException;
 import org.apache.hc.core5.util.TimeValue;
 import org.apache.hc.core5.util.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.ContentDisposition;
 
 /**
  * <p>
@@ -181,12 +183,21 @@ public void run() {
       final RedirectLocations redirectUris = context.getRedirectLocations();
       final URI actualUri = (redirectUris == null || redirectUris.size() == 0) ? httpGet.getUri()
               : redirectUris.get(redirectUris.size() - 1);
-
+      final ContentDisposition contentDisposition = Optional.ofNullable(responseObject).map( re -> {
+                try {
+                  return re.getHeader("Content-Disposition") != null ?
+                          ContentDisposition.parse(re.getHeader("Content-Disposition").getValue()) : null;
+                } catch (ProtocolException ex) {
+                  LOGGER.debug("No content-disposition header, nothing to do", ex);
+                  return null;
+                }
+              }
+      ).orElse(null);
       // Obtain the result (check for timeout just in case).
       final ContentRetriever contentRetriever = ContentRetriever.forNonCloseableContent(
               responseEntity == null ? InputStream::nullInputStream : responseEntity::getContent,
               closeables::add);
-      return createResult(link, actualUri, mimeType, fileSize, contentRetriever);
+      return createResult(link, actualUri, contentDisposition, mimeType, fileSize,  contentRetriever);
 
     } catch (URISyntaxException e) {
 
@@ -254,7 +265,7 @@ private static boolean httpCallIsSuccessful(int status) {
    * @return The resulting object.
    * @throws IOException In case a connection or other IO problem occurred.
    */
-  protected abstract R createResult(I providedLink, URI actualUri, String mimeType, Long fileSize,
+  protected abstract R createResult(I providedLink, URI actualUri, ContentDisposition contentDisposition, String mimeType, Long fileSize,
           ContentRetriever contentRetriever) throws IOException;
 
   @Override
diff --git a/metis-common/metis-common-network/src/main/java/eu/europeana/metis/network/StringHttpClient.java b/metis-common/metis-common-network/src/main/java/eu/europeana/metis/network/StringHttpClient.java
index 8f652fd23e..f9439bf7ee 100644
--- a/metis-common/metis-common-network/src/main/java/eu/europeana/metis/network/StringHttpClient.java
+++ b/metis-common/metis-common-network/src/main/java/eu/europeana/metis/network/StringHttpClient.java
@@ -6,6 +6,7 @@
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import org.apache.commons.io.IOUtils;
+import org.springframework.http.ContentDisposition;
 
 /**
  * An implementation of {@link AbstractHttpClient} that returns a String (assuming UTF-8 encoding).
@@ -31,8 +32,8 @@ protected String getResourceUrl(URI resourceEntry) {
   }
 
   @Override
-  protected StringContent createResult(URI providedLink, URI actualUri, String mimeType,
-          Long fileSize, ContentRetriever contentRetriever) throws IOException {
+  protected StringContent createResult(URI providedLink, URI actualUri, ContentDisposition contentDisposition,
+                                       String mimeType, Long fileSize, ContentRetriever contentRetriever) throws IOException {
     try (final InputStream inputStream = contentRetriever.getContent()) {
       return new StringContent(IOUtils.toString(inputStream, StandardCharsets.UTF_8), mimeType);
     }
diff --git a/metis-common/metis-common-network/src/test/java/eu/europeana/metis/network/StringHttpClientTest.java b/metis-common/metis-common-network/src/test/java/eu/europeana/metis/network/StringHttpClientTest.java
index 4181574f70..d59650de36 100644
--- a/metis-common/metis-common-network/src/test/java/eu/europeana/metis/network/StringHttpClientTest.java
+++ b/metis-common/metis-common-network/src/test/java/eu/europeana/metis/network/StringHttpClientTest.java
@@ -57,7 +57,7 @@ void createResult() throws URISyntaxException, IOException {
     final ContentRetriever contentRetriever = ContentRetriever.forNonCloseableContent(responseEntity::getContent,
         closeables::add);
 
-    StringContent actualContent = stringHttpClient.createResult(new URI("/resource/provided"), new URI("/resource/actual"),
+    StringContent actualContent = stringHttpClient.createResult(new URI("/resource/provided"), new URI("/resource/actual"), null,
         "text/plain", 7L, contentRetriever);
 
     assertEquals("content", actualContent.getContent());
@@ -71,7 +71,7 @@ void createResultWithException() throws IOException {
     when(contentRetriever.getContent()).thenThrow(IOException.class);
 
     assertThrows(IOException.class,
-        () -> stringHttpClient.createResult(new URI("/resource/provided"), new URI("/resource/actual"),
+        () -> stringHttpClient.createResult(new URI("/resource/provided"), new URI("/resource/actual"), null,
             "text/plain", 7L, contentRetriever));
   }
 
@@ -82,4 +82,4 @@ void stringContent() {
     assertEquals("content", stringContent.getContent());
     assertEquals("text/plain", stringContent.getContentType());
   }
-}
\ No newline at end of file
+}
diff --git a/metis-common/metis-common-solr/pom.xml b/metis-common/metis-common-solr/pom.xml
index 72a6a753d9..761f244fb4 100644
--- a/metis-common/metis-common-solr/pom.xml
+++ b/metis-common/metis-common-solr/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-common</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-common-solr</artifactId>
 
diff --git a/metis-common/metis-common-spring-properties/pom.xml b/metis-common/metis-common-spring-properties/pom.xml
new file mode 100644
index 0000000000..30634c7284
--- /dev/null
+++ b/metis-common/metis-common-spring-properties/pom.xml
@@ -0,0 +1,17 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>eu.europeana.metis</groupId>
+    <artifactId>metis-common</artifactId>
+    <version>11</version>
+  </parent>
+  <artifactId>metis-common-spring-properties</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot</artifactId>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/SocksProxyConfigurationProperties.java b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/SocksProxyConfigurationProperties.java
new file mode 100644
index 0000000000..5415640a13
--- /dev/null
+++ b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/SocksProxyConfigurationProperties.java
@@ -0,0 +1,56 @@
+package metis.common.config.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Class using {@link ConfigurationProperties} loading.
+ */
+@ConfigurationProperties(prefix = "socks-proxy")
+public class SocksProxyConfigurationProperties {
+
+  private boolean enabled;
+  private String host;
+  private String port;
+  private String username;
+  private String password;
+
+  public boolean isEnabled() {
+    return enabled;
+  }
+
+  public void setEnabled(boolean enabled) {
+    this.enabled = enabled;
+  }
+
+  public String getHost() {
+    return host;
+  }
+
+  public void setHost(String host) {
+    this.host = host;
+  }
+
+  public String getPort() {
+    return port;
+  }
+
+  public void setPort(String port) {
+    this.port = port;
+  }
+
+  public String getUsername() {
+    return username;
+  }
+
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  public String getPassword() {
+    return password;
+  }
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+}
diff --git a/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/TruststoreConfigurationProperties.java b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/TruststoreConfigurationProperties.java
new file mode 100644
index 0000000000..9ec4e1e0fc
--- /dev/null
+++ b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/TruststoreConfigurationProperties.java
@@ -0,0 +1,29 @@
+package metis.common.config.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Class using {@link ConfigurationProperties} loading.
+ */
+@ConfigurationProperties(prefix = "truststore")
+public class TruststoreConfigurationProperties {
+
+  private String path;
+  private String password;
+
+  public void setPath(String path) {
+    this.path = path;
+  }
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+  public String getPath() {
+    return path;
+  }
+
+  public String getPassword() {
+    return password;
+  }
+}
diff --git a/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/ecloud/EcloudConfigurationProperties.java b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/ecloud/EcloudConfigurationProperties.java
new file mode 100644
index 0000000000..f392b00c41
--- /dev/null
+++ b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/ecloud/EcloudConfigurationProperties.java
@@ -0,0 +1,56 @@
+package metis.common.config.properties.ecloud;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Class using {@link ConfigurationProperties} loading.
+ */
+@ConfigurationProperties(prefix = "ecloud")
+public class EcloudConfigurationProperties {
+
+  private String baseUrl;
+  private String dpsBaseUrl;
+  private String provider;
+  private String username;
+  private String password;
+
+  public String getBaseUrl() {
+    return baseUrl;
+  }
+
+  public void setBaseUrl(String baseUrl) {
+    this.baseUrl = baseUrl;
+  }
+
+  public String getDpsBaseUrl() {
+    return dpsBaseUrl;
+  }
+
+  public void setDpsBaseUrl(String dpsBaseUrl) {
+    this.dpsBaseUrl = dpsBaseUrl;
+  }
+
+  public String getProvider() {
+    return provider;
+  }
+
+  public void setProvider(String provider) {
+    this.provider = provider;
+  }
+
+  public String getUsername() {
+    return username;
+  }
+
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  public String getPassword() {
+    return password;
+  }
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+}
diff --git a/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/mongo/MetisCoreMongoConfigurationProperties.java b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/mongo/MetisCoreMongoConfigurationProperties.java
new file mode 100644
index 0000000000..462bba3bc1
--- /dev/null
+++ b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/mongo/MetisCoreMongoConfigurationProperties.java
@@ -0,0 +1,11 @@
+package metis.common.config.properties.mongo;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Class using {@link ConfigurationProperties} loading.
+ */
+@ConfigurationProperties(prefix = "metis-core.mongo")
+public class MetisCoreMongoConfigurationProperties extends MongoConfigurationProperties {
+
+}
diff --git a/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/mongo/MongoConfigurationProperties.java b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/mongo/MongoConfigurationProperties.java
new file mode 100644
index 0000000000..686cdeb4d6
--- /dev/null
+++ b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/mongo/MongoConfigurationProperties.java
@@ -0,0 +1,83 @@
+package metis.common.config.properties.mongo;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Class using {@link ConfigurationProperties} loading.
+ */
+@ConfigurationProperties(prefix = "mongo")
+public class MongoConfigurationProperties {
+
+    private String[] hosts;
+    private int[] ports;
+    private String username;
+    private String password;
+    private String authenticationDatabase;
+    private String database;
+    private boolean enableSsl;
+    private String applicationName;
+
+    public void setHosts(String[] hosts) {
+        this.hosts = hosts == null ? null : hosts.clone();
+    }
+
+    public void setPorts(int[] ports) {
+        this.ports = ports == null ? null : ports.clone();
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public void setAuthenticationDatabase(String authenticationDatabase) {
+        this.authenticationDatabase = authenticationDatabase;
+    }
+
+    public void setDatabase(String database) {
+        this.database = database;
+    }
+
+    public void setEnableSsl(boolean enableSsl) {
+        this.enableSsl = enableSsl;
+    }
+
+    public void setApplicationName(String applicationName) {
+        this.applicationName = applicationName;
+    }
+
+    public String[] getHosts() {
+        return hosts == null ? null : hosts.clone();
+    }
+
+    public int[] getPorts() {
+        return ports == null ? null : ports.clone();
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public String getAuthenticationDatabase() {
+        return authenticationDatabase;
+    }
+
+    public String getDatabase() {
+        return database;
+    }
+
+    public boolean isEnableSsl() {
+        return enableSsl;
+    }
+
+    public String getApplicationName() {
+        return applicationName;
+    }
+}
diff --git a/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/postgres/HibernateConfigurationProperties.java b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/postgres/HibernateConfigurationProperties.java
new file mode 100644
index 0000000000..c76791a4ee
--- /dev/null
+++ b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/postgres/HibernateConfigurationProperties.java
@@ -0,0 +1,141 @@
+package metis.common.config.properties.postgres;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Class using {@link ConfigurationProperties} loading.
+ */
+@ConfigurationProperties(prefix = "hibernate")
+public class HibernateConfigurationProperties {
+
+  private String dialect;
+  private Connection connection;
+  private C3p0 c3p0;
+  private Hbm2ddl hbm2ddl;
+
+  public String getDialect() {
+    return dialect;
+  }
+
+  public void setDialect(String dialect) {
+    this.dialect = dialect;
+  }
+
+  public Connection getConnection() {
+    return connection;
+  }
+
+  public void setConnection(Connection connection) {
+    this.connection = connection;
+  }
+
+  public C3p0 getC3p0() {
+    return c3p0;
+  }
+
+  public void setC3p0(C3p0 c3p0) {
+    this.c3p0 = c3p0;
+  }
+
+  public Hbm2ddl getHbm2ddl() {
+    return hbm2ddl;
+  }
+
+  public void setHbm2ddl(Hbm2ddl hbm2ddl) {
+    this.hbm2ddl = hbm2ddl;
+  }
+
+  public static class Connection {
+
+    private String driverClass;
+    private String url;
+    private String username;
+    private String password;
+
+    public void setDriverClass(String driverClass) {
+      this.driverClass = driverClass;
+    }
+
+    public void setUrl(String url) {
+      this.url = url;
+    }
+
+    public void setUsername(String username) {
+      this.username = username;
+    }
+
+    public void setPassword(String password) {
+      this.password = password;
+    }
+
+    public String getDriverClass() {
+      return driverClass;
+    }
+
+    public String getUrl() {
+      return url;
+    }
+
+    public String getUsername() {
+      return username;
+    }
+
+    public String getPassword() {
+      return password;
+    }
+  }
+
+  public static class C3p0 {
+
+    private String minSize;
+    private String maxSize;
+    private String timeout;
+    private String maxStatements;
+
+    public String getMinSize() {
+      return minSize;
+    }
+
+    public void setMinSize(String minSize) {
+      this.minSize = minSize;
+    }
+
+    public String getMaxSize() {
+      return maxSize;
+    }
+
+    public void setMaxSize(String maxSize) {
+      this.maxSize = maxSize;
+    }
+
+    public String getTimeout() {
+      return timeout;
+    }
+
+    public void setTimeout(String timeout) {
+      this.timeout = timeout;
+    }
+
+    public String getMaxStatements() {
+      return maxStatements;
+    }
+
+    public void setMaxStatements(String maxStatements) {
+      this.maxStatements = maxStatements;
+    }
+  }
+
+  public static class Hbm2ddl {
+
+    private String auto;
+
+    public String getAuto() {
+      return auto;
+    }
+
+    public void setAuto(String auto) {
+      this.auto = auto;
+    }
+  }
+}
+
diff --git a/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/rabbitmq/RabbitmqConfigurationProperties.java b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/rabbitmq/RabbitmqConfigurationProperties.java
new file mode 100644
index 0000000000..d109283def
--- /dev/null
+++ b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/rabbitmq/RabbitmqConfigurationProperties.java
@@ -0,0 +1,92 @@
+package metis.common.config.properties.rabbitmq;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Class using {@link ConfigurationProperties} loading.
+ */
+@ConfigurationProperties(prefix = "rabbitmq")
+public class RabbitmqConfigurationProperties {
+
+  private String host;
+  private int port;
+  private String username;
+  private String password;
+  private String virtualHost;
+  private String queueName;
+  private int highestPriority;
+  private boolean enableSsl;
+  private boolean enableCustomTruststore;
+
+  public String getHost() {
+    return host;
+  }
+
+  public void setHost(String host) {
+    this.host = host;
+  }
+
+  public int getPort() {
+    return port;
+  }
+
+  public void setPort(int port) {
+    this.port = port;
+  }
+
+  public String getUsername() {
+    return username;
+  }
+
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  public String getPassword() {
+    return password;
+  }
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+  public String getVirtualHost() {
+    return virtualHost;
+  }
+
+  public void setVirtualHost(String virtualHost) {
+    this.virtualHost = virtualHost;
+  }
+
+  public String getQueueName() {
+    return queueName;
+  }
+
+  public void setQueueName(String queueName) {
+    this.queueName = queueName;
+  }
+
+  public int getHighestPriority() {
+    return highestPriority;
+  }
+
+  public void setHighestPriority(int highestPriority) {
+    this.highestPriority = highestPriority;
+  }
+
+  public boolean isEnableSsl() {
+    return enableSsl;
+  }
+
+  public void setEnableSsl(boolean enableSsl) {
+    this.enableSsl = enableSsl;
+  }
+
+  public boolean isEnableCustomTruststore() {
+    return enableCustomTruststore;
+  }
+
+  public void setEnableCustomTruststore(boolean enableCustomTruststore) {
+    this.enableCustomTruststore = enableCustomTruststore;
+  }
+}
diff --git a/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/redis/RedisConfigurationProperties.java b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/redis/RedisConfigurationProperties.java
new file mode 100644
index 0000000000..eb5d687ef2
--- /dev/null
+++ b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/redis/RedisConfigurationProperties.java
@@ -0,0 +1,78 @@
+package metis.common.config.properties.redis;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.NestedConfigurationProperty;
+
+/**
+ * Class using {@link ConfigurationProperties} loading.
+ */
+@ConfigurationProperties(prefix = "redis")
+public class RedisConfigurationProperties {
+
+  private String host;
+  private String port;
+  private String username;
+  private String password;
+  private boolean enableSsl;
+  private boolean enableCustomTruststore;
+
+  @NestedConfigurationProperty
+  //Keep the name as is(zookeeper) for the spring mapping.
+  private RedissonConfigurationProperties redisson;
+
+  public String getHost() {
+    return host;
+  }
+
+  public void setHost(String host) {
+    this.host = host;
+  }
+
+  public String getPort() {
+    return port;
+  }
+
+  public void setPort(String port) {
+    this.port = port;
+  }
+
+  public String getUsername() {
+    return username;
+  }
+
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  public String getPassword() {
+    return password;
+  }
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+  public boolean isEnableSsl() {
+    return enableSsl;
+  }
+
+  public void setEnableSsl(boolean enableSsl) {
+    this.enableSsl = enableSsl;
+  }
+
+  public boolean isEnableCustomTruststore() {
+    return enableCustomTruststore;
+  }
+
+  public void setEnableCustomTruststore(boolean enableCustomTruststore) {
+    this.enableCustomTruststore = enableCustomTruststore;
+  }
+
+  public RedissonConfigurationProperties getRedisson() {
+    return redisson;
+  }
+
+  public void setRedisson(RedissonConfigurationProperties redisson) {
+    this.redisson = redisson;
+  }
+}
diff --git a/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/redis/RedissonConfigurationProperties.java b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/redis/RedissonConfigurationProperties.java
new file mode 100644
index 0000000000..02c5761040
--- /dev/null
+++ b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/redis/RedissonConfigurationProperties.java
@@ -0,0 +1,65 @@
+package metis.common.config.properties.redis;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Class using {@link ConfigurationProperties} loading.
+ */
+@ConfigurationProperties(prefix = "redisson")
+public class RedissonConfigurationProperties {
+
+  private int connectionPoolSize;
+  private int connectTimeoutInSeconds;
+  private int lockWatchdogTimeoutInSeconds;
+  private int dnsMonitorIntervalInSeconds;
+  private int idleConnectionTimeoutInSeconds;
+  private int retryAttempts;
+
+  public int getConnectionPoolSize() {
+    return connectionPoolSize;
+  }
+
+  public void setConnectionPoolSize(int connectionPoolSize) {
+    this.connectionPoolSize = connectionPoolSize;
+  }
+
+  public int getConnectTimeoutInSeconds() {
+    return connectTimeoutInSeconds;
+  }
+
+  public void setConnectTimeoutInSeconds(int connectTimeoutInSeconds) {
+    this.connectTimeoutInSeconds = connectTimeoutInSeconds;
+  }
+
+  public int getLockWatchdogTimeoutInSeconds() {
+    return lockWatchdogTimeoutInSeconds;
+  }
+
+  public void setLockWatchdogTimeoutInSeconds(int lockWatchdogTimeoutInSeconds) {
+    this.lockWatchdogTimeoutInSeconds = lockWatchdogTimeoutInSeconds;
+  }
+
+  public int getDnsMonitorIntervalInSeconds() {
+    return dnsMonitorIntervalInSeconds;
+  }
+
+  public void setDnsMonitorIntervalInSeconds(int dnsMonitorIntervalInSeconds) {
+    this.dnsMonitorIntervalInSeconds = dnsMonitorIntervalInSeconds;
+  }
+
+  public int getIdleConnectionTimeoutInSeconds() {
+    return idleConnectionTimeoutInSeconds;
+  }
+
+  public void setIdleConnectionTimeoutInSeconds(int idleConnectionTimeoutInSeconds) {
+    this.idleConnectionTimeoutInSeconds = idleConnectionTimeoutInSeconds;
+  }
+
+  public int getRetryAttempts() {
+    return retryAttempts;
+  }
+
+  public void setRetryAttempts(int retryAttempts) {
+    this.retryAttempts = retryAttempts;
+  }
+}
diff --git a/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/solr/PublishSolrZookeeperConfigurationProperties.java b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/solr/PublishSolrZookeeperConfigurationProperties.java
new file mode 100644
index 0000000000..c26da10394
--- /dev/null
+++ b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/solr/PublishSolrZookeeperConfigurationProperties.java
@@ -0,0 +1,12 @@
+package metis.common.config.properties.solr;
+
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Class using {@link ConfigurationProperties} loading.
+ */
+@ConfigurationProperties(prefix = "publish.solr")
+public class PublishSolrZookeeperConfigurationProperties extends SolrZookeeperConfigurationProperties {
+
+}
diff --git a/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/solr/SolrZookeeperConfigurationProperties.java b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/solr/SolrZookeeperConfigurationProperties.java
new file mode 100644
index 0000000000..fc0bf8b3f1
--- /dev/null
+++ b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/solr/SolrZookeeperConfigurationProperties.java
@@ -0,0 +1,34 @@
+package metis.common.config.properties.solr;
+
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.NestedConfigurationProperty;
+
+/**
+ * Class using {@link ConfigurationProperties} loading.
+ */
+@ConfigurationProperties(prefix = "solr")
+public class SolrZookeeperConfigurationProperties {
+
+  private String[] hosts;
+
+  @NestedConfigurationProperty
+  //Keep the name as is(zookeeper) for the spring mapping.
+  private ZookeeperConfigurationProperties zookeeper;
+
+  public String[] getHosts() {
+    return hosts == null ? null : hosts.clone();
+  }
+
+  public void setHosts(String[] hosts) {
+    this.hosts = hosts == null ? null : hosts.clone();
+  }
+
+  public ZookeeperConfigurationProperties getZookeeper() {
+    return zookeeper;
+  }
+
+  public void setZookeeper(ZookeeperConfigurationProperties zookeeper) {
+    this.zookeeper = zookeeper;
+  }
+}
diff --git a/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/solr/ZookeeperConfigurationProperties.java b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/solr/ZookeeperConfigurationProperties.java
new file mode 100644
index 0000000000..c41f129ef1
--- /dev/null
+++ b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/solr/ZookeeperConfigurationProperties.java
@@ -0,0 +1,47 @@
+package metis.common.config.properties.solr;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Class using {@link ConfigurationProperties} loading.
+ */
+@ConfigurationProperties(prefix = "zookeeper")
+public class ZookeeperConfigurationProperties {
+
+    private String[] hosts;
+    private int[] ports;
+    private String chroot;
+    private String defaultCollection;
+
+    public void setHosts(String[] hosts) {
+        this.hosts = hosts == null ? null : hosts.clone();
+    }
+
+    public void setPorts(int[] ports) {
+        this.ports = ports == null ? null : ports.clone();
+    }
+
+    public void setChroot(String chroot) {
+        this.chroot = chroot;
+    }
+
+    public void setDefaultCollection(String defaultCollection) {
+        this.defaultCollection = defaultCollection;
+    }
+
+    public String[] getHosts() {
+        return hosts == null ? null : hosts.clone();
+    }
+
+    public int[] getPorts() {
+        return ports == null ? null : ports.clone();
+    }
+
+    public String getChroot() {
+        return chroot;
+    }
+
+    public String getDefaultCollection() {
+        return defaultCollection;
+    }
+}
diff --git a/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/validation/ValidationConfigurationProperties.java b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/validation/ValidationConfigurationProperties.java
new file mode 100644
index 0000000000..9cee6e0068
--- /dev/null
+++ b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/validation/ValidationConfigurationProperties.java
@@ -0,0 +1,65 @@
+package metis.common.config.properties.validation;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Class using {@link ConfigurationProperties} loading.
+ */
+@ConfigurationProperties(prefix = "validation")
+public class ValidationConfigurationProperties {
+
+  private String validationExternalSchemaZip;
+  private String validationExternalSchemaRoot;
+  private String validationExternalSchematronRoot;
+  private String validationInternalSchemaZip;
+  private String validationInternalSchemaRoot;
+  private String validationInternalSchematronRoot;
+
+  public String getValidationExternalSchemaZip() {
+    return validationExternalSchemaZip;
+  }
+
+  public void setValidationExternalSchemaZip(String validationExternalSchemaZip) {
+    this.validationExternalSchemaZip = validationExternalSchemaZip;
+  }
+
+  public String getValidationExternalSchemaRoot() {
+    return validationExternalSchemaRoot;
+  }
+
+  public void setValidationExternalSchemaRoot(String validationExternalSchemaRoot) {
+    this.validationExternalSchemaRoot = validationExternalSchemaRoot;
+  }
+
+  public String getValidationExternalSchematronRoot() {
+    return validationExternalSchematronRoot;
+  }
+
+  public void setValidationExternalSchematronRoot(String validationExternalSchematronRoot) {
+    this.validationExternalSchematronRoot = validationExternalSchematronRoot;
+  }
+
+  public String getValidationInternalSchemaZip() {
+    return validationInternalSchemaZip;
+  }
+
+  public void setValidationInternalSchemaZip(String validationInternalSchemaZip) {
+    this.validationInternalSchemaZip = validationInternalSchemaZip;
+  }
+
+  public String getValidationInternalSchemaRoot() {
+    return validationInternalSchemaRoot;
+  }
+
+  public void setValidationInternalSchemaRoot(String validationInternalSchemaRoot) {
+    this.validationInternalSchemaRoot = validationInternalSchemaRoot;
+  }
+
+  public String getValidationInternalSchematronRoot() {
+    return validationInternalSchematronRoot;
+  }
+
+  public void setValidationInternalSchematronRoot(String validationInternalSchematronRoot) {
+    this.validationInternalSchematronRoot = validationInternalSchematronRoot;
+  }
+}
diff --git a/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/zoho/ZohoConfigurationProperties.java b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/zoho/ZohoConfigurationProperties.java
new file mode 100644
index 0000000000..b347c3b2d9
--- /dev/null
+++ b/metis-common/metis-common-spring-properties/src/main/java/metis/common/config/properties/zoho/ZohoConfigurationProperties.java
@@ -0,0 +1,65 @@
+package metis.common.config.properties.zoho;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Class using {@link ConfigurationProperties} loading.
+ */
+@ConfigurationProperties(prefix = "zoho")
+public class ZohoConfigurationProperties {
+
+  private String initialGrantToken;
+  private String refreshToken;
+  private String currentUserEmail;
+  private String clientId;
+  private String clientSecret;
+  private String redirectUri;
+
+  public String getInitialGrantToken() {
+    return initialGrantToken;
+  }
+
+  public void setInitialGrantToken(String initialGrantToken) {
+    this.initialGrantToken = initialGrantToken;
+  }
+
+  public String getRefreshToken() {
+    return refreshToken;
+  }
+
+  public void setRefreshToken(String refreshToken) {
+    this.refreshToken = refreshToken;
+  }
+
+  public String getCurrentUserEmail() {
+    return currentUserEmail;
+  }
+
+  public void setCurrentUserEmail(String currentUserEmail) {
+    this.currentUserEmail = currentUserEmail;
+  }
+
+  public String getClientId() {
+    return clientId;
+  }
+
+  public void setClientId(String clientId) {
+    this.clientId = clientId;
+  }
+
+  public String getClientSecret() {
+    return clientSecret;
+  }
+
+  public void setClientSecret(String clientSecret) {
+    this.clientSecret = clientSecret;
+  }
+
+  public String getRedirectUri() {
+    return redirectUri;
+  }
+
+  public void setRedirectUri(String redirectUri) {
+    this.redirectUri = redirectUri;
+  }
+}
diff --git a/metis-common/metis-common-utils/pom.xml b/metis-common/metis-common-utils/pom.xml
index 463f1c2ca5..dbfa183330 100644
--- a/metis-common/metis-common-utils/pom.xml
+++ b/metis-common/metis-common-utils/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-common</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-common-utils</artifactId>
 
diff --git a/metis-common/metis-common-utils/src/main/java/eu/europeana/metis/utils/CompressedFileExtension.java b/metis-common/metis-common-utils/src/main/java/eu/europeana/metis/utils/CompressedFileExtension.java
index a9869238b4..d4372902bb 100644
--- a/metis-common/metis-common-utils/src/main/java/eu/europeana/metis/utils/CompressedFileExtension.java
+++ b/metis-common/metis-common-utils/src/main/java/eu/europeana/metis/utils/CompressedFileExtension.java
@@ -21,6 +21,11 @@ public enum CompressedFileExtension {
    **/
   GZIP(".gz"),
 
+  /**
+   * TAR files (only tar files)
+   */
+  TAR(".tar"),
+
   /**
    * Tarred GZIP files.
    **/
diff --git a/metis-common/metis-common-utils/src/main/java/eu/europeana/metis/utils/CompressedFileHandler.java b/metis-common/metis-common-utils/src/main/java/eu/europeana/metis/utils/CompressedFileHandler.java
index 94affaf476..1b136923b7 100644
--- a/metis-common/metis-common-utils/src/main/java/eu/europeana/metis/utils/CompressedFileHandler.java
+++ b/metis-common/metis-common-utils/src/main/java/eu/europeana/metis/utils/CompressedFileHandler.java
@@ -1,6 +1,5 @@
 package eu.europeana.metis.utils;
 
-import static eu.europeana.metis.utils.SonarqubeNullcheckAvoidanceUtils.performFunction;
 import static eu.europeana.metis.utils.TempFileUtils.createSecureTempFile;
 
 import java.io.BufferedInputStream;
@@ -14,15 +13,15 @@
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import org.apache.commons.compress.archivers.ArchiveEntry;
 import org.apache.commons.compress.archivers.ArchiveInputStream;
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
@@ -64,6 +63,9 @@ public static void extractFile(final Path compressedFile, final Path destination
       case GZIP:
         extractGzFile(compressedFile, destinationFolder);
         break;
+      case TAR:
+        extractTarFile(compressedFile, destinationFolder);
+        break;
       case TGZIP:
       case TAR_GZ:
         extractTarGzFile(compressedFile, destinationFolder);
@@ -148,7 +150,7 @@ private static void extractZipFile(final Path compressedFile, final Path destina
 
   private static void extractTarGzFile(final Path compressedFile, final Path destinationFolder) throws IOException {
 
-    Set<Path> nestedCompressedFiles;
+    Set<Path> nestedCompressedFiles = new HashSet<>();
 
     try (InputStream fi = Files.newInputStream(compressedFile);
         BufferedInputStream bi = new BufferedInputStream(fi);
@@ -159,17 +161,13 @@ private static void extractTarGzFile(final Path compressedFile, final Path desti
       while ((entry = ti.getNextEntry()) != null) {
         // create a new path, protect against malicious zip files
         Path newPath = zipSlipVulnerabilityProtect(entry.getName(), destinationFolder);
+        if (CompressedFileExtension.hasCompressedFileExtension(entry.getName())) {
+          nestedCompressedFiles.add(destinationFolder.resolve(entry.getName()));
+        }
         extract(ti, entry, newPath);
       }
     }
-    final Path newDestination = CompressedFileExtension
-        .removeExtension(destinationFolder.resolve(compressedFile.getFileName()));
 
-    try (Stream<Path> nestedFilesStream = Files.walk(newDestination)) {
-      nestedCompressedFiles = performFunction(nestedFilesStream, stream -> stream
-          .filter(CompressedFileExtension::hasCompressedFileExtension)
-          .collect(Collectors.toSet()));
-    }
     for (Path file : nestedCompressedFiles) {
       extractFile(file, file.getParent());
     }
@@ -187,6 +185,25 @@ private static void extractGzFile(final Path compressedFile, final Path destinat
     }
   }
 
+  private static void extractTarFile(final Path compressedFile, final Path destinationFolder)
+      throws IOException {
+    final List<Path> nestedCompressedFiles = new ArrayList<>();
+    try (TarArchiveInputStream is = new TarArchiveInputStream(Files.newInputStream(compressedFile))) {
+      TarArchiveEntry entry;
+      while ((entry = is.getNextTarEntry()) != null) {
+        // create a new path, protect against malicious tar files
+        Path newPath = zipSlipVulnerabilityProtect(entry.getName(), destinationFolder);
+        if (CompressedFileExtension.hasCompressedFileExtension(entry.getName())) {
+          nestedCompressedFiles.add(destinationFolder.resolve(entry.getName()));
+        }
+        extract(is, entry, newPath);
+      }
+    }
+    for (Path nestedCompressedFile : nestedCompressedFiles) {
+      extractFile(nestedCompressedFile, nestedCompressedFile.getParent());
+    }
+  }
+
   private static void extract(ArchiveInputStream is, ArchiveEntry entry, Path newPath) throws IOException {
 
     if (entry.isDirectory()) {
diff --git a/metis-common/metis-common-utils/src/main/java/eu/europeana/metis/utils/CustomTruststoreAppender.java b/metis-common/metis-common-utils/src/main/java/eu/europeana/metis/utils/CustomTruststoreAppender.java
index 954a47bab1..1f2c404fb6 100644
--- a/metis-common/metis-common-utils/src/main/java/eu/europeana/metis/utils/CustomTruststoreAppender.java
+++ b/metis-common/metis-common-utils/src/main/java/eu/europeana/metis/utils/CustomTruststoreAppender.java
@@ -29,19 +29,19 @@ private CustomTruststoreAppender() {
   }
 
   /**
-   * Will append the provided truststore to the default trustore from the system.
+   * Will append the provided truststore to the default truststore from the system.
    *
-   * @param trustorePath the path to the truststore file
-   * @param trustorePassword the password to access the trustore file
-   * @throws TrustStoreConfigurationException if any issue arises during the appending of the custom trustore to the default
+   * @param path the path to the truststore file
+   * @param password the password to access the truststore file
+   * @throws TrustStoreConfigurationException if any issue arises during the appending of the custom truststore to the default
    */
-  public static void appendCustomTrustoreToDefault(String trustorePath, String trustorePassword)
+  public static void appendCustomTruststoreToDefault(String path, String password)
       throws TrustStoreConfigurationException {
 
     try {
       X509TrustManager defaultX509TrustManager = getDefaultX509TrustManager();
-      X509TrustManager customX509TrustManager = getCustomX509TrustManager(trustorePath,
-          trustorePassword);
+      X509TrustManager customX509TrustManager = getCustomX509TrustManager(path,
+          password);
 
       X509TrustManager mergedX509TrustManager = new CustomX509TrustManager(defaultX509TrustManager,
           customX509TrustManager);
@@ -54,6 +54,22 @@ public static void appendCustomTrustoreToDefault(String trustorePath, String tru
     }
   }
 
+  /**
+   * Will append the provided truststore to the default truststore from the system.
+   *
+   * @param path the path to the truststore file
+   * @param password the password to access the truststore file
+   * @throws TrustStoreConfigurationException if any issue arises during the appending of the custom truststore to the default
+   * @
+   * @deprecated Use {@link #appendCustomTruststoreToDefault(String, String)}
+   */
+  // TODO: 25/08/2023 Remove this when version >= 12-SNAPSHOT
+  @Deprecated(since = "11", forRemoval = true)
+  public static void appendCustomTrustoreToDefault(String path, String password)
+      throws TrustStoreConfigurationException {
+    CustomTruststoreAppender.appendCustomTruststoreToDefault(path, password);
+  }
+
   private static X509TrustManager getDefaultX509TrustManager()
       throws NoSuchAlgorithmException, KeyStoreException {
     TrustManagerFactory trustManagerFactory = TrustManagerFactory
diff --git a/metis-common/metis-common-utils/src/test/java/eu/europeana/metis/utils/CustomTruststoreAppenderTest.java b/metis-common/metis-common-utils/src/test/java/eu/europeana/metis/utils/CustomTruststoreAppenderTest.java
index bf3390e3be..a43a445b10 100644
--- a/metis-common/metis-common-utils/src/test/java/eu/europeana/metis/utils/CustomTruststoreAppenderTest.java
+++ b/metis-common/metis-common-utils/src/test/java/eu/europeana/metis/utils/CustomTruststoreAppenderTest.java
@@ -20,7 +20,7 @@ class CustomTruststoreAppenderTest {
   void appendCustomTrustoreToDefault() throws URISyntaxException {
     final String customTruststorePath = Paths.get(this.getClass().getClassLoader().getResource("custom.jks").toURI()).toString();
     assertDoesNotThrow(() ->
-        CustomTruststoreAppender.appendCustomTrustoreToDefault(customTruststorePath, "europeana")
+        CustomTruststoreAppender.appendCustomTruststoreToDefault(customTruststorePath, "europeana")
     );
   }
 
@@ -28,7 +28,7 @@ void appendCustomTrustoreToDefault() throws URISyntaxException {
   void appendCustomTrustoreToDefaultException() throws URISyntaxException {
     final String customTruststorePath = Paths.get(this.getClass().getClassLoader().getResource("custom.jks").toURI()).toString();
     assertThrows(TrustStoreConfigurationException.class, () ->
-        CustomTruststoreAppender.appendCustomTrustoreToDefault(customTruststorePath, "euro")
+        CustomTruststoreAppender.appendCustomTruststoreToDefault(customTruststorePath, "euro")
     );
   }
 }
\ No newline at end of file
diff --git a/metis-common/metis-common-zoho/pom.xml b/metis-common/metis-common-zoho/pom.xml
index 41affd18c3..7761cad44b 100644
--- a/metis-common/metis-common-zoho/pom.xml
+++ b/metis-common/metis-common-zoho/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-common</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
 
   <artifactId>metis-common-zoho</artifactId>
diff --git a/metis-common/pom.xml b/metis-common/pom.xml
index a9b6a28048..b6620de533 100644
--- a/metis-common/pom.xml
+++ b/metis-common/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-framework</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-common</artifactId>
   <packaging>pom</packaging>
@@ -16,5 +16,6 @@
     <module>metis-common-solr</module>
     <module>metis-common-network</module>
     <module>metis-common-zoho</module>
+    <module>metis-common-spring-properties</module>
   </modules>
 </project>
\ No newline at end of file
diff --git a/metis-core/metis-core-common/pom.xml b/metis-core/metis-core-common/pom.xml
index 084264d9ad..63e1ebcae5 100644
--- a/metis-core/metis-core-common/pom.xml
+++ b/metis-core/metis-core-common/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-core</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-core-common</artifactId>
   <dependencies>
diff --git a/metis-core/metis-core-common/src/main/java/eu/europeana/metis/core/workflow/plugins/AbstractExecutablePlugin.java b/metis-core/metis-core-common/src/main/java/eu/europeana/metis/core/workflow/plugins/AbstractExecutablePlugin.java
index 142470a62d..f5f1f42dfb 100644
--- a/metis-core/metis-core-common/src/main/java/eu/europeana/metis/core/workflow/plugins/AbstractExecutablePlugin.java
+++ b/metis-core/metis-core-common/src/main/java/eu/europeana/metis/core/workflow/plugins/AbstractExecutablePlugin.java
@@ -87,8 +87,9 @@ public void setExecutionProgress(ExecutionProgress executionProgress) {
     this.executionProgress = executionProgress;
   }
 
+  // TODO: 24/08/2023 This last boolean needs to be cleaned.
   private Revision createOutputRevisionForExecution(String ecloudProvider, boolean published) {
-    return new Revision(getPluginType().name(), ecloudProvider, getStartedDate(), false, published, false);
+    return new Revision(getPluginType().name(), ecloudProvider, getStartedDate(), false);
   }
 
   private DpsTask createDpsTaskForPluginWithExistingDataset(Map<String, String> parameters,
diff --git a/metis-core/metis-core-rest/pom.xml b/metis-core/metis-core-rest/pom.xml
index 5e726932f1..9fed40bfe9 100644
--- a/metis-core/metis-core-rest/pom.xml
+++ b/metis-core/metis-core-rest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-core</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-core-rest</artifactId>
   <dependencies>
@@ -110,6 +110,11 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
     </dependency>
+    <dependency>
+      <groupId>eu.europeana.metis</groupId>
+      <artifactId>metis-common-spring-properties</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>eu.europeana.metis</groupId>
       <artifactId>metis-core-service</artifactId>
diff --git a/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/ApplicationConfiguration.java b/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/ApplicationConfiguration.java
index f079933a18..ddb7922490 100644
--- a/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/ApplicationConfiguration.java
+++ b/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/ApplicationConfiguration.java
@@ -2,6 +2,7 @@
 
 import com.mongodb.client.MongoClient;
 import eu.europeana.cloud.mcs.driver.DataSetServiceClient;
+import eu.europeana.corelib.web.socks.SocksProxy;
 import eu.europeana.metis.authentication.rest.client.AuthenticationClient;
 import eu.europeana.metis.core.dao.DatasetDao;
 import eu.europeana.metis.core.dao.DatasetXsltDao;
@@ -12,29 +13,46 @@
 import eu.europeana.metis.core.mongo.MorphiaDatastoreProvider;
 import eu.europeana.metis.core.mongo.MorphiaDatastoreProviderImpl;
 import eu.europeana.metis.core.rest.RequestLimits;
+import eu.europeana.metis.core.rest.config.properties.MetisCoreConfigurationProperties;
 import eu.europeana.metis.core.service.Authorizer;
 import eu.europeana.metis.core.service.DatasetService;
 import eu.europeana.metis.core.service.DepublishRecordIdService;
 import eu.europeana.metis.core.service.OrchestratorService;
+import eu.europeana.metis.mongo.connection.MongoClientProvider;
+import eu.europeana.metis.mongo.connection.MongoProperties;
+import eu.europeana.metis.mongo.connection.MongoProperties.ReadPreferenceValue;
 import eu.europeana.metis.mongo.utils.CustomObjectMapper;
+import eu.europeana.metis.utils.CustomTruststoreAppender;
 import eu.europeana.metis.utils.CustomTruststoreAppender.TrustStoreConfigurationException;
 import eu.europeana.metis.utils.apm.ElasticAPMConfiguration;
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import javax.annotation.PreDestroy;
+import metis.common.config.properties.SocksProxyConfigurationProperties;
+import metis.common.config.properties.TruststoreConfigurationProperties;
+import metis.common.config.properties.ecloud.EcloudConfigurationProperties;
+import metis.common.config.properties.mongo.MongoConfigurationProperties;
+import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RedissonClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.core.io.Resource;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter;
+import org.springframework.lang.NonNull;
 import org.springframework.web.multipart.support.StandardServletMultipartResolver;
 import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.View;
@@ -48,33 +66,100 @@
  * Entry class with configuration fields and beans initialization for the application.
  */
 @Configuration
-@Import({ElasticAPMConfiguration.class})
+@EnableConfigurationProperties({
+    ElasticAPMConfiguration.class, TruststoreConfigurationProperties.class,
+    SocksProxyConfigurationProperties.class, MongoConfigurationProperties.class,
+    MetisCoreConfigurationProperties.class, EcloudConfigurationProperties.class})
 @ComponentScan(basePackages = {"eu.europeana.metis.core.rest.controller"})
-public class ApplicationConfiguration implements WebMvcConfigurer {
+public class ApplicationConfiguration implements WebMvcConfigurer, ApplicationContextAware {
 
-  private final ConfigurationPropertiesHolder propertiesHolder;
+  private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   private final MongoClient mongoClient;
 
   @Value(value = "classpath:default_transformation.xslt")
   private Resource defaultTransformation;
+  private ApplicationContext applicationContext;
 
   /**
    * Autowired constructor for Spring Configuration class.
    *
-   * @param propertiesHolder the object that holds all boot configuration values
    * @throws TrustStoreConfigurationException if the configuration of the truststore failed
    */
   @Autowired
-  public ApplicationConfiguration(ConfigurationPropertiesHolder propertiesHolder)
+  public ApplicationConfiguration(TruststoreConfigurationProperties truststoreConfigurationProperties,
+      SocksProxyConfigurationProperties socksProxyConfigurationProperties,
+      MongoConfigurationProperties mongoConfigurationProperties)
       throws TrustStoreConfigurationException {
-    this.propertiesHolder = propertiesHolder;
-    this.mongoClient = ApplicationInitUtils.initializeApplication(propertiesHolder);
+    ApplicationConfiguration.initializeTruststore(truststoreConfigurationProperties);
+    ApplicationConfiguration.initializeSocksProxy(socksProxyConfigurationProperties);
+    this.mongoClient = ApplicationConfiguration.getMongoClient(mongoConfigurationProperties);
+  }
+
+  /**
+   * Set the application context.
+   *
+   * @param applicationContext the application context
+   * @throws BeansException if a beans exception occurs
+   */
+  @Override
+  public void setApplicationContext(@NonNull ApplicationContext applicationContext) throws BeansException {
+    this.applicationContext = applicationContext;
+  }
+
+
+  /**
+   * This method performs the initializing tasks for the application.
+   *
+   * @param truststoreConfigurationProperties The properties.
+   * @throws CustomTruststoreAppender.TrustStoreConfigurationException In case a problem occurred with the truststore.
+   */
+  static void initializeTruststore(TruststoreConfigurationProperties truststoreConfigurationProperties)
+      throws CustomTruststoreAppender.TrustStoreConfigurationException {
+    if (StringUtils.isNotEmpty(truststoreConfigurationProperties.getPath()) && StringUtils
+        .isNotEmpty(truststoreConfigurationProperties.getPassword())) {
+      CustomTruststoreAppender
+          .appendCustomTruststoreToDefault(truststoreConfigurationProperties.getPath(),
+              truststoreConfigurationProperties.getPassword());
+      LOGGER.info("Custom truststore appended to default truststore");
+    }
+  }
+
+  /**
+   * Socks proxy initializer.
+   *
+   * @param socksProxyConfigurationProperties the socks proxy configuration properties
+   */
+  static void initializeSocksProxy(SocksProxyConfigurationProperties socksProxyConfigurationProperties) {
+    if (socksProxyConfigurationProperties.isEnabled()) {
+      new SocksProxy(socksProxyConfigurationProperties.getHost(), socksProxyConfigurationProperties.getPort(),
+          socksProxyConfigurationProperties.getUsername(),
+          socksProxyConfigurationProperties.getPassword()).init();
+      LOGGER.info("Socks proxy enabled");
+    }
+  }
+
+  public static MongoClient getMongoClient(MongoConfigurationProperties mongoConfigurationProperties) {
+    final MongoProperties<IllegalArgumentException> mongoProperties = new MongoProperties<>(
+        IllegalArgumentException::new);
+    mongoProperties.setAllProperties(
+        mongoConfigurationProperties.getHosts(),
+        mongoConfigurationProperties.getPorts(),
+        mongoConfigurationProperties.getAuthenticationDatabase(),
+        mongoConfigurationProperties.getUsername(),
+        mongoConfigurationProperties.getPassword(),
+        mongoConfigurationProperties.isEnableSsl(),
+        ReadPreferenceValue.PRIMARY_PREFERRED,
+        mongoConfigurationProperties.getApplicationName());
+
+    return new MongoClientProvider<>(mongoProperties).createMongoClient();
   }
 
   @Override
   public void addCorsMappings(CorsRegistry registry) {
+    MetisCoreConfigurationProperties metisCoreConfigurationProperties =
+        applicationContext.getBean(MetisCoreConfigurationProperties.class);
     registry.addMapping("/**").allowedMethods("GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS")
-            .allowedOrigins(propertiesHolder.getAllowedCorsHosts());
+            .allowedOrigins(metisCoreConfigurationProperties.getAllowedCorsHosts());
   }
 
   @Bean(name = DispatcherServlet.MULTIPART_RESOLVER_BEAN_NAME)
@@ -83,13 +168,14 @@ public StandardServletMultipartResolver getMultipartResolver() {
   }
 
   @Bean
-  AuthenticationClient getAuthenticationClient() {
-    return new AuthenticationClient(propertiesHolder.getAuthenticationBaseUrl());
+  AuthenticationClient getAuthenticationClient(MetisCoreConfigurationProperties metisCoreConfigurationProperties) {
+    return new AuthenticationClient(metisCoreConfigurationProperties.getAuthenticationBaseUrl());
   }
 
   @Bean
-  MorphiaDatastoreProvider getMorphiaDatastoreProvider() throws IOException {
-    return new MorphiaDatastoreProviderImpl(mongoClient, propertiesHolder.getMongoDb(),
+  MorphiaDatastoreProvider getMorphiaDatastoreProvider(MongoConfigurationProperties mongoConfigurationProperties)
+      throws IOException {
+    return new MorphiaDatastoreProviderImpl(mongoClient, mongoConfigurationProperties.getDatabase(),
         defaultTransformation::getInputStream);
   }
 
@@ -106,11 +192,12 @@ Authorizer geAuthorizer(DatasetDao datasetDao) {
    * @return {@link DatasetDao} used to access the database for datasets
    */
   @Bean
-  public DatasetDao getDatasetDao(MorphiaDatastoreProvider morphiaDatastoreProvider,
-      DataSetServiceClient ecloudDataSetServiceClient) {
+  public DatasetDao getDatasetDao(
+      MorphiaDatastoreProvider morphiaDatastoreProvider, DataSetServiceClient ecloudDataSetServiceClient,
+      EcloudConfigurationProperties ecloudConfigurationProperties) {
     DatasetDao datasetDao = new DatasetDao(morphiaDatastoreProvider, ecloudDataSetServiceClient);
     datasetDao.setDatasetsPerRequest(RequestLimits.DATASETS_PER_REQUEST.getLimit());
-    datasetDao.setEcloudProvider(propertiesHolder.getEcloudProvider());
+    datasetDao.setEcloudProvider(ecloudConfigurationProperties.getProvider());
     return datasetDao;
   }
 
@@ -133,9 +220,10 @@ public DatasetXsltDao getXsltDao(MorphiaDatastoreProvider morphiaDatastoreProvid
    */
   @Bean
   public DepublishRecordIdDao getDepublishedRecordDao(
-      MorphiaDatastoreProvider morphiaDatastoreProvider) {
+      MorphiaDatastoreProvider morphiaDatastoreProvider,
+      MetisCoreConfigurationProperties metisCoreConfigurationProperties) {
     return new DepublishRecordIdDao(morphiaDatastoreProvider,
-        propertiesHolder.getMaxDepublishRecordIdsPerDataset());
+        metisCoreConfigurationProperties.getMaxDepublishRecordIdsPerDataset());
   }
 
   /**
@@ -152,13 +240,14 @@ public DepublishRecordIdDao getDepublishedRecordDao(
    * @return the dataset service instance instantiated
    */
   @Bean
-  public DatasetService getDatasetService(DatasetDao datasetDao, DatasetXsltDao datasetXsltDao,
+  public DatasetService getDatasetService(
+      DatasetDao datasetDao, DatasetXsltDao datasetXsltDao,
       WorkflowDao workflowDao, WorkflowExecutionDao workflowExecutionDao,
       ScheduledWorkflowDao scheduledWorkflowDao, RedissonClient redissonClient,
-      Authorizer authorizer) {
+      Authorizer authorizer, MetisCoreConfigurationProperties metisCoreConfigurationProperties) {
     DatasetService datasetService = new DatasetService(datasetDao, datasetXsltDao, workflowDao,
         workflowExecutionDao, scheduledWorkflowDao, redissonClient, authorizer);
-    datasetService.setMetisCoreUrl(propertiesHolder.getMetisCoreBaseUrl());
+    datasetService.setMetisCoreUrl(metisCoreConfigurationProperties.getBaseUrl());
     return datasetService;
   }
 
diff --git a/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/ApplicationInitUtils.java b/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/ApplicationInitUtils.java
deleted file mode 100644
index cc900f2e79..0000000000
--- a/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/ApplicationInitUtils.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package eu.europeana.metis.core.rest.config;
-
-import com.mongodb.client.MongoClient;
-import eu.europeana.corelib.web.socks.SocksProxy;
-import eu.europeana.metis.mongo.connection.MongoClientProvider;
-import eu.europeana.metis.utils.CustomTruststoreAppender;
-import eu.europeana.metis.utils.CustomTruststoreAppender.TrustStoreConfigurationException;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This class is responsible for performing initializing tasks for the application.
- */
-final class ApplicationInitUtils {
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationInitUtils.class);
-
-  private ApplicationInitUtils() {
-  }
-
-  /**
-   * This method performs the initializing tasks for the application.
-   * @param propertiesHolder The properties.
-   * @return The Mongo client that can be used to access the mongo database.
-   * @throws TrustStoreConfigurationException In case a problem occurred with the truststore.
-   */
-  static MongoClient initializeApplication(ConfigurationPropertiesHolder propertiesHolder)
-      throws TrustStoreConfigurationException {
-
-    // Load the trust store file.
-    if (StringUtils.isNotEmpty(propertiesHolder.getTruststorePath()) && StringUtils
-        .isNotEmpty(propertiesHolder.getTruststorePassword())) {
-      CustomTruststoreAppender
-          .appendCustomTrustoreToDefault(propertiesHolder.getTruststorePath(),
-              propertiesHolder.getTruststorePassword());
-      LOGGER.info("Custom truststore appended to default truststore");
-    }
-
-    // Initialize the socks proxy.
-    if (propertiesHolder.isSocksProxyEnabled()) {
-      new SocksProxy(propertiesHolder.getSocksProxyHost(), propertiesHolder.getSocksProxyPort(),
-          propertiesHolder
-              .getSocksProxyUsername(),
-          propertiesHolder.getSocksProxyPassword()).init();
-      LOGGER.info("Socks proxy enabled");
-    }
-
-    // Initialize the Mongo connection
-    return new MongoClientProvider<>(propertiesHolder.getMongoProperties()).createMongoClient();
-  }
-}
diff --git a/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/ConfigurationPropertiesHolder.java b/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/ConfigurationPropertiesHolder.java
deleted file mode 100644
index 5c060ce110..0000000000
--- a/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/ConfigurationPropertiesHolder.java
+++ /dev/null
@@ -1,404 +0,0 @@
-package eu.europeana.metis.core.rest.config;
-
-import eu.europeana.metis.core.workflow.ValidationProperties;
-import eu.europeana.metis.mongo.connection.MongoProperties;
-import eu.europeana.metis.mongo.connection.MongoProperties.ReadPreferenceValue;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.stereotype.Component;
-
-/**
- * Class that is used to read all configuration properties for the application.
- * <p>
- * It uses {@link PropertySource} to identify the properties on application startup
- * </p>
- */
-@Component
-public class ConfigurationPropertiesHolder {
-
-  //Orchestration
-  @Value("${max.concurrent.threads}")
-  private int maxConcurrentThreads;
-  @Value("${dps.monitor.check.interval.in.secs}")
-  private int dpsMonitorCheckIntervalInSecs;
-  @Value("${dps.connect.timeout.in.millisecs}")
-  private int dpsConnectTimeoutInMillisecs;
-  @Value("${dps.read.timeout.in.millisecs}")
-  private int dpsReadTimeoutInMillisecs;
-  @Value("${failsafe.margin.of.inactivity.in.secs}")
-  private int failsafeMarginOfInactivityInSecs;
-  @Value("${periodic.failsafe.check.in.millisecs}")
-  private int periodicFailsafeCheckInMillisecs;
-  @Value("${periodic.scheduler.check.in.millisecs}")
-  private int periodicSchedulerCheckInMillisecs;
-  @Value("${polling.timeout.for.cleaning.completion.service.in.millisecs}")
-  private int pollingTimeoutForCleaningCompletionServiceInMillisecs;
-  @Value("${period.of.no.processed.records.change.in.minutes}")
-  private int periodOfNoProcessedRecordsChangeInMinutes;
-  @Value("${thread.limit.throttling.level.weak}")
-  private int threadLimitThrottlingLevelWeak;
-  @Value("${thread.limit.throttling.level.medium}")
-  private int threadLimitThrottlingLevelMedium;
-  @Value("${thread.limit.throttling.level.strong}")
-  private int threadLimitThrottlingLevelStrong;
-
-  //Redis
-  @Value("${redis.host}")
-  private String redisHost;
-  @Value("${redis.port}")
-  private int redisPort;
-  @Value("${redis.username}")
-  private String redisUsername;
-  @Value("${redis.password}")
-  private String redisPassword;
-  @Value("${redis.enableSSL}")
-  private boolean redisEnableSSL;
-  @Value("${redis.enable.custom.truststore}")
-  private boolean redisEnableCustomTruststore;
-  @Value("${redisson.connection.pool.size}")
-  private int redissonConnectionPoolSize;
-  @Value("${redisson.lock.watchdog.timeout.in.secs}")
-  private int redissonLockWatchdogTimeoutInSecs;
-  @Value("${redisson.connect.timeout.in.millisecs}")
-  private int redissonConnectTimeoutInMillisecs;
-  @Value("${redisson.dns.monitor.interval.in.millisecs}")
-  private int redissonDnsMonitorIntervalInMillisecs;
-  @Value("${redisson.idle.connection.timeout.in.millisecs}")
-  private int redissonIdleConnectionTimeoutInMillisecs;
-  @Value("${redisson.retry.attempts}")
-  private int redissonRetryAttempts;
-
-  //RabbitMq
-  @Value("${rabbitmq.host}")
-  private String rabbitmqHost;
-  @Value("${rabbitmq.port}")
-  private int rabbitmqPort;
-  @Value("${rabbitmq.username}")
-  private String rabbitmqUsername;
-  @Value("${rabbitmq.password}")
-  private String rabbitmqPassword;
-  @Value("${rabbitmq.virtual.host}")
-  private String rabbitmqVirtualHost;
-  @Value("${rabbitmq.queue.name}")
-  private String rabbitmqQueueName;
-  @Value("${rabbitmq.highest.priority}")
-  private int rabbitmqHighestPriority;
-  @Value("${rabbitmq.enableSSL}")
-  private boolean rabbitmqEnableSSL;
-  @Value("${rabbitmq.enable.custom.truststore}")
-  private boolean rabbitmqEnableCustomTruststore;
-
-  // Metis core configuration
-  @Value("${metis.core.baseUrl}")
-  private String metisCoreBaseUrl;
-  @Value("${metis.core.max.served.execution.list.length}")
-  private int maxServedExecutionListLength;
-  @Value("${metis.core.max.depublish.record.ids.per.dataset}")
-  private int maxDepublishRecordIdsPerDataset;
-
-  // Ecloud configuration
-  @Value("${metis.link.checking.default.sampling.size}")
-  private int metisLinkCheckingDefaultSamplingSize;
-  @Value("${solr.commit.period.in.mins}")
-  private int solrCommitPeriodInMins;
-
-  // Socks proxy
-  @Value("${socks.proxy.enabled}")
-  private boolean socksProxyEnabled;
-  @Value("${socks.proxy.host}")
-  private String socksProxyHost;
-  @Value("${socks.proxy.port}")
-  private String socksProxyPort;
-  @Value("${socks.proxy.username}")
-  private String socksProxyUsername;
-  @Value("${socks.proxy.password}")
-  private String socksProxyPassword;
-
-  //Custom trustore
-  @Value("${truststore.path}")
-  private String truststorePath;
-  @Value("${truststore.password}")
-  private String truststorePassword;
-
-  //Mongo
-  @Value("${mongo.hosts}")
-  private String[] mongoHosts;
-  @Value("${mongo.port}")
-  private int[] mongoPorts;
-  @Value("${mongo.username}")
-  private String mongoUsername;
-  @Value("${mongo.password}")
-  private String mongoPassword;
-  @Value("${mongo.authentication.db}")
-  private String mongoAuthenticationDb;
-  @Value("${mongo.db}")
-  private String mongoDb;
-  @Value("${mongo.enableSSL}")
-  private boolean mongoEnableSSL;
-  @Value("${mongo.application.name}")
-  private String mongoApplicationName;
-
-  //Validation
-  @Value("${validation.internal.schema.zip}")
-  private String validationInternalSchemaZip;
-  @Value("${validation.internal.schema.root}")
-  private String validationInternalSchemaRoot;
-  @Value("${validation.internal.schematron.root}")
-  private String validationInternalSchematronRoot;
-  @Value("${validation.external.schema.zip}")
-  private String validationExternalSchemaZip;
-  @Value("${validation.external.schema.root}")
-  private String validationExternalSchemaRoot;
-  @Value("${validation.external.schematron.root}")
-  private String validationExternalSchematronRoot;
-
-  //Authentication
-  @Value("${authentication.baseUrl}")
-  private String authenticationBaseUrl;
-
-  // CORS
-  @Value("${allowed.cors.hosts}")
-  private String[] allowedCorsHosts;
-
-  // ECloud access
-  @Value("${ecloud.baseUrl}")
-  private String ecloudBaseUrl;
-  @Value("${ecloud.dps.baseUrl}")
-  private String ecloudDpsBaseUrl;
-  @Value("${ecloud.provider}")
-  private String ecloudProvider;
-  @Value("${ecloud.username}")
-  private String ecloudUsername;
-  @Value("${ecloud.password}")
-  private String ecloudPassword;
-
-  public int getMaxConcurrentThreads() {
-    return maxConcurrentThreads;
-  }
-
-  public int getDpsMonitorCheckIntervalInSecs() {
-    return dpsMonitorCheckIntervalInSecs;
-  }
-
-  public int getDpsConnectTimeoutInMillisecs() {
-    return dpsConnectTimeoutInMillisecs;
-  }
-
-  public int getDpsReadTimeoutInMillisecs() {
-    return dpsReadTimeoutInMillisecs;
-  }
-
-  public int getFailsafeMarginOfInactivityInSecs() {
-    return failsafeMarginOfInactivityInSecs;
-  }
-
-  public int getPeriodicFailsafeCheckInMillisecs() {
-    return periodicFailsafeCheckInMillisecs;
-  }
-
-  public int getPeriodicSchedulerCheckInMillisecs() {
-    return periodicSchedulerCheckInMillisecs;
-  }
-
-  public int getPollingTimeoutForCleaningCompletionServiceInMillisecs() {
-    return pollingTimeoutForCleaningCompletionServiceInMillisecs;
-  }
-
-  public int getPeriodOfNoProcessedRecordsChangeInMinutes() {
-    return periodOfNoProcessedRecordsChangeInMinutes;
-  }
-
-  public int getThreadLimitThrottlingLevelWeak() {
-    return threadLimitThrottlingLevelWeak;
-  }
-
-  public int getThreadLimitThrottlingLevelMedium() {
-    return threadLimitThrottlingLevelMedium;
-  }
-
-  public int getThreadLimitThrottlingLevelStrong() {
-    return threadLimitThrottlingLevelStrong;
-  }
-
-  public String getRedisHost() {
-    return redisHost;
-  }
-
-  public int getRedisPort() {
-    return redisPort;
-  }
-
-  public String getRedisUsername() {
-    return redisUsername;
-  }
-
-  public String getRedisPassword() {
-    return redisPassword;
-  }
-
-  public boolean isRedisEnableSSL() {
-    return redisEnableSSL;
-  }
-
-  public boolean isRedisEnableCustomTruststore() {
-    return redisEnableCustomTruststore;
-  }
-
-  public int getRedissonConnectionPoolSize() {
-    return redissonConnectionPoolSize;
-  }
-
-  public int getRedissonLockWatchdogTimeoutInSecs() {
-    return redissonLockWatchdogTimeoutInSecs;
-  }
-
-  public int getRedissonConnectTimeoutInMillisecs() {
-    return redissonConnectTimeoutInMillisecs;
-  }
-
-  public int getRedissonDnsMonitorIntervalInMillisecs() {
-    return redissonDnsMonitorIntervalInMillisecs;
-  }
-
-  public int getRedissonIdleConnectionTimeoutInMillisecs() {
-    return redissonIdleConnectionTimeoutInMillisecs;
-  }
-
-  public int getRedissonRetryAttempts() {
-    return redissonRetryAttempts;
-  }
-
-  public String getRabbitmqHost() {
-    return rabbitmqHost;
-  }
-
-  public int getRabbitmqPort() {
-    return rabbitmqPort;
-  }
-
-  public String getRabbitmqUsername() {
-    return rabbitmqUsername;
-  }
-
-  public String getRabbitmqPassword() {
-    return rabbitmqPassword;
-  }
-
-  public String getRabbitmqVirtualHost() {
-    return rabbitmqVirtualHost;
-  }
-
-  public boolean isRabbitmqEnableSSL() {
-    return rabbitmqEnableSSL;
-  }
-
-  public boolean isRabbitmqEnableCustomTruststore() {
-    return rabbitmqEnableCustomTruststore;
-  }
-
-  public String getRabbitmqQueueName() {
-    return rabbitmqQueueName;
-  }
-
-  public int getRabbitmqHighestPriority() {
-    return rabbitmqHighestPriority;
-  }
-
-  public String getMetisCoreBaseUrl() {
-    return metisCoreBaseUrl;
-  }
-
-  public int getMaxServedExecutionListLength() {
-    return maxServedExecutionListLength;
-  }
-
-  public int getMaxDepublishRecordIdsPerDataset() {
-    return maxDepublishRecordIdsPerDataset;
-  }
-
-  public int getMetisLinkCheckingDefaultSamplingSize() {
-    return metisLinkCheckingDefaultSamplingSize;
-  }
-
-  public int getSolrCommitPeriodInMins() {
-    return solrCommitPeriodInMins;
-  }
-
-  public boolean isSocksProxyEnabled() {
-    return socksProxyEnabled;
-  }
-
-  public String getSocksProxyHost() {
-    return socksProxyHost;
-  }
-
-  public String getSocksProxyPort() {
-    return socksProxyPort;
-  }
-
-  public String getSocksProxyUsername() {
-    return socksProxyUsername;
-  }
-
-  public String getSocksProxyPassword() {
-    return socksProxyPassword;
-  }
-
-  public String getTruststorePath() {
-    return truststorePath;
-  }
-
-  public String getTruststorePassword() {
-    return truststorePassword;
-  }
-
-  public MongoProperties<IllegalArgumentException> getMongoProperties() {
-    final MongoProperties<IllegalArgumentException> mongoProperties = new MongoProperties<>(
-        IllegalArgumentException::new);
-    mongoProperties.setAllProperties(mongoHosts, mongoPorts, mongoAuthenticationDb, mongoUsername,
-        mongoPassword, mongoEnableSSL, ReadPreferenceValue.PRIMARY_PREFERRED, mongoApplicationName);
-    return mongoProperties;
-  }
-
-  public String getMongoDb() {
-    return mongoDb;
-  }
-
-  public String getAuthenticationBaseUrl() {
-    return authenticationBaseUrl;
-  }
-
-  public String[] getAllowedCorsHosts() {
-    return allowedCorsHosts == null ? null : allowedCorsHosts.clone();
-  }
-
-  public String getEcloudBaseUrl() {
-    return ecloudBaseUrl;
-  }
-
-  public String getEcloudDpsBaseUrl() {
-    return ecloudDpsBaseUrl;
-  }
-
-  public String getEcloudProvider() {
-    return ecloudProvider;
-  }
-
-  public String getEcloudUsername() {
-    return ecloudUsername;
-  }
-
-  public String getEcloudPassword() {
-    return ecloudPassword;
-  }
-
-  public ValidationProperties getValidationExternalProperties() {
-    return new ValidationProperties(validationExternalSchemaZip, validationExternalSchemaRoot,
-        validationExternalSchematronRoot);
-  }
-
-  public ValidationProperties getValidationInternalProperties() {
-    return new ValidationProperties(validationInternalSchemaZip, validationInternalSchemaRoot,
-        validationInternalSchematronRoot);
-  }
-}
diff --git a/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/ECloudConfig.java b/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/ECloudConfig.java
index 970f239b13..a99edd290c 100644
--- a/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/ECloudConfig.java
+++ b/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/ECloudConfig.java
@@ -5,8 +5,10 @@
 import eu.europeana.cloud.mcs.driver.DataSetServiceClient;
 import eu.europeana.cloud.mcs.driver.FileServiceClient;
 import eu.europeana.cloud.mcs.driver.RecordServiceClient;
+import eu.europeana.metis.core.rest.config.properties.MetisCoreConfigurationProperties;
 import javax.annotation.PreDestroy;
-import org.springframework.beans.factory.annotation.Autowired;
+import metis.common.config.properties.ecloud.EcloudConfigurationProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -19,68 +21,80 @@
  * @since 2017-11-22
  */
 @Configuration
+@EnableConfigurationProperties({
+    MetisCoreConfigurationProperties.class, EcloudConfigurationProperties.class})
 @ComponentScan(basePackages = {"eu.europeana.metis.core.rest.controller"})
 public class ECloudConfig implements WebMvcConfigurer {
 
-  private final ConfigurationPropertiesHolder propertiesHolder;
   private DataSetServiceClient dataSetServiceClient;
   private RecordServiceClient recordServiceClient;
   private FileServiceClient fileServiceClient;
   private DpsClient dpsClient;
   private UISClient uisClient;
 
-  /**
-   * Constructor.
-   *
-   * @param propertiesHolder Object containing the configuration properties.
-   */
-  @Autowired
-  public ECloudConfig(ConfigurationPropertiesHolder propertiesHolder) {
-    this.propertiesHolder = propertiesHolder;
-  }
 
   @Bean
-  DataSetServiceClient dataSetServiceClient() {
-    dataSetServiceClient = new DataSetServiceClient(propertiesHolder.getEcloudBaseUrl(),
-        propertiesHolder.getEcloudUsername(), propertiesHolder.getEcloudPassword(),
-        propertiesHolder.getDpsConnectTimeoutInMillisecs(),
-        propertiesHolder.getDpsReadTimeoutInMillisecs());
+  DataSetServiceClient dataSetServiceClient(
+      MetisCoreConfigurationProperties metisCoreConfigurationProperties,
+      EcloudConfigurationProperties ecloudConfigurationProperties) {
+    dataSetServiceClient = new DataSetServiceClient(
+        ecloudConfigurationProperties.getBaseUrl(),
+        ecloudConfigurationProperties.getUsername(),
+        ecloudConfigurationProperties.getPassword(),
+        metisCoreConfigurationProperties.getDpsConnectTimeoutInMilliseconds(),
+        metisCoreConfigurationProperties.getDpsReadTimeoutInMilliseconds());
     return dataSetServiceClient;
   }
 
   @Bean
-  RecordServiceClient recordServiceClient() {
-    recordServiceClient = new RecordServiceClient(propertiesHolder.getEcloudBaseUrl(),
-        propertiesHolder.getEcloudUsername(), propertiesHolder.getEcloudPassword(),
-        propertiesHolder.getDpsConnectTimeoutInMillisecs(),
-        propertiesHolder.getDpsReadTimeoutInMillisecs());
+  RecordServiceClient recordServiceClient(
+      MetisCoreConfigurationProperties metisCoreConfigurationProperties,
+      EcloudConfigurationProperties ecloudConfigurationProperties) {
+    recordServiceClient = new RecordServiceClient(
+        ecloudConfigurationProperties.getBaseUrl(),
+        ecloudConfigurationProperties.getUsername(),
+        ecloudConfigurationProperties.getPassword(),
+        metisCoreConfigurationProperties.getDpsConnectTimeoutInMilliseconds(),
+        metisCoreConfigurationProperties.getDpsReadTimeoutInMilliseconds());
     return recordServiceClient;
   }
 
   @Bean
-  FileServiceClient fileServiceClient() {
-    fileServiceClient = new FileServiceClient(propertiesHolder.getEcloudBaseUrl(),
-        propertiesHolder.getEcloudUsername(), propertiesHolder.getEcloudPassword(),
-        propertiesHolder.getDpsConnectTimeoutInMillisecs(),
-        propertiesHolder.getDpsReadTimeoutInMillisecs());
+  FileServiceClient fileServiceClient(
+      MetisCoreConfigurationProperties metisCoreConfigurationProperties,
+      EcloudConfigurationProperties ecloudConfigurationProperties) {
+    fileServiceClient = new FileServiceClient(
+        ecloudConfigurationProperties.getBaseUrl(),
+        ecloudConfigurationProperties.getUsername(),
+        ecloudConfigurationProperties.getPassword(),
+        metisCoreConfigurationProperties.getDpsConnectTimeoutInMilliseconds(),
+        metisCoreConfigurationProperties.getDpsReadTimeoutInMilliseconds());
     return fileServiceClient;
   }
 
   @Bean
-  DpsClient dpsClient() {
-    dpsClient = new DpsClient(propertiesHolder.getEcloudDpsBaseUrl(),
-        propertiesHolder.getEcloudUsername(), propertiesHolder.getEcloudPassword(),
-        propertiesHolder.getDpsConnectTimeoutInMillisecs(),
-        propertiesHolder.getDpsReadTimeoutInMillisecs());
+  DpsClient dpsClient(
+      MetisCoreConfigurationProperties metisCoreConfigurationProperties,
+      EcloudConfigurationProperties ecloudConfigurationProperties) {
+    dpsClient = new DpsClient(
+        ecloudConfigurationProperties.getDpsBaseUrl(),
+        ecloudConfigurationProperties.getUsername(),
+        ecloudConfigurationProperties.getPassword(),
+        metisCoreConfigurationProperties.getDpsConnectTimeoutInMilliseconds(),
+        metisCoreConfigurationProperties.getDpsReadTimeoutInMilliseconds());
     return dpsClient;
   }
 
   @Bean
-  UISClient uisClient() {
-    uisClient = new UISClient(propertiesHolder.getEcloudBaseUrl(),
-        propertiesHolder.getEcloudUsername(), propertiesHolder.getEcloudPassword(),
-        propertiesHolder.getDpsConnectTimeoutInMillisecs(),
-        propertiesHolder.getDpsReadTimeoutInMillisecs());
+  UISClient uisClient(
+      MetisCoreConfigurationProperties metisCoreConfigurationProperties,
+      EcloudConfigurationProperties ecloudConfigurationProperties) {
+    uisClient = new UISClient(
+        ecloudConfigurationProperties.getBaseUrl(),
+        ecloudConfigurationProperties.getUsername(),
+        ecloudConfigurationProperties.getPassword(),
+        metisCoreConfigurationProperties.getDpsConnectTimeoutInMilliseconds(),
+        metisCoreConfigurationProperties.getDpsReadTimeoutInMilliseconds());
     return uisClient;
   }
 
diff --git a/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/OrchestratorConfig.java b/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/OrchestratorConfig.java
index 31808d44c9..a38749289a 100644
--- a/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/OrchestratorConfig.java
+++ b/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/OrchestratorConfig.java
@@ -21,17 +21,25 @@
 import eu.europeana.metis.core.execution.WorkflowPostProcessor;
 import eu.europeana.metis.core.mongo.MorphiaDatastoreProvider;
 import eu.europeana.metis.core.rest.RequestLimits;
+import eu.europeana.metis.core.rest.config.properties.MetisCoreConfigurationProperties;
 import eu.europeana.metis.core.service.Authorizer;
 import eu.europeana.metis.core.service.OrchestratorService;
 import eu.europeana.metis.core.service.ProxiesService;
 import eu.europeana.metis.core.service.ScheduleWorkflowService;
 import eu.europeana.metis.core.service.WorkflowExecutionFactory;
+import eu.europeana.metis.core.workflow.ValidationProperties;
 import eu.europeana.metis.core.workflow.plugins.ThrottlingValues;
 import java.net.MalformedURLException;
 import java.nio.file.Paths;
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.PreDestroy;
+import metis.common.config.properties.TruststoreConfigurationProperties;
+import metis.common.config.properties.ecloud.EcloudConfigurationProperties;
+import metis.common.config.properties.rabbitmq.RabbitmqConfigurationProperties;
+import metis.common.config.properties.redis.RedisConfigurationProperties;
+import metis.common.config.properties.redis.RedissonConfigurationProperties;
+import metis.common.config.properties.validation.ValidationConfigurationProperties;
 import org.apache.commons.lang3.StringUtils;
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
@@ -39,8 +47,8 @@
 import org.redisson.config.SingleServerConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -55,64 +63,60 @@
  * @since 2017-11-22
  */
 @Configuration
+@EnableConfigurationProperties({
+    TruststoreConfigurationProperties.class, ValidationConfigurationProperties.class,
+    RedisConfigurationProperties.class, MetisCoreConfigurationProperties.class,
+    EcloudConfigurationProperties.class})
 @ComponentScan(basePackages = {"eu.europeana.metis.core.rest.controller"})
 @EnableScheduling
 public class OrchestratorConfig implements WebMvcConfigurer {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(OrchestratorConfig.class);
-
-  private final ConfigurationPropertiesHolder propertiesHolder;
   private SchedulerExecutor schedulerExecutor;
   private WorkflowExecutionMonitor workflowExecutionMonitor;
   private RedissonClient redissonClient;
 
-  /**
-   * Constructor with the required properties class.
-   *
-   * @param propertiesHolder the properties holder
-   */
-  @Autowired
-  public OrchestratorConfig(ConfigurationPropertiesHolder propertiesHolder) {
-    this.propertiesHolder = propertiesHolder;
-  }
-
   @Bean
-  RedissonClient getRedissonClient() throws MalformedURLException {
+  RedissonClient getRedissonClient(
+      TruststoreConfigurationProperties truststoreConfigurationProperties,
+      RedisConfigurationProperties redisConfigurationProperties)
+      throws MalformedURLException {
     Config config = new Config();
 
     SingleServerConfig singleServerConfig;
-    if (propertiesHolder.isRedisEnableSSL()) {
+    if (redisConfigurationProperties.isEnableSsl()) {
       singleServerConfig = config.useSingleServer().setAddress(String
-          .format("rediss://%s:%s", propertiesHolder.getRedisHost(),
-              propertiesHolder.getRedisPort()));
+          .format("rediss://%s:%s", redisConfigurationProperties.getHost(),
+              redisConfigurationProperties.getPort()));
       LOGGER.info("Redis enabled SSL");
-      if (propertiesHolder.isRedisEnableCustomTruststore()) {
+      if (redisConfigurationProperties.isEnableCustomTruststore()) {
         singleServerConfig
-            .setSslTruststore(Paths.get(propertiesHolder.getTruststorePath()).toUri().toURL());
-        singleServerConfig.setSslTruststorePassword(propertiesHolder.getTruststorePassword());
+            .setSslTruststore(Paths.get(truststoreConfigurationProperties.getPath()).toUri().toURL());
+        singleServerConfig.setSslTruststorePassword(truststoreConfigurationProperties.getPassword());
         LOGGER.info("Redis enabled SSL using custom Truststore");
       }
     } else {
       singleServerConfig = config.useSingleServer().setAddress(String
-          .format("redis://%s:%s", propertiesHolder.getRedisHost(),
-              propertiesHolder.getRedisPort()));
+          .format("redis://%s:%s", redisConfigurationProperties.getHost(),
+              redisConfigurationProperties.getPort()));
       LOGGER.info("Redis disabled SSL");
     }
-    if (StringUtils.isNotEmpty(propertiesHolder.getRedisUsername())) {
-      singleServerConfig.setUsername(propertiesHolder.getRedisUsername());
+    if (StringUtils.isNotEmpty(redisConfigurationProperties.getUsername())) {
+      singleServerConfig.setUsername(redisConfigurationProperties.getUsername());
     }
-    if (StringUtils.isNotEmpty(propertiesHolder.getRedisPassword())) {
-      singleServerConfig.setPassword(propertiesHolder.getRedisPassword());
+    if (StringUtils.isNotEmpty(redisConfigurationProperties.getPassword())) {
+      singleServerConfig.setPassword(redisConfigurationProperties.getPassword());
     }
 
-    singleServerConfig.setConnectionPoolSize(propertiesHolder.getRedissonConnectionPoolSize())
-                      .setConnectionMinimumIdleSize(propertiesHolder.getRedissonConnectionPoolSize())
-                      .setConnectTimeout(propertiesHolder.getRedissonConnectTimeoutInMillisecs())
-                      .setDnsMonitoringInterval(propertiesHolder.getRedissonDnsMonitorIntervalInMillisecs())
-                      .setIdleConnectionTimeout(propertiesHolder.getRedissonIdleConnectionTimeoutInMillisecs())
-                      .setRetryAttempts(propertiesHolder.getRedissonRetryAttempts());
-    config.setLockWatchdogTimeout(TimeUnit.SECONDS.toMillis(propertiesHolder
-        .getRedissonLockWatchdogTimeoutInSecs())); //Give some secs to unlock if connection lost, or if too long to unlock
+    RedissonConfigurationProperties redisson = redisConfigurationProperties.getRedisson();
+    singleServerConfig.setConnectionPoolSize(redisson.getConnectionPoolSize())
+                      .setConnectionMinimumIdleSize(redisson.getConnectionPoolSize())
+                      .setConnectTimeout((int) TimeUnit.SECONDS.toMillis(redisson.getConnectTimeoutInSeconds()))
+                      .setDnsMonitoringInterval((int) TimeUnit.SECONDS.toMillis(redisson.getDnsMonitorIntervalInSeconds()))
+                      .setIdleConnectionTimeout((int) TimeUnit.SECONDS.toMillis(redisson.getIdleConnectionTimeoutInSeconds()))
+                      .setRetryAttempts(redisson.getRetryAttempts());
+    //Give some secs to unlock if connection lost, or if too long to unlock
+    config.setLockWatchdogTimeout(TimeUnit.SECONDS.toMillis(redisson.getLockWatchdogTimeoutInSeconds()));
     redissonClient = Redisson.create(config);
     return redissonClient;
   }
@@ -123,26 +127,48 @@ public OrchestratorService getOrchestratorService(WorkflowDao workflowDao,
       DataEvolutionUtils dataEvolutionUtils, DatasetDao datasetDao,
       WorkflowExecutionFactory workflowExecutionFactory,
       WorkflowExecutorManager workflowExecutorManager, Authorizer authorizer,
-      DepublishRecordIdDao depublishRecordIdDao) {
+      DepublishRecordIdDao depublishRecordIdDao,
+      MetisCoreConfigurationProperties metisCoreConfigurationProperties) {
     OrchestratorService orchestratorService = new OrchestratorService(workflowExecutionFactory,
         workflowDao, workflowExecutionDao, workflowValidationUtils, dataEvolutionUtils, datasetDao,
         workflowExecutorManager, redissonClient, authorizer, depublishRecordIdDao);
-    orchestratorService.setSolrCommitPeriodInMins(propertiesHolder.getSolrCommitPeriodInMins());
+    orchestratorService.setSolrCommitPeriodInMins(metisCoreConfigurationProperties.getSolrCommitPeriodInMinutes());
     return orchestratorService;
   }
 
+  @Bean(name = "validationExternalProperties")
+  public ValidationProperties getValidationExternalProperties(
+      ValidationConfigurationProperties validationConfigurationProperties) {
+    return new ValidationProperties(
+        validationConfigurationProperties.getValidationExternalSchemaZip(),
+        validationConfigurationProperties.getValidationExternalSchemaRoot(),
+        validationConfigurationProperties.getValidationExternalSchematronRoot());
+  }
+
+  @Bean(name = "validationInternalProperties")
+  public ValidationProperties getValidationInternalProperties(
+      ValidationConfigurationProperties validationConfigurationProperties) {
+    return new ValidationProperties(
+        validationConfigurationProperties.getValidationInternalSchemaZip(),
+        validationConfigurationProperties.getValidationInternalSchemaRoot(),
+        validationConfigurationProperties.getValidationInternalSchematronRoot());
+  }
+
   @Bean
   public WorkflowExecutionFactory getWorkflowExecutionFactory(
+      @Qualifier("validationExternalProperties") ValidationProperties validationExternalProperties,
+      @Qualifier("validationInternalProperties") ValidationProperties validationInternalProperties,
       WorkflowExecutionDao workflowExecutionDao, DataEvolutionUtils dataEvolutionUtils,
-      DatasetXsltDao datasetXsltDao, DepublishRecordIdDao depublishRecordIdDao) {
+      DatasetXsltDao datasetXsltDao, DepublishRecordIdDao depublishRecordIdDao,
+      MetisCoreConfigurationProperties metisCoreConfigurationProperties) {
     WorkflowExecutionFactory workflowExecutionFactory = new WorkflowExecutionFactory(datasetXsltDao,
         depublishRecordIdDao, workflowExecutionDao, dataEvolutionUtils);
     workflowExecutionFactory
-        .setValidationExternalProperties(propertiesHolder.getValidationExternalProperties());
+        .setValidationExternalProperties(validationExternalProperties);
     workflowExecutionFactory
-        .setValidationInternalProperties(propertiesHolder.getValidationInternalProperties());
+        .setValidationInternalProperties(validationInternalProperties);
     workflowExecutionFactory.setDefaultSamplingSizeForLinkChecking(
-        propertiesHolder.getMetisLinkCheckingDefaultSamplingSize());
+        metisCoreConfigurationProperties.getLinkCheckingDefaultSamplingSize());
     return workflowExecutionFactory;
   }
 
@@ -154,11 +180,13 @@ public ScheduleWorkflowService getScheduleWorkflowService(
   }
 
   @Bean
-  public ProxiesService getProxiesService(WorkflowExecutionDao workflowExecutionDao,
-      DataSetServiceClient ecloudDataSetServiceClient, RecordServiceClient recordServiceClient,
-      FileServiceClient fileServiceClient, DpsClient dpsClient, UISClient uisClient, Authorizer authorizer) {
+  public ProxiesService getProxiesService(
+      WorkflowExecutionDao workflowExecutionDao, DataSetServiceClient ecloudDataSetServiceClient,
+      RecordServiceClient recordServiceClient, FileServiceClient fileServiceClient,
+      DpsClient dpsClient, UISClient uisClient, Authorizer authorizer,
+      EcloudConfigurationProperties ecloudConfigurationProperties) {
     return new ProxiesService(workflowExecutionDao, ecloudDataSetServiceClient, recordServiceClient,
-        fileServiceClient, dpsClient, uisClient, propertiesHolder.getEcloudProvider(), authorizer);
+        fileServiceClient, dpsClient, uisClient, ecloudConfigurationProperties.getProvider(), authorizer);
   }
 
   /**
@@ -183,8 +211,9 @@ public WorkflowPostProcessor workflowPostProcessor(DepublishRecordIdDao depublis
    * @return the semaphore plugin manager
    */
   @Bean
-  public SemaphoresPerPluginManager semaphoresPerPluginManager() {
-    return new SemaphoresPerPluginManager(propertiesHolder.getMaxConcurrentThreads());
+  public SemaphoresPerPluginManager semaphoresPerPluginManager(
+      MetisCoreConfigurationProperties metisCoreConfigurationProperties) {
+    return new SemaphoresPerPluginManager(metisCoreConfigurationProperties.getMaxConcurrentThreads());
   }
 
   @Bean
@@ -193,30 +222,34 @@ public WorkflowExecutorManager getWorkflowExecutorManager(
       WorkflowExecutionDao workflowExecutionDao, WorkflowPostProcessor workflowPostProcessor,
       @Qualifier("rabbitmqPublisherChannel") Channel rabbitmqPublisherChannel,
       @Qualifier("rabbitmqConsumerChannel") Channel rabbitmqConsumerChannel,
-      RedissonClient redissonClient, DpsClient dpsClient) {
+      RedissonClient redissonClient, DpsClient dpsClient,
+      RabbitmqConfigurationProperties rabbitmqConfigurationProperties,
+      MetisCoreConfigurationProperties metisCoreConfigurationProperties,
+      EcloudConfigurationProperties ecloudConfigurationProperties) {
     WorkflowExecutorManager workflowExecutorManager = new WorkflowExecutorManager(
         semaphoresPerPluginManager, workflowExecutionDao, workflowPostProcessor,
         rabbitmqPublisherChannel, rabbitmqConsumerChannel, redissonClient, dpsClient);
-    workflowExecutorManager.setRabbitmqQueueName(propertiesHolder.getRabbitmqQueueName());
+    workflowExecutorManager.setRabbitmqQueueName(rabbitmqConfigurationProperties.getQueueName());
     workflowExecutorManager
-        .setDpsMonitorCheckIntervalInSecs(propertiesHolder.getDpsMonitorCheckIntervalInSecs());
+        .setDpsMonitorCheckIntervalInSecs(metisCoreConfigurationProperties.getDpsMonitorCheckIntervalInSeconds());
     workflowExecutorManager.setPeriodOfNoProcessedRecordsChangeInMinutes(
-        propertiesHolder.getPeriodOfNoProcessedRecordsChangeInMinutes());
-    workflowExecutorManager.setEcloudBaseUrl(propertiesHolder.getEcloudBaseUrl());
-    workflowExecutorManager.setEcloudProvider(propertiesHolder.getEcloudProvider());
-    workflowExecutorManager.setMetisCoreBaseUrl(propertiesHolder.getMetisCoreBaseUrl());
-    workflowExecutorManager.setThrottlingValues(getThrottlingValues());
+        metisCoreConfigurationProperties.getPeriodOfNoProcessedRecordsChangeInMinutes());
+    workflowExecutorManager.setEcloudBaseUrl(ecloudConfigurationProperties.getBaseUrl());
+    workflowExecutorManager.setEcloudProvider(ecloudConfigurationProperties.getProvider());
+    workflowExecutorManager.setMetisCoreBaseUrl(metisCoreConfigurationProperties.getBaseUrl());
+    workflowExecutorManager.setThrottlingValues(getThrottlingValues(metisCoreConfigurationProperties));
     return workflowExecutorManager;
   }
 
   @Bean
   public WorkflowExecutionDao getWorkflowExecutionDao(
-      MorphiaDatastoreProvider morphiaDatastoreProvider) {
+      MorphiaDatastoreProvider morphiaDatastoreProvider,
+      MetisCoreConfigurationProperties metisCoreConfigurationProperties) {
     WorkflowExecutionDao workflowExecutionDao = new WorkflowExecutionDao(morphiaDatastoreProvider);
     workflowExecutionDao
         .setWorkflowExecutionsPerRequest(RequestLimits.WORKFLOW_EXECUTIONS_PER_REQUEST.getLimit());
     workflowExecutionDao
-        .setMaxServedExecutionListLength(propertiesHolder.getMaxServedExecutionListLength());
+        .setMaxServedExecutionListLength(metisCoreConfigurationProperties.getMaxServedExecutionListLength());
     return workflowExecutionDao;
   }
 
@@ -245,15 +278,15 @@ public WorkflowDao getWorkflowDao(MorphiaDatastoreProvider morphiaDatastoreProvi
   @Bean
   public WorkflowExecutionMonitor getWorkflowExecutionMonitor(
       WorkflowExecutorManager workflowExecutorManager, WorkflowExecutionDao workflowExecutionDao,
-      RedissonClient redissonClient) {
+      RedissonClient redissonClient, MetisCoreConfigurationProperties metisCoreConfigurationProperties) {
 
     // Computes the leniency for the failsafe action: how long ago (worst case) can the last update
     // time have been set before we assume the execution hangs.
     final Duration failsafeLeniency = Duration.ZERO
-        .plusMillis(propertiesHolder.getDpsConnectTimeoutInMillisecs())
-        .plusMillis(propertiesHolder.getDpsReadTimeoutInMillisecs())
-        .plusSeconds(propertiesHolder.getDpsMonitorCheckIntervalInSecs())
-        .plusSeconds(propertiesHolder.getFailsafeMarginOfInactivityInSecs());
+        .plusMillis(metisCoreConfigurationProperties.getDpsConnectTimeoutInMilliseconds())
+        .plusMillis(metisCoreConfigurationProperties.getDpsReadTimeoutInMilliseconds())
+        .plusSeconds(metisCoreConfigurationProperties.getDpsMonitorCheckIntervalInSeconds())
+        .plusSeconds(metisCoreConfigurationProperties.getFailsafeMarginOfInactivityInSeconds());
 
     // Create and return the workflow execution monitor.
     workflowExecutionMonitor = new WorkflowExecutionMonitor(workflowExecutorManager,
@@ -270,20 +303,19 @@ public SchedulerExecutor getSchedulingExecutor(OrchestratorService orchestratorS
   }
 
   @Bean
-  public ThrottlingValues getThrottlingValues() {
-    return new ThrottlingValues(propertiesHolder.getThreadLimitThrottlingLevelWeak(),
-        propertiesHolder.getThreadLimitThrottlingLevelMedium(),
-        propertiesHolder.getThreadLimitThrottlingLevelStrong());
+  public ThrottlingValues getThrottlingValues(MetisCoreConfigurationProperties metisCoreConfigurationProperties) {
+    return new ThrottlingValues(metisCoreConfigurationProperties.getThreadLimitThrottlingLevelWeak(),
+        metisCoreConfigurationProperties.getThreadLimitThrottlingLevelMedium(),
+        metisCoreConfigurationProperties.getThreadLimitThrottlingLevelStrong());
   }
 
   /**
    * Failsafe periodic thread.
    * <p>It will find stale executions and will re-submit them in the distributed queue.</p>
    */
-  @Scheduled(fixedDelayString = "${periodic.failsafe.check.in.millisecs}")
+  // TODO: 24/08/2023 Is there a better way to load the configuration here?
+  @Scheduled(fixedDelayString = "${metis-core.periodicFailsafeCheckInMilliseconds}")
   public void runFailsafeExecutor() {
-    LOGGER.info("Failsafe task started (runs every {} milliseconds).",
-        propertiesHolder.getPeriodicFailsafeCheckInMillisecs());
     this.workflowExecutionMonitor.performFailsafe();
     LOGGER.info("Failsafe task finished.");
   }
@@ -293,10 +325,11 @@ public void runFailsafeExecutor() {
    * <p>Checks if scheduled workflows are valid for starting and sends them to the distributed
    * queue.</p>
    */
-  @Scheduled(fixedDelayString = "${periodic.scheduler.check.in.millisecs}", initialDelayString = "${periodic.scheduler.check.in.millisecs}")
+  // TODO: 24/08/2023 Is there a better way to load the configuration here?
+  @Scheduled(
+      fixedDelayString = "${metis-core.periodicSchedulerCheckInMilliseconds}",
+      initialDelayString = "${metis-core.periodicSchedulerCheckInMilliseconds}")
   public void runSchedulingExecutor() {
-    LOGGER.info("Scheduler task started (runs every {} milliseconds).",
-        propertiesHolder.getPeriodicSchedulerCheckInMillisecs());
     this.schedulerExecutor.performScheduling();
     LOGGER.info("Scheduler task finished.");
   }
diff --git a/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/QueueConfig.java b/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/QueueConfig.java
index 6d8dc71770..f38ad88797 100644
--- a/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/QueueConfig.java
+++ b/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/QueueConfig.java
@@ -24,11 +24,13 @@
 import javax.annotation.PreDestroy;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManagerFactory;
+import metis.common.config.properties.TruststoreConfigurationProperties;
+import metis.common.config.properties.rabbitmq.RabbitmqConfigurationProperties;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -37,51 +39,41 @@
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
+@EnableConfigurationProperties({RabbitmqConfigurationProperties.class, TruststoreConfigurationProperties.class})
 @ComponentScan(basePackages = {"eu.europeana.metis.core.rest.controller"})
 @EnableScheduling
 public class QueueConfig implements WebMvcConfigurer {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(QueueConfig.class);
-
-  private final ConfigurationPropertiesHolder propertiesHolder;
   private QueueConsumer queueConsumer;
 
   private Connection connection;
   private Channel publisherChannel;
   private Channel consumerChannel;
 
-  /**
-   * Constructor with the required properties class.
-   *
-   * @param propertiesHolder the properties holder
-   */
-  @Autowired
-  public QueueConfig(ConfigurationPropertiesHolder propertiesHolder) {
-    this.propertiesHolder = propertiesHolder;
-  }
-
   @Bean
-  Connection getConnection()
+  Connection getConnection(RabbitmqConfigurationProperties rabbitmqConfigurationProperties,
+      TruststoreConfigurationProperties truststoreConfigurationProperties)
       throws KeyManagementException, NoSuchAlgorithmException, IOException, TimeoutException, KeyStoreException, CertificateException {
     ConnectionFactory connectionFactory = new ConnectionFactory();
-    connectionFactory.setHost(propertiesHolder.getRabbitmqHost());
-    connectionFactory.setPort(propertiesHolder.getRabbitmqPort());
+    connectionFactory.setHost(rabbitmqConfigurationProperties.getHost());
+    connectionFactory.setPort(rabbitmqConfigurationProperties.getPort());
     connectionFactory.setVirtualHost(
-        StringUtils.isNotBlank(propertiesHolder.getRabbitmqVirtualHost()) ? propertiesHolder
-            .getRabbitmqVirtualHost() : "/");
-    connectionFactory.setUsername(propertiesHolder.getRabbitmqUsername());
-    connectionFactory.setPassword(propertiesHolder.getRabbitmqPassword());
+        StringUtils.isNotBlank(rabbitmqConfigurationProperties.getVirtualHost()) ? rabbitmqConfigurationProperties
+            .getVirtualHost() : "/");
+    connectionFactory.setUsername(rabbitmqConfigurationProperties.getUsername());
+    connectionFactory.setPassword(rabbitmqConfigurationProperties.getPassword());
     connectionFactory.setAutomaticRecoveryEnabled(true);
-    if (propertiesHolder.isRabbitmqEnableSSL()) {
-      if (propertiesHolder.isRabbitmqEnableCustomTruststore()) {
+    if (rabbitmqConfigurationProperties.isEnableSsl()) {
+      if (rabbitmqConfigurationProperties.isEnableCustomTruststore()) {
         // Load the ssl context with the provided truststore
         final KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
         // This file is determined in the config files, it does not pose a risk.
         @SuppressWarnings("findsecbugs:PATH_TRAVERSAL_IN")
         final Path trustStoreFile = Paths.get(
-            propertiesHolder.getTruststorePath());
+            truststoreConfigurationProperties.getPath());
         try (final InputStream inputStream = Files.newInputStream(trustStoreFile)) {
-          keyStore.load(inputStream, propertiesHolder.getTruststorePassword().toCharArray());
+          keyStore.load(inputStream, truststoreConfigurationProperties.getPassword().toCharArray());
         }
         TrustManagerFactory trustManagerFactory = TrustManagerFactory
             .getInstance(TrustManagerFactory.getDefaultAlgorithm());
@@ -104,42 +96,47 @@ Connection getConnection()
   }
 
   @Bean(name = "rabbitmqPublisherChannel")
-  Channel getRabbitmqPublisherChannel(Connection connection) throws IOException {
+  Channel getRabbitmqPublisherChannel(Connection connection, RabbitmqConfigurationProperties rabbitmqConfigurationProperties)
+      throws IOException {
     publisherChannel = connection.createChannel();
-    setupChannelProperties(publisherChannel);
+    setupChannelProperties(publisherChannel, rabbitmqConfigurationProperties);
     return publisherChannel;
   }
 
   @Bean(name = "rabbitmqConsumerChannel")
-  Channel getRabbitmqConsumerChannel(Connection connection) throws IOException {
+  Channel getRabbitmqConsumerChannel(Connection connection, RabbitmqConfigurationProperties rabbitmqConfigurationProperties)
+      throws IOException {
     consumerChannel = connection.createChannel();
-    setupChannelProperties(consumerChannel);
+    setupChannelProperties(consumerChannel, rabbitmqConfigurationProperties);
     return consumerChannel;
   }
 
-  private void setupChannelProperties(Channel channel) throws IOException {
+  private void setupChannelProperties(Channel channel, RabbitmqConfigurationProperties rabbitmqConfigurationProperties)
+      throws IOException {
     Map<String, Object> args = new ConcurrentHashMap<>();
     args.put("x-max-priority",
-        propertiesHolder.getRabbitmqHighestPriority());//Higher number means higher priority
+        rabbitmqConfigurationProperties.getHighestPriority());//Higher number means higher priority
     //Second boolean durable to false
-    channel.queueDeclare(propertiesHolder.getRabbitmqQueueName(), false, false, false, args);
+    channel.queueDeclare(rabbitmqConfigurationProperties.getQueueName(), false, false, false, args);
   }
 
   @Bean
-  public QueueConsumer getQueueConsumer(WorkflowExecutorManager workflowExecutionManager,
+  public QueueConsumer getQueueConsumer(
+      RabbitmqConfigurationProperties rabbitmqConfigurationProperties,
+      WorkflowExecutorManager workflowExecutionManager,
       WorkflowExecutionMonitor workflowExecutionMonitor,
       @Qualifier("rabbitmqConsumerChannel") Channel rabbitmqConsumerChannel) throws IOException {
     queueConsumer = new QueueConsumer(rabbitmqConsumerChannel,
-        propertiesHolder.getRabbitmqQueueName(), workflowExecutionManager, workflowExecutionManager,
+        rabbitmqConfigurationProperties.getQueueName(), workflowExecutionManager, workflowExecutionManager,
         workflowExecutionMonitor);
     return queueConsumer;
   }
 
-  @Scheduled(fixedDelayString = "${polling.timeout.for.cleaning.completion.service.in.millisecs}",
-      initialDelayString = "${polling.timeout.for.cleaning.completion.service.in.millisecs}")
+  // TODO: 24/08/2023 Is there a better way to load the configuration here?
+  @Scheduled(
+      fixedDelayString = "${metis-core.pollingTimeoutForCleaningCompletionServiceInMilliseconds}",
+      initialDelayString = "${metis-core.pollingTimeoutForCleaningCompletionServiceInMilliseconds}")
   public void runQueueConsumerCleanup() throws InterruptedException {
-    LOGGER.debug("Queue consumer cleanup started (runs every {} milliseconds).",
-        propertiesHolder.getPollingTimeoutForCleaningCompletionServiceInMillisecs());
     this.queueConsumer.checkAndCleanCompletionService();
     LOGGER.debug("Queue consumer cleanup finished.");
   }
diff --git a/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/properties/MetisCoreConfigurationProperties.java b/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/properties/MetisCoreConfigurationProperties.java
new file mode 100644
index 0000000000..c264ff69fc
--- /dev/null
+++ b/metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/config/properties/MetisCoreConfigurationProperties.java
@@ -0,0 +1,187 @@
+package eu.europeana.metis.core.rest.config.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Class using {@link ConfigurationProperties} loading.
+ */
+@ConfigurationProperties(prefix = "metis-core")
+public class MetisCoreConfigurationProperties {
+
+    private int maxConcurrentThreads;
+    private int dpsMonitorCheckIntervalInSeconds;
+    private int dpsConnectTimeoutInMilliseconds;
+    private int dpsReadTimeoutInMilliseconds;
+    private int failsafeMarginOfInactivityInSeconds;
+    private int periodicFailsafeCheckInMilliseconds;
+    private int periodicSchedulerCheckInMilliseconds;
+    private int pollingTimeoutForCleaningCompletionServiceInMilliseconds;
+    private int periodOfNoProcessedRecordsChangeInMinutes;
+    private int threadLimitThrottlingLevelWeak;
+    private int threadLimitThrottlingLevelMedium;
+    private int threadLimitThrottlingLevelStrong;
+
+    private String baseUrl;
+    private int maxServedExecutionListLength;
+    private int maxDepublishRecordIdsPerDataset;
+
+    private int linkCheckingDefaultSamplingSize;
+    private int solrCommitPeriodInMinutes;
+
+    private String authenticationBaseUrl;
+    private String[] allowedCorsHosts;
+
+
+    public int getMaxConcurrentThreads() {
+        return maxConcurrentThreads;
+    }
+
+    public void setMaxConcurrentThreads(int maxConcurrentThreads) {
+        this.maxConcurrentThreads = maxConcurrentThreads;
+    }
+
+    public int getDpsMonitorCheckIntervalInSeconds() {
+        return dpsMonitorCheckIntervalInSeconds;
+    }
+
+    public void setDpsMonitorCheckIntervalInSeconds(int dpsMonitorCheckIntervalInSeconds) {
+        this.dpsMonitorCheckIntervalInSeconds = dpsMonitorCheckIntervalInSeconds;
+    }
+
+    public int getDpsConnectTimeoutInMilliseconds() {
+        return dpsConnectTimeoutInMilliseconds;
+    }
+
+    public void setDpsConnectTimeoutInMilliseconds(int dpsConnectTimeoutInMilliseconds) {
+        this.dpsConnectTimeoutInMilliseconds = dpsConnectTimeoutInMilliseconds;
+    }
+
+    public int getDpsReadTimeoutInMilliseconds() {
+        return dpsReadTimeoutInMilliseconds;
+    }
+
+    public void setDpsReadTimeoutInMilliseconds(int dpsReadTimeoutInMilliseconds) {
+        this.dpsReadTimeoutInMilliseconds = dpsReadTimeoutInMilliseconds;
+    }
+
+    public int getFailsafeMarginOfInactivityInSeconds() {
+        return failsafeMarginOfInactivityInSeconds;
+    }
+
+    public void setFailsafeMarginOfInactivityInSeconds(int failsafeMarginOfInactivityInSeconds) {
+        this.failsafeMarginOfInactivityInSeconds = failsafeMarginOfInactivityInSeconds;
+    }
+
+    public int getPeriodicFailsafeCheckInMilliseconds() {
+        return periodicFailsafeCheckInMilliseconds;
+    }
+
+    public void setPeriodicFailsafeCheckInMilliseconds(int periodicFailsafeCheckInMilliseconds) {
+        this.periodicFailsafeCheckInMilliseconds = periodicFailsafeCheckInMilliseconds;
+    }
+
+    public int getPeriodicSchedulerCheckInMilliseconds() {
+        return periodicSchedulerCheckInMilliseconds;
+    }
+
+    public void setPeriodicSchedulerCheckInMilliseconds(int periodicSchedulerCheckInMilliseconds) {
+        this.periodicSchedulerCheckInMilliseconds = periodicSchedulerCheckInMilliseconds;
+    }
+
+    public int getPollingTimeoutForCleaningCompletionServiceInMilliseconds() {
+        return pollingTimeoutForCleaningCompletionServiceInMilliseconds;
+    }
+
+    public void setPollingTimeoutForCleaningCompletionServiceInMilliseconds(
+        int pollingTimeoutForCleaningCompletionServiceInMilliseconds) {
+        this.pollingTimeoutForCleaningCompletionServiceInMilliseconds = pollingTimeoutForCleaningCompletionServiceInMilliseconds;
+    }
+
+    public int getPeriodOfNoProcessedRecordsChangeInMinutes() {
+        return periodOfNoProcessedRecordsChangeInMinutes;
+    }
+
+    public void setPeriodOfNoProcessedRecordsChangeInMinutes(int periodOfNoProcessedRecordsChangeInMinutes) {
+        this.periodOfNoProcessedRecordsChangeInMinutes = periodOfNoProcessedRecordsChangeInMinutes;
+    }
+
+    public int getThreadLimitThrottlingLevelWeak() {
+        return threadLimitThrottlingLevelWeak;
+    }
+
+    public void setThreadLimitThrottlingLevelWeak(int threadLimitThrottlingLevelWeak) {
+        this.threadLimitThrottlingLevelWeak = threadLimitThrottlingLevelWeak;
+    }
+
+    public int getThreadLimitThrottlingLevelMedium() {
+        return threadLimitThrottlingLevelMedium;
+    }
+
+    public void setThreadLimitThrottlingLevelMedium(int threadLimitThrottlingLevelMedium) {
+        this.threadLimitThrottlingLevelMedium = threadLimitThrottlingLevelMedium;
+    }
+
+    public int getThreadLimitThrottlingLevelStrong() {
+        return threadLimitThrottlingLevelStrong;
+    }
+
+    public void setThreadLimitThrottlingLevelStrong(int threadLimitThrottlingLevelStrong) {
+        this.threadLimitThrottlingLevelStrong = threadLimitThrottlingLevelStrong;
+    }
+
+    public String getBaseUrl() {
+        return baseUrl;
+    }
+
+    public void setBaseUrl(String baseUrl) {
+        this.baseUrl = baseUrl;
+    }
+
+    public int getMaxServedExecutionListLength() {
+        return maxServedExecutionListLength;
+    }
+
+    public void setMaxServedExecutionListLength(int maxServedExecutionListLength) {
+        this.maxServedExecutionListLength = maxServedExecutionListLength;
+    }
+
+    public int getMaxDepublishRecordIdsPerDataset() {
+        return maxDepublishRecordIdsPerDataset;
+    }
+
+    public void setMaxDepublishRecordIdsPerDataset(int maxDepublishRecordIdsPerDataset) {
+        this.maxDepublishRecordIdsPerDataset = maxDepublishRecordIdsPerDataset;
+    }
+
+    public int getLinkCheckingDefaultSamplingSize() {
+        return linkCheckingDefaultSamplingSize;
+    }
+
+    public void setLinkCheckingDefaultSamplingSize(int linkCheckingDefaultSamplingSize) {
+        this.linkCheckingDefaultSamplingSize = linkCheckingDefaultSamplingSize;
+    }
+
+    public int getSolrCommitPeriodInMinutes() {
+        return solrCommitPeriodInMinutes;
+    }
+
+    public void setSolrCommitPeriodInMinutes(int solrCommitPeriodInMinutes) {
+        this.solrCommitPeriodInMinutes = solrCommitPeriodInMinutes;
+    }
+
+    public String getAuthenticationBaseUrl() {
+        return authenticationBaseUrl;
+    }
+
+    public void setAuthenticationBaseUrl(String authenticationBaseUrl) {
+        this.authenticationBaseUrl = authenticationBaseUrl;
+    }
+
+    public String[] getAllowedCorsHosts() {
+      return allowedCorsHosts == null ? null : allowedCorsHosts.clone();
+    }
+
+    public void setAllowedCorsHosts(String[] allowedCorsHosts) {
+      this.allowedCorsHosts = allowedCorsHosts == null ? null : allowedCorsHosts.clone();
+    }
+}
diff --git a/metis-core/metis-core-rest/src/main/resources/application.properties.example b/metis-core/metis-core-rest/src/main/resources/application.properties.example
index dc4e7cac82..4aefcc48ef 100644
--- a/metis-core/metis-core-rest/src/main/resources/application.properties.example
+++ b/metis-core/metis-core-rest/src/main/resources/application.properties.example
@@ -1,5 +1,7 @@
 #Spring
 logging.config=/data/logging/log4j2.xml
+#logging.config=log4j2.xml
+server.error.whitelabel.enabled=false
 spring.servlet.multipart.max-file-size=5MB
 spring.servlet.multipart.max-request-size=5MB
 spring.autoconfigure.exclude=\
@@ -11,111 +13,108 @@ spring.autoconfigure.exclude=\
 truststore.path=
 truststore.password=
 
+#Socks Proxy
+socks-proxy.enabled=
+socks-proxy.host=
+socks-proxy.port=
+socks-proxy.username=
+socks-proxy.password=
+
 #Orchestration
-max.concurrent.threads=
-dps.monitor.check.interval.in.secs=
-dps.connect.timeout.in.millisecs=
-dps.read.timeout.in.millisecs=
-failsafe.margin.of.inactivity.in.secs=
-periodic.failsafe.check.in.millisecs=
-periodic.scheduler.check.in.millisecs=
-polling.timeout.for.cleaning.completion.service.in.millisecs=
+metis-core.maxConcurrentThreads=1
+metis-core.dpsMonitorCheckIntervalInSeconds=5
+metis-core.dpsConnectTimeoutInMilliseconds=10000
+metis-core.dpsReadTimeoutInMilliseconds=30000
+metis-core.failsafeMarginOfInactivityInSeconds=5
+metis-core.periodicFailsafeCheckInMilliseconds=60000
+metis-core.periodicSchedulerCheckInMilliseconds=90000
+metis-core.pollingTimeoutForCleaningCompletionServiceInMilliseconds=10000
 #If a task passed this cap the task will be cancelled
-period.of.no.processed.records.change.in.minutes=
-thread.limit.throttling.level.weak=
-thread.limit.throttling.level.medium=
-thread.limit.throttling.level.strong=
-
-#Socks Proxy
-socks.proxy.enabled=
-socks.proxy.host=
-socks.proxy.port=
-socks.proxy.username=
-socks.proxy.password=
+metis-core.periodOfNoProcessedRecordsChangeInMinutes=30
+metis-core.threadLimitThrottlingLevelWeak=16
+metis-core.threadLimitThrottlingLevelMedium=8
+metis-core.threadLimitThrottlingLevelStrong=4
+#Use this to specify the FQDN where the application will be hosted under
+metis-core.baseUrl=https://metis-core-rest.test.eanadev.org
+#Use this to specify the maximum execution list length that is served by
+#Metis Core (regardless on whether the list is paginated).
+metis-core.maxServedExecutionListLength=200
+metis-core.maxDepublishRecordIdsPerDataset=1000
+#Use this to specify the default sampling size for Link Checking
+metis-core.linkCheckingDefaultSamplingSize=1000
+#Solr
+metis-core.solrCommitPeriodInMinutes=15
+# Authentication
+metis-core.authenticationBaseUrl=
+# CORS
+metis-core.allowedCorsHosts=
 
 #RabbitMq
 rabbitmq.host=
 rabbitmq.port=
 rabbitmq.username=
 rabbitmq.password=
-rabbitmq.virtual.host=
-rabbitmq.queue.name=
-rabbitmq.highest.priority=
-rabbitmq.enableSSL=
-#True if a custom certificate is used in the truststore defined above
-rabbitmq.enable.custom.truststore=
+rabbitmq.virtualHost=/
+rabbitmq.queueName=UserWorkflowExecution
+rabbitmq.highestPriority=10
+rabbitmq.enableSsl=
+rabbitmq.enableCustomTruststore=
 
 #Mongo
 mongo.hosts=
-mongo.port=
-mongo.authentication.db=
+mongo.ports=
+mongo.authenticationDatabase=
 mongo.username=
 mongo.password=
-mongo.enableSSL=
-mongo.db=
-mongo.application.name=
+mongo.enableSsl=
+mongo.database=metis-core
+mongo.applicationName=metis-core-local
 
 #Redis
 redis.host=
-redis.port=0
+redis.port=
 redis.username=
 redis.password=
-redis.enableSSL=
-#True if a custom certificate is used in the truststore defined above
-redis.enable.custom.truststore=
-redisson.connection.pool.size=
-redisson.connect.timeout.in.millisecs=
-redisson.lock.watchdog.timeout.in.secs=
+redis.enableSsl=
+redis.enableCustomTruststore=
+redis.redisson.connectionPoolSize=16
+redis.redisson.connectTimeoutInSeconds=60
+redis.redisson.lockWatchdogTimeoutInSeconds=120
 #Setting to -1 disables DNS monitoring
-redisson.dns.monitor.interval.in.millisecs=
-redisson.idle.connection.timeout.in.millisecs=
-redisson.retry.attempts=
-
-solr.commit.period.in.mins=
+redis.redisson.dnsMonitorIntervalInSeconds=60
+redis.redisson.idleConnectionTimeoutInSeconds=60
+redis.redisson.retryAttempts=10
 
-#ECloud
+# ECloud
 ecloud.baseUrl=
-ecloud.dps.baseUrl=
+ecloud.dpsBaseUrl=
 ecloud.provider=
 ecloud.username=
 ecloud.password=
 
-#Validation
-validation.external.schema.zip=
-validation.external.schema.root=
-validation.external.schematron.root=
-validation.internal.schema.zip=
-validation.internal.schema.root=
-validation.internal.schematron.root=
+#Validation parameters
+validation.validationExternalSchemaZip=
+validation.validationExternalSchemaRoot=
+validation.validationExternalSchematronRoot=
+validation.validationInternalSchemaZip=
+validation.validationInternalSchemaRoot=
+validation.validationInternalSchematronRoot=
 
-#Authentication
-authentication.baseUrl=
-
-#CORS
-allowed.cors.hosts=*
-
-#Use this to specify the FQDN where the application will be hosted under
-metis.core.baseUrl=
-#Use this to specify the maximum execution list length that is served by 
-#Metis Core (regardless on whether the list is paginated).
-metis.core.max.served.execution.list.length=
-metis.core.max.depublish.record.ids.per.dataset=
-metis.link.checking.default.sampling.size=
-
-#Actuator health probes
+#Actuator
 management.endpoint.health.probes.enabled=true
 management.health.livenessState.enabled=true
 management.health.readinessState.enabled=true
 
 #Elastic APM
-elastic.apm.enabled=false
+elastic.apm.enabled=true
 elastic.apm.recording=true
 elastic.apm.instrument=true
 elastic.apm.service_name=metis-core-local
 elastic.apm.server_url=
-elastic.apm.environment=test
+elastic.apm.environment=local
 elastic.apm.application_packages=eu.europeana
 elastic.apm.log_level=ERROR
 elastic.apm.capture_body=all
 elastic.apm.capture_headers=true
 elastic.apm.metrics_interval=5s
+
diff --git a/metis-core/metis-core-rest/src/main/resources/default_transformation.xslt b/metis-core/metis-core-rest/src/main/resources/default_transformation.xslt
index 9e470d9b4e..89f805227b 100644
--- a/metis-core/metis-core-rest/src/main/resources/default_transformation.xslt
+++ b/metis-core/metis-core-rest/src/main/resources/default_transformation.xslt
@@ -39,8 +39,8 @@
   <!-- Fixed strings to mint URIs -->
   <xsl:variable name="europeana"       select="'Europeana Foundation'" />
   <!--
-  <xsl:variable name="provider_uri"    select="/rdf:RDF/edm:ProvidedCHO[1]/@rdf:about" /><xsl:variable name="uri_cho"         select="f:mintUri($prefix_cho   , $datasetId, $provider_uri)" /><xsl:variable name="uri_dproxy"      select="f:mintUri($prefix_dproxy, $datasetId, $provider_uri)" /><xsl:variable name="uri_pproxy"      select="f:mintUri($prefix_pproxy, $datasetId, $provider_uri)" /><xsl:variable name="uri_eproxy"      select="f:mintUri($prefix_eproxy, $datasetId, $provider_uri)" /><xsl:variable name="uri_daggr"       select="f:mintUri($prefix_daggr , $datasetId, $provider_uri)" /><xsl:variable name="uri_paggr"       select="f:mintUri($prefix_paggr , $datasetId, $provider_uri)" /><xsl:variable name="uri_eaggr"       select="f:mintUri($prefix_eaggr , $datasetId, $provider_uri)" />
-  -->
+<xsl:variable name="provider_uri"    select="/rdf:RDF/edm:ProvidedCHO[1]/@rdf:about" /><xsl:variable name="uri_cho"         select="f:mintUri($prefix_cho   , $datasetId, $provider_uri)" /><xsl:variable name="uri_dproxy"      select="f:mintUri($prefix_dproxy, $datasetId, $provider_uri)" /><xsl:variable name="uri_pproxy"      select="f:mintUri($prefix_pproxy, $datasetId, $provider_uri)" /><xsl:variable name="uri_eproxy"      select="f:mintUri($prefix_eproxy, $datasetId, $provider_uri)" /><xsl:variable name="uri_daggr"       select="f:mintUri($prefix_daggr , $datasetId, $provider_uri)" /><xsl:variable name="uri_paggr"       select="f:mintUri($prefix_paggr , $datasetId, $provider_uri)" /><xsl:variable name="uri_eaggr"       select="f:mintUri($prefix_eaggr , $datasetId, $provider_uri)" />
+-->
   <xsl:variable name="uri_cho"         select="$providedCHOAboutId" />
   <xsl:variable name="uri_dproxy"      select="concat('/proxy/provider', $providedCHOAboutId)" />
   <xsl:variable name="uri_pproxy"      select="concat('/proxy/aggregator', $providedCHOAboutId)" />
@@ -415,7 +415,7 @@
     <xsl:copy/>
   </xsl:template>
   <xsl:template match="*">
-    <xsl:element name="{name()}">
+    <xsl:element name="{name()}" namespace="{namespace-uri()}">
       <xsl:copy-of select="@rdf:resource"/>
       <xsl:copy-of select="@xml:lang"/>
       <xsl:copy-of select="@rdf:datatype"/>
diff --git a/metis-core/metis-core-service/pom.xml b/metis-core/metis-core-service/pom.xml
index 92e1e87af1..513a28a889 100644
--- a/metis-core/metis-core-service/pom.xml
+++ b/metis-core/metis-core-service/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-core</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-core-service</artifactId>
 
diff --git a/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/DatasetDao.java b/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/DatasetDao.java
index 2e7b47c4de..5a3851c275 100644
--- a/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/DatasetDao.java
+++ b/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/DatasetDao.java
@@ -9,13 +9,14 @@
 import static eu.europeana.metis.network.ExternalRequestUtil.retryableExternalRequestForNetworkExceptions;
 import static eu.europeana.metis.utils.CommonStringValues.CRLF_PATTERN;
 
+import dev.morphia.UpdateOptions;
 import dev.morphia.query.FindOptions;
 import dev.morphia.query.Query;
 import dev.morphia.query.Sort;
-import dev.morphia.query.experimental.filters.Filter;
-import dev.morphia.query.experimental.filters.Filters;
-import dev.morphia.query.experimental.updates.UpdateOperator;
-import dev.morphia.query.experimental.updates.UpdateOperators;
+import dev.morphia.query.filters.Filter;
+import dev.morphia.query.filters.Filters;
+import dev.morphia.query.updates.UpdateOperator;
+import dev.morphia.query.updates.UpdateOperators;
 import eu.europeana.cloud.mcs.driver.DataSetServiceClient;
 import eu.europeana.cloud.service.mcs.exception.DataSetAlreadyExistsException;
 import eu.europeana.cloud.service.mcs.exception.MCSException;
@@ -302,7 +303,7 @@ public int findNextInSequenceDatasetId() {
         .set("sequence", datasetIdSequence.getSequence());
 
     retryableExternalRequestForNetworkExceptions(
-        () -> updateQuery.update(updateOperator).execute());
+        () -> updateQuery.update(new UpdateOptions(), updateOperator));
     return datasetIdSequence.getSequence();
   }
 
diff --git a/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/DatasetXsltDao.java b/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/DatasetXsltDao.java
index e6c650e30b..7da54b6544 100644
--- a/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/DatasetXsltDao.java
+++ b/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/DatasetXsltDao.java
@@ -10,7 +10,7 @@
 import dev.morphia.query.FindOptions;
 import dev.morphia.query.Query;
 import dev.morphia.query.Sort;
-import dev.morphia.query.experimental.filters.Filters;
+import dev.morphia.query.filters.Filters;
 import eu.europeana.metis.core.dataset.DatasetXslt;
 import eu.europeana.metis.core.mongo.MorphiaDatastoreProvider;
 import java.util.Optional;
diff --git a/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/DepublishRecordIdDao.java b/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/DepublishRecordIdDao.java
index 598f7881c4..b3c44865a3 100644
--- a/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/DepublishRecordIdDao.java
+++ b/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/DepublishRecordIdDao.java
@@ -7,9 +7,9 @@
 import dev.morphia.UpdateOptions;
 import dev.morphia.query.FindOptions;
 import dev.morphia.query.Query;
-import dev.morphia.query.experimental.filters.Filters;
-import dev.morphia.query.experimental.updates.UpdateOperator;
-import dev.morphia.query.experimental.updates.UpdateOperators;
+import dev.morphia.query.filters.Filters;
+import dev.morphia.query.updates.UpdateOperator;
+import dev.morphia.query.updates.UpdateOperators;
 import eu.europeana.metis.core.dataset.DepublishRecordId;
 import eu.europeana.metis.core.dataset.DepublishRecordId.DepublicationStatus;
 import eu.europeana.metis.core.mongo.MorphiaDatastoreProvider;
@@ -76,7 +76,7 @@ private Set<String> getNonExistingRecordIds(String datasetId, Set<String> record
 
       // Create query for existing records in list. Only return record IDs.
       final Query<DepublishRecordId> query = morphiaDatastoreProvider.getDatastore()
-          .find(DepublishRecordId.class);
+                                                                     .find(DepublishRecordId.class);
       query.filter(Filters.eq(DepublishRecordId.DATASET_ID_FIELD, datasetId));
       query.filter(Filters.in(DepublishRecordId.RECORD_ID_FIELD, recordIds));
 
@@ -86,27 +86,25 @@ private Set<String> getNonExistingRecordIds(String datasetId, Set<String> record
       findOptions.projection().exclude(DepublishRecordId.ID_FIELD);
       final Set<String> existing;
       existing = getListOfQueryRetryable(query, findOptions).stream()
-          .map(DepublishRecordId::getRecordId).collect(Collectors.toSet());
+                                                            .map(DepublishRecordId::getRecordId).collect(Collectors.toSet());
 
       // Return the other ones: the record IDs not found in the database.
       return recordIds.stream().filter(recordId -> !existing.contains(recordId))
-          .collect(Collectors.toSet());
+                      .collect(Collectors.toSet());
     });
   }
 
   /**
-   * Add depublished records to persistence. This method checks whether the depublished record
-   * already exists, and if so, doesn't add it again. All new records (but not the existing ones)
-   * will have the default depublication status ({@link DepublicationStatus#PENDING_DEPUBLICATION})
-   * and no depublication date.
+   * Add depublished records to persistence. This method checks whether the depublished record already exists, and if so, doesn't
+   * add it again. All new records (but not the existing ones) will have the default depublication status
+   * ({@link DepublicationStatus#PENDING_DEPUBLICATION}) and no depublication date.
    *
    * @param datasetId The dataset to which the records belong.
    * @param candidateRecordIds The IDs of the depublish record ids to add.
-   * @return How many of the passed records were in fact added. This counter is not thread-safe: if
-   * multiple threads try to add the same records, their combined counters may overrepresent the
-   * number of records that were actually added.
-   * @throws BadContentException In case adding the records would violate the maximum number of
-   * depublished records that each dataset can have.
+   * @return How many of the passed records were in fact added. This counter is not thread-safe: if multiple threads try to add
+   * the same records, their combined counters may overrepresent the number of records that were actually added.
+   * @throws BadContentException In case adding the records would violate the maximum number of depublished records that each
+   * dataset can have.
    */
   public int createRecordIdsToBeDepublished(String datasetId, Set<String> candidateRecordIds)
       throws BadContentException {
@@ -150,14 +148,14 @@ void addRecords(Set<String> recordIdsToAdd, String datasetId,
   }
 
   /**
-   * Deletes a list of record ids from the database. Only record ids that are in a {@link
-   * DepublicationStatus#PENDING_DEPUBLICATION} state will be removed.
+   * Deletes a list of record ids from the database. Only record ids that are in a
+   * {@link DepublicationStatus#PENDING_DEPUBLICATION} state will be removed.
    *
    * @param datasetId The dataset to which the depublish record ids belong.
    * @param recordIds The depublish record ids to be removed
    * @return The number or record ids that were removed.
-   * @throws BadContentException In case adding the records would violate the maximum number of
-   * depublished records that each dataset can have.
+   * @throws BadContentException In case adding the records would violate the maximum number of depublished records that each
+   * dataset can have.
    */
   public Long deletePendingRecordIds(String datasetId, Set<String> recordIds)
       throws BadContentException {
@@ -169,7 +167,7 @@ public Long deletePendingRecordIds(String datasetId, Set<String> recordIds)
     }
 
     final Query<DepublishRecordId> query = morphiaDatastoreProvider.getDatastore()
-        .find(DepublishRecordId.class);
+                                                                   .find(DepublishRecordId.class);
     query.filter(Filters.eq(DepublishRecordId.DATASET_ID_FIELD, datasetId));
     query.filter(Filters.in(DepublishRecordId.RECORD_ID_FIELD, recordIds));
     query.filter(Filters.eq(DepublishRecordId.DEPUBLICATION_STATUS_FIELD,
@@ -187,12 +185,11 @@ public Long deletePendingRecordIds(String datasetId, Set<String> recordIds)
   long countDepublishRecordIdsForDataset(String datasetId) {
     return retryableExternalRequestForNetworkExceptions(
         () -> morphiaDatastoreProvider.getDatastore().find(DepublishRecordId.class)
-            .filter(Filters.eq(DepublishRecordId.DATASET_ID_FIELD, datasetId)).count());
+                                      .filter(Filters.eq(DepublishRecordId.DATASET_ID_FIELD, datasetId)).count());
   }
 
   /**
-   * Counts how many records we have for a given dataset that have the status {@link
-   * DepublicationStatus#DEPUBLISHED}.
+   * Counts how many records we have for a given dataset that have the status {@link DepublicationStatus#DEPUBLISHED}.
    *
    * @param datasetId The ID of the dataset to count for.
    * @return The number of records.
@@ -200,9 +197,9 @@ long countDepublishRecordIdsForDataset(String datasetId) {
   public long countSuccessfullyDepublishedRecordIdsForDataset(String datasetId) {
     return retryableExternalRequestForNetworkExceptions(
         () -> morphiaDatastoreProvider.getDatastore().find(DepublishRecordId.class)
-            .filter(Filters.eq(DepublishRecordId.DATASET_ID_FIELD, datasetId)).filter(Filters
+                                      .filter(Filters.eq(DepublishRecordId.DATASET_ID_FIELD, datasetId)).filter(Filters
                 .eq(DepublishRecordId.DEPUBLICATION_STATUS_FIELD, DepublicationStatus.DEPUBLISHED))
-            .count());
+                                      .count());
   }
 
   /**
@@ -236,16 +233,16 @@ public List<DepublishRecordIdView> getDepublishRecordIds(String datasetId, int p
   /**
    * Get all depublished records for a given dataset.
    * <p>This method is to be used with caution since it doesn't have a limit on the returned items.
-   * It is mainly used to minimize, internal to the application, database requests. Ids are returned
-   * based on the provided status filter parameter</p>
+   * It is mainly used to minimize, internal to the application, database requests. Ids are returned based on the provided status
+   * filter parameter</p>
    *
    * @param datasetId The dataset for which to retrieve the records. Cannot be null.
    * @param sortField The sorting field. Cannot be null.
    * @param sortDirection The sorting direction. Cannot be null.
    * @param depublicationStatus The depublication status of the records. Can be null.
    * @return A (possibly empty) list of depublish record ids.
-   * @throws BadContentException In case the records would violate the maximum number of depublished
-   * records that each dataset can have.
+   * @throws BadContentException In case the records would violate the maximum number of depublished records that each dataset can
+   * have.
    */
   public Set<String> getAllDepublishRecordIdsWithStatus(String datasetId,
       DepublishRecordIdSortField sortField, SortDirection sortDirection,
@@ -258,8 +255,8 @@ public Set<String> getAllDepublishRecordIdsWithStatus(String datasetId,
   /**
    * Get all depublished records for a given dataset.
    * <p>This method is to be used with caution since it doesn't have a limit on the returned items.
-   * It is mainly used to minimize, internal to the application, database requests. Ids are returned
-   * based on the provided status filter parameter</p>
+   * It is mainly used to minimize, internal to the application, database requests. Ids are returned based on the provided status
+   * filter parameter</p>
    *
    * @param datasetId The dataset for which to retrieve the records. Cannot be null.
    * @param sortField The sorting field. Cannot be null.
@@ -267,8 +264,8 @@ public Set<String> getAllDepublishRecordIdsWithStatus(String datasetId,
    * @param depublicationStatus The depublication status of the records. Can be null.
    * @param recordIds The record ids provided, that are to be checked upon. Can be null/empty
    * @return A (possibly empty) list of depublish record ids.
-   * @throws BadContentException In case the records would violate the maximum number of depublished
-   * records that each dataset can have.
+   * @throws BadContentException In case the records would violate the maximum number of depublished records that each dataset can
+   * have.
    */
   public Set<String> getAllDepublishRecordIdsWithStatus(String datasetId,
       DepublishRecordIdSortField sortField, SortDirection sortDirection,
@@ -302,7 +299,7 @@ private Query<DepublishRecordId> prepareQueryForDepublishRecordIds(String datase
       DepublicationStatus depublicationStatus, String searchQuery) {
     // Create query.
     final Query<DepublishRecordId> query = morphiaDatastoreProvider.getDatastore()
-        .find(DepublishRecordId.class);
+                                                                   .find(DepublishRecordId.class);
     query.filter(Filters.eq(DepublishRecordId.DATASET_ID_FIELD, datasetId));
     if (Objects.nonNull(depublicationStatus)) {
       query.filter(Filters.eq(DepublishRecordId.DEPUBLICATION_STATUS_FIELD, depublicationStatus));
@@ -316,16 +313,14 @@ private Query<DepublishRecordId> prepareQueryForDepublishRecordIds(String datase
   }
 
   /**
-   * This method marks record ids with the provided {@link DepublicationStatus} and {@link Date}
-   * where appropriate.
+   * This method marks record ids with the provided {@link DepublicationStatus} and {@link Date} where appropriate.
    * <p>A {@link DepublicationStatus#PENDING_DEPUBLICATION} unsets the depublication date</p>
    * <p>A {@link DepublicationStatus#DEPUBLISHED} sets the depublication date with the one
    * provided</p>
    *
    * @param datasetId the dataset for which to do this. Cannot be null
-   * @param recordIds the records for which to set this. Can be null or empty, in which case the
-   * operation will be performed on all records. If it is not empty, a new record will be created if
-   * a record with the given record ID is not already present.
+   * @param recordIds the records for which to set this. Can be null or empty, in which case the operation will be performed on
+   * all records. If it is not empty, a new record will be created if a record with the given record ID is not already present.
    * @param depublicationStatus the depublication status. Cannot be null
    * @param depublicationDate the depublication date. Can be null only if depublicationStatus is
    * {@link DepublicationStatus#PENDING_DEPUBLICATION}
@@ -353,8 +348,9 @@ public void markRecordIdsWithDepublicationStatus(String datasetId, Set<String> r
       // Add the records that are missing.
       final Set<String> recordIdsToAdd = getNonExistingRecordIds(datasetId, recordIds);
       final Instant depublicationInstant = Optional.ofNullable(depublicationDate)
-          .filter(date -> depublicationStatus != DepublicationStatus.PENDING_DEPUBLICATION)
-          .map(Date::toInstant).orElse(null);
+                                                   .filter(
+                                                       date -> depublicationStatus != DepublicationStatus.PENDING_DEPUBLICATION)
+                                                   .map(Date::toInstant).orElse(null);
       addRecords(recordIdsToAdd, datasetId, depublicationStatus, depublicationInstant);
 
       // Compute the records to update - if there are none, we're done.
@@ -367,27 +363,29 @@ public void markRecordIdsWithDepublicationStatus(String datasetId, Set<String> r
 
     // Create query.
     final Query<DepublishRecordId> query = morphiaDatastoreProvider.getDatastore()
-        .find(DepublishRecordId.class);
+                                                                   .find(DepublishRecordId.class);
     query.filter(Filters.eq(DepublishRecordId.DATASET_ID_FIELD, datasetId));
     if (recordIdsToUpdate != null) {
       query.filter(Filters.in(DepublishRecordId.RECORD_ID_FIELD, recordIdsToUpdate));
     }
 
     // Define the update operations.
-    final UpdateOperator firstUpdateOperator = UpdateOperators
-        .set(DepublishRecordId.DEPUBLICATION_STATUS_FIELD, depublicationStatus);
-    final ArrayList<UpdateOperator> extraUpdateOperators = new ArrayList<>();
+    final ArrayList<UpdateOperator> updateOperators = new ArrayList<>();
+    updateOperators.add(UpdateOperators
+        .set(DepublishRecordId.DEPUBLICATION_STATUS_FIELD,
+            depublicationStatus));
     if (depublicationStatus == DepublicationStatus.PENDING_DEPUBLICATION) {
-      extraUpdateOperators.add(UpdateOperators.unset(DepublishRecordId.DEPUBLICATION_DATE_FIELD));
+      updateOperators.add(UpdateOperators.unset(DepublishRecordId.DEPUBLICATION_DATE_FIELD));
     } else {
-      extraUpdateOperators
-          .add(UpdateOperators.set(DepublishRecordId.DEPUBLICATION_DATE_FIELD, depublicationDate));
+      updateOperators.add(
+          UpdateOperators.set(DepublishRecordId.DEPUBLICATION_DATE_FIELD,
+          depublicationDate == null? Date.from(Instant.now()): depublicationDate)
+      );
     }
 
     // Apply the operations.
     retryableExternalRequestForNetworkExceptions(
-        () -> query.update(firstUpdateOperator, extraUpdateOperators.toArray(UpdateOperator[]::new))
-            .execute(new UpdateOptions().multi(true)));
+        () -> query.update(new UpdateOptions().multi(true), updateOperators.toArray(UpdateOperator[]::new)));
   }
 
   /**
diff --git a/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/ScheduledWorkflowDao.java b/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/ScheduledWorkflowDao.java
index 5ce57785cd..59f7bd8c58 100644
--- a/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/ScheduledWorkflowDao.java
+++ b/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/ScheduledWorkflowDao.java
@@ -9,8 +9,8 @@
 import dev.morphia.DeleteOptions;
 import dev.morphia.query.FindOptions;
 import dev.morphia.query.Query;
-import dev.morphia.query.experimental.filters.Filter;
-import dev.morphia.query.experimental.filters.Filters;
+import dev.morphia.query.filters.Filter;
+import dev.morphia.query.filters.Filters;
 import eu.europeana.metis.core.mongo.MorphiaDatastoreProvider;
 import eu.europeana.metis.core.rest.RequestLimits;
 import eu.europeana.metis.core.workflow.ScheduleFrequence;
diff --git a/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/WorkflowDao.java b/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/WorkflowDao.java
index b57ade0a98..9da2e1e619 100644
--- a/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/WorkflowDao.java
+++ b/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/WorkflowDao.java
@@ -6,7 +6,7 @@
 import com.mongodb.client.result.DeleteResult;
 import dev.morphia.query.FindOptions;
 import dev.morphia.query.Query;
-import dev.morphia.query.experimental.filters.Filters;
+import dev.morphia.query.filters.Filters;
 import eu.europeana.metis.core.mongo.MorphiaDatastoreProvider;
 import eu.europeana.metis.core.workflow.Workflow;
 import eu.europeana.metis.network.ExternalRequestUtil;
diff --git a/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/WorkflowExecutionDao.java b/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/WorkflowExecutionDao.java
index 3d7811139d..d5f00d761c 100644
--- a/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/WorkflowExecutionDao.java
+++ b/metis-core/metis-core-service/src/main/java/eu/europeana/metis/core/dao/WorkflowExecutionDao.java
@@ -16,25 +16,26 @@
 import com.mongodb.client.result.DeleteResult;
 import com.mongodb.client.result.UpdateResult;
 import dev.morphia.DeleteOptions;
-import dev.morphia.aggregation.experimental.Aggregation;
-import dev.morphia.aggregation.experimental.expressions.ArrayExpressions;
-import dev.morphia.aggregation.experimental.expressions.ComparisonExpressions;
-import dev.morphia.aggregation.experimental.expressions.ConditionalExpressions;
-import dev.morphia.aggregation.experimental.expressions.Expressions;
-import dev.morphia.aggregation.experimental.expressions.MathExpressions;
-import dev.morphia.aggregation.experimental.expressions.impls.Expression;
-import dev.morphia.aggregation.experimental.expressions.impls.MathExpression;
-import dev.morphia.aggregation.experimental.stages.Lookup;
-import dev.morphia.aggregation.experimental.stages.Projection;
-import dev.morphia.aggregation.experimental.stages.Sort;
-import dev.morphia.aggregation.experimental.stages.Unwind;
+import dev.morphia.UpdateOptions;
+import dev.morphia.aggregation.Aggregation;
+import dev.morphia.aggregation.expressions.ArrayExpressions;
+import dev.morphia.aggregation.expressions.ComparisonExpressions;
+import dev.morphia.aggregation.expressions.ConditionalExpressions;
+import dev.morphia.aggregation.expressions.Expressions;
+import dev.morphia.aggregation.expressions.MathExpressions;
+import dev.morphia.aggregation.expressions.impls.Expression;
+import dev.morphia.aggregation.expressions.impls.MathExpression;
+import dev.morphia.aggregation.stages.Lookup;
+import dev.morphia.aggregation.stages.Projection;
+import dev.morphia.aggregation.stages.Sort;
+import dev.morphia.aggregation.stages.Unwind;
 import dev.morphia.annotations.Entity;
 import dev.morphia.query.FindOptions;
 import dev.morphia.query.Query;
-import dev.morphia.query.experimental.filters.Filter;
-import dev.morphia.query.experimental.filters.Filters;
-import dev.morphia.query.experimental.updates.UpdateOperator;
-import dev.morphia.query.experimental.updates.UpdateOperators;
+import dev.morphia.query.filters.Filter;
+import dev.morphia.query.filters.Filters;
+import dev.morphia.query.updates.UpdateOperator;
+import dev.morphia.query.updates.UpdateOperators;
 import eu.europeana.metis.authentication.user.MetisUserView;
 import eu.europeana.metis.core.common.DaoFieldNames;
 import eu.europeana.metis.core.dataset.Dataset;
@@ -99,7 +100,7 @@ public WorkflowExecutionDao(MorphiaDatastoreProvider morphiaDatastoreProvider) {
   @Override
   public WorkflowExecution create(WorkflowExecution workflowExecution) {
     final ObjectId objectId = Optional.ofNullable(workflowExecution.getId())
-        .orElseGet(ObjectId::new);
+                                      .orElseGet(ObjectId::new);
     workflowExecution.setId(objectId);
     final WorkflowExecution workflowExecutionSaved = retryableExternalRequestForNetworkExceptions(
         () -> morphiaDatastoreProvider.getDatastore().save(workflowExecution));
@@ -125,14 +126,14 @@ public String update(WorkflowExecution workflowExecution) {
    */
   public void updateWorkflowPlugins(WorkflowExecution workflowExecution) {
     Query<WorkflowExecution> query = morphiaDatastoreProvider.getDatastore()
-        .find(WorkflowExecution.class)
-        .filter(Filters.eq(ID.getFieldName(), workflowExecution.getId()));
+                                                             .find(WorkflowExecution.class)
+                                                             .filter(Filters.eq(ID.getFieldName(), workflowExecution.getId()));
 
     final UpdateOperator updateOperator = UpdateOperators
         .set(METIS_PLUGINS.getFieldName(), workflowExecution.getMetisPlugins());
 
     UpdateResult updateResult = retryableExternalRequestForNetworkExceptions(
-        () -> query.update(updateOperator).execute());
+        () -> query.update(new UpdateOptions(), updateOperator));
     LOGGER.debug(
         "WorkflowExecution metisPlugins for datasetId '{}' updated in Mongo. (UpdateResults: {})",
         workflowExecution.getDatasetId(),
@@ -140,32 +141,31 @@ public void updateWorkflowPlugins(WorkflowExecution workflowExecution) {
   }
 
   /**
-   * Overwrites only the portion of the WorkflowExecution that contains the monitor
-   * information(plugins, started date, updated date).
+   * Overwrites only the portion of the WorkflowExecution that contains the monitor information(plugins, started date, updated
+   * date).
    *
    * @param workflowExecution the WorkflowExecution to update
    */
   public void updateMonitorInformation(WorkflowExecution workflowExecution) {
     Query<WorkflowExecution> query = morphiaDatastoreProvider.getDatastore()
-        .find(WorkflowExecution.class)
-        .filter(Filters.eq(ID.getFieldName(), workflowExecution.getId()));
-    final UpdateOperator firstUpdateOperator = UpdateOperators
-        .set(WORKFLOW_STATUS.getFieldName(), workflowExecution.getWorkflowStatus());
-    final ArrayList<UpdateOperator> extraUpdateOperators = new ArrayList<>();
+                                                             .find(WorkflowExecution.class)
+                                                             .filter(Filters.eq(ID.getFieldName(), workflowExecution.getId()));
+    final ArrayList<UpdateOperator> updateOperators = new ArrayList<>();
+    updateOperators.add(UpdateOperators
+        .set(WORKFLOW_STATUS.getFieldName(),
+            workflowExecution.getWorkflowStatus()));
     if (workflowExecution.getStartedDate() != null) {
-      extraUpdateOperators
+      updateOperators
           .add(UpdateOperators.set("startedDate", workflowExecution.getStartedDate()));
     }
     if (workflowExecution.getUpdatedDate() != null) {
-      extraUpdateOperators
+      updateOperators
           .add(UpdateOperators.set("updatedDate", workflowExecution.getUpdatedDate()));
     }
-    extraUpdateOperators.add(
+    updateOperators.add(
         UpdateOperators.set(METIS_PLUGINS.getFieldName(), workflowExecution.getMetisPlugins()));
     UpdateResult updateResult = retryableExternalRequestForNetworkExceptions(
-        () -> query
-            .update(firstUpdateOperator, extraUpdateOperators.toArray(UpdateOperator[]::new))
-            .execute());
+        () -> query.update(new UpdateOptions(), updateOperators.toArray(UpdateOperator[]::new)));
     LOGGER.debug(
         "WorkflowExecution monitor information for datasetId '{}' updated in Mongo. (UpdateResults: {})",
         workflowExecution.getDatasetId(),
@@ -175,16 +175,16 @@ public void updateMonitorInformation(WorkflowExecution workflowExecution) {
   /**
    * Set the cancelling field in the database.
    * <p>Also adds information of the user identifier that cancelled the execution or if it was by a
-   * system operation, using {@link SystemId} values as identifiers. For historical executions the
-   * value of the <code>cancelledBy</code> field will remain <code>null</code></p>
+   * system operation, using {@link SystemId} values as identifiers. For historical executions the value of the
+   * <code>cancelledBy</code> field will remain <code>null</code></p>
    *
    * @param workflowExecution the workflowExecution to be cancelled
    * @param metisUserView the user that triggered the cancellation or null if it was the system
    */
   public void setCancellingState(WorkflowExecution workflowExecution, MetisUserView metisUserView) {
     Query<WorkflowExecution> query = morphiaDatastoreProvider.getDatastore()
-        .find(WorkflowExecution.class)
-        .filter(Filters.eq(ID.getFieldName(), workflowExecution.getId()));
+                                                             .find(WorkflowExecution.class)
+                                                             .filter(Filters.eq(ID.getFieldName(), workflowExecution.getId()));
     String cancelledBy;
     if (metisUserView == null || metisUserView.getUserId() == null) {
       cancelledBy = SystemId.SYSTEM_MINUTE_CAP_EXPIRE.name();
@@ -195,7 +195,7 @@ public void setCancellingState(WorkflowExecution workflowExecution, MetisUserVie
     final UpdateOperator setCancelledByOperator = UpdateOperators.set("cancelledBy", cancelledBy);
 
     UpdateResult updateResult = retryableExternalRequestForNetworkExceptions(
-        () -> query.update(setCancellingOperator, setCancelledByOperator).execute());
+        () -> query.update(new UpdateOptions(), setCancellingOperator, setCancelledByOperator));
     LOGGER.debug(
         "WorkflowExecution cancelling for datasetId '{}' set to true in Mongo. (UpdateResults: {})",
         workflowExecution.getDatasetId(),
@@ -205,8 +205,8 @@ public void setCancellingState(WorkflowExecution workflowExecution, MetisUserVie
   @Override
   public WorkflowExecution getById(String id) {
     Query<WorkflowExecution> query = morphiaDatastoreProvider.getDatastore()
-        .find(WorkflowExecution.class)
-        .filter(Filters.eq(ID.getFieldName(), new ObjectId(id)));
+                                                             .find(WorkflowExecution.class)
+                                                             .filter(Filters.eq(ID.getFieldName(), new ObjectId(id)));
     return retryableExternalRequestForNetworkExceptions(query::first);
   }
 
@@ -216,8 +216,7 @@ public boolean delete(WorkflowExecution workflowExecution) {
   }
 
   /**
-   * Get the WorkflowExecution for a dataset identifier that is {@link WorkflowStatus#INQUEUE} or
-   * {@link WorkflowStatus#RUNNING}
+   * Get the WorkflowExecution for a dataset identifier that is {@link WorkflowStatus#INQUEUE} or {@link WorkflowStatus#RUNNING}
    *
    * @param datasetId the dataset identifier
    * @return the WorkflowExecution if found
@@ -236,13 +235,12 @@ public WorkflowExecution getRunningOrInQueueExecution(String datasetId) {
   public boolean exists(WorkflowExecution workflowExecution) {
     return retryableExternalRequestForNetworkExceptions(
         () -> morphiaDatastoreProvider.getDatastore().find(WorkflowExecution.class)
-            .filter(Filters.eq(DATASET_ID.getFieldName(), workflowExecution.getDatasetId()))
-            .first(new FindOptions().projection().include(ID.getFieldName()))) != null;
+                                      .filter(Filters.eq(DATASET_ID.getFieldName(), workflowExecution.getDatasetId()))
+                                      .first(new FindOptions().projection().include(ID.getFieldName()))) != null;
   }
 
   /**
-   * Check if a WorkflowExecution exists for a dataset identifier and has not completed it's
-   * execution.
+   * Check if a WorkflowExecution exists for a dataset identifier and has not completed it's execution.
    *
    * @param datasetId the dataset identifier
    * @return the identifier of the execution if found, otherwise null
@@ -264,7 +262,7 @@ public String existsAndNotCompleted(String datasetId) {
 
   private Query<WorkflowExecution> runningOrInqueueQuery(String datasetId) {
     Query<WorkflowExecution> query = morphiaDatastoreProvider.getDatastore()
-        .find(WorkflowExecution.class);
+                                                             .find(WorkflowExecution.class);
 
     final Filter datasetIdFilter = Filters.eq(DATASET_ID.getFieldName(), datasetId);
     final Filter workflowStatusFilter = Filters
@@ -276,42 +274,36 @@ private Query<WorkflowExecution> runningOrInqueueQuery(String datasetId) {
   }
 
   /**
-   * Get the first successful Plugin of a WorkflowExecution for a dataset identifier and a set of
-   * plugin types
+   * Get the first successful Plugin of a WorkflowExecution for a dataset identifier and a set of plugin types
    *
-   * @param datasetId   the dataset identifier
-   * @param pluginTypes the set of plugin types to check for. Cannot be null or contain null
-   *                    values.
+   * @param datasetId the dataset identifier
+   * @param pluginTypes the set of plugin types to check for. Cannot be null or contain null values.
    * @return the first plugin found
    */
   public PluginWithExecutionId<MetisPlugin> getFirstSuccessfulPlugin(String datasetId,
       Set<PluginType> pluginTypes) {
     return Optional.ofNullable(getFirstOrLastFinishedPlugin(datasetId, pluginTypes, true))
-        .orElse(null);
+                   .orElse(null);
   }
 
   /**
-   * Get the last successful Plugin of a WorkflowExecution for a dataset identifier and a set of
-   * plugin types
+   * Get the last successful Plugin of a WorkflowExecution for a dataset identifier and a set of plugin types
    *
-   * @param datasetId   the dataset identifier
-   * @param pluginTypes the set of plugin types to check for. Cannot be null or contain null
-   *                    values.
+   * @param datasetId the dataset identifier
+   * @param pluginTypes the set of plugin types to check for. Cannot be null or contain null values.
    * @return the last plugin found
    */
   public PluginWithExecutionId<MetisPlugin> getLatestSuccessfulPlugin(String datasetId,
       Set<PluginType> pluginTypes) {
     return Optional.ofNullable(getFirstOrLastFinishedPlugin(datasetId, pluginTypes, false))
-        .orElse(null);
+                   .orElse(null);
   }
 
   /**
-   * Get the last successful Plugin of a WorkflowExecution for a dataset identifier and a set of
-   * plugin types
+   * Get the last successful Plugin of a WorkflowExecution for a dataset identifier and a set of plugin types
    *
-   * @param datasetId        the dataset identifier
-   * @param pluginTypes      the set of plugin types to check for. Cannot be null or contain null
-   *                         values.
+   * @param datasetId the dataset identifier
+   * @param pluginTypes the set of plugin types to check for. Cannot be null or contain null values.
    * @param limitToValidData Only return the result if it has valid data (see {@link DataStatus}).
    * @return the last plugin found
    */
@@ -324,12 +316,12 @@ public PluginWithExecutionId<ExecutablePlugin> getLatestSuccessfulExecutablePlug
 
     // Perform the database query. If nothing found, we are done.
     final Set<PluginType> convertedPluginTypes = pluginTypes.stream()
-        .map(ExecutablePluginType::toPluginType).collect(Collectors.toSet());
+                                                            .map(ExecutablePluginType::toPluginType).collect(Collectors.toSet());
     final PluginWithExecutionId<MetisPlugin> uncastResultWrapper =
         getFirstOrLastFinishedPlugin(datasetId, convertedPluginTypes, false);
     final MetisPlugin uncastResult = Optional.ofNullable(uncastResultWrapper)
-        .map(PluginWithExecutionId::getPlugin).orElse(null);
-    if (uncastResult == null) {
+                                             .map(PluginWithExecutionId::getPlugin).orElse(null);
+    if (uncastResultWrapper == null || uncastResult == null) {
       return null;
     }
 
@@ -378,15 +370,15 @@ PluginWithExecutionId<MetisPlugin> getFirstOrLastFinishedPlugin(String datasetId
 
     // Query: unwind and match again so that we know that all conditions apply to the same plugin.
     final Aggregation<WorkflowExecution> aggregation = morphiaDatastoreProvider.getDatastore()
-        .aggregate(WorkflowExecution.class);
+                                                                               .aggregate(WorkflowExecution.class);
 
     final String orderField =
         METIS_PLUGINS.getFieldName() + "." + FINISHED_DATE.getFieldName();
     aggregation.match(collectedFilters)
-        .unwind(Unwind.on(METIS_PLUGINS.getFieldName()))
-        .match(collectedFilters)
-        .sort(firstFinished ? Sort.on().ascending(orderField) : Sort.on().descending(orderField))
-        .limit(1);
+               .unwind(Unwind.unwind(METIS_PLUGINS.getFieldName()))
+               .match(collectedFilters)
+               .sort(firstFinished ? Sort.sort().ascending(orderField) : Sort.sort().descending(orderField))
+               .limit(1);
 
     final List<WorkflowExecution> metisPluginsIterator = MorphiaUtils
         .getListOfAggregationRetryable(aggregation,
@@ -394,9 +386,9 @@ PluginWithExecutionId<MetisPlugin> getFirstOrLastFinishedPlugin(String datasetId
 
     // Because of the unwind, we know that the plugin we need is always the first one.
     return Optional.ofNullable(metisPluginsIterator).stream().flatMap(Collection::stream)
-        .filter(execution -> !execution.getMetisPlugins().isEmpty())
-        .map(execution -> new PluginWithExecutionId<MetisPlugin>(execution,
-            execution.getMetisPlugins().get(0))).findFirst().orElse(null);
+                   .filter(execution -> !execution.getMetisPlugins().isEmpty())
+                   .map(execution -> new PluginWithExecutionId<MetisPlugin>(execution,
+                       execution.getMetisPlugins().get(0))).findFirst().orElse(null);
   }
 
   private void verifyEnumSetIsValidAndNotEmpty(Set<? extends Enum<?>> set) {
@@ -408,18 +400,14 @@ private void verifyEnumSetIsValidAndNotEmpty(Set<? extends Enum<?>> set) {
   /**
    * Get all WorkflowExecutions paged.
    *
-   * @param datasetIds                     a set of dataset identifiers to filter, can be empty or
-   *                                       null to get all
-   * @param workflowStatuses               a set of workflow statuses to filter, can be empty or
-   *                                       null
-   * @param orderField                     the field to be used to sort the results
-   * @param ascending                      a boolean value to request the ordering to ascending or
-   *                                       descending
-   * @param nextPage                       The first page to be served (zero-based)
-   * @param pageCount                      How many pages are requested - can be null
-   * @param ignoreMaxServedExecutionsLimit whether this method is to apply the limit on the number
-   *                                       of executions are served. Be careful when setting this to
-   *                                       true.
+   * @param datasetIds a set of dataset identifiers to filter, can be empty or null to get all
+   * @param workflowStatuses a set of workflow statuses to filter, can be empty or null
+   * @param orderField the field to be used to sort the results
+   * @param ascending a boolean value to request the ordering to ascending or descending
+   * @param nextPage The first page to be served (zero-based)
+   * @param pageCount How many pages are requested - can be null
+   * @param ignoreMaxServedExecutionsLimit whether this method is to apply the limit on the number of executions are served. Be
+   * careful when setting this to true.
    * @return a list of all the WorkflowExecutions found
    */
   public ResultList<WorkflowExecution> getAllWorkflowExecutions(Set<String> datasetIds,
@@ -446,7 +434,7 @@ public ResultList<WorkflowExecution> getAllWorkflowExecutions(Set<String> datase
 
     // Execute query with correct pagination
     final FindOptions findOptions = new FindOptions().skip(pagination.getSkip())
-        .limit(pagination.getLimit());
+                                                     .limit(pagination.getLimit());
 
     // Set ordering
     if (orderField != null) {
@@ -462,38 +450,37 @@ public ResultList<WorkflowExecution> getAllWorkflowExecutions(Set<String> datase
   }
 
   /**
-   * Get an overview of all WorkflowExecutions. This returns a list of executions ordered to display
-   * an overview. First the ones in queue, then those in progress and then those that are finalized.
-   * Within these categories they will be sorted by creation date (most recent first). This method
-   * does support pagination.
-   *
+   * Get an overview of all WorkflowExecutions. This returns a list of executions ordered to display an overview. First the ones
+   * in queue, then those in progress and then those that are finalized. Within these categories they will be sorted by creation
+   * date (most recent first). This method does support pagination.
+   * <p>
    * TODO when we migrate
    * to mongo 3.4 or later, we can do this easier with new aggregation pipeline stages and
    * operators. The main improvements are 1) to try to map the root to the 'execution' variable so
    * that we don't have to look it up afterwards, and 2) to use $addFields with $switch to add the
    * statusIndex instead of having to go through creating and subtracting the two temporary fields.
    *
-   * @param datasetIds     a set of dataset identifiers to filter, can be empty or null to get all
+   * @param datasetIds a set of dataset identifiers to filter, can be empty or null to get all
    * @param pluginStatuses the plugin statuses to filter. Can be null.
-   * @param pluginTypes    the plugin types to filter. Can be null.
-   * @param fromDate       the date from where the results should start. Can be null.
-   * @param toDate         the date to where the results should end. Can be null.
-   * @param nextPage       the nextPage token
-   * @param pageCount      the number of pages that are requested
+   * @param pluginTypes the plugin types to filter. Can be null.
+   * @param fromDate the date from where the results should start. Can be null.
+   * @param toDate the date to where the results should end. Can be null.
+   * @param nextPage the nextPage token
+   * @param pageCount the number of pages that are requested
    * @return a list of all the WorkflowExecutions found. Is not null.
    */
   public ResultList<ExecutionDatasetPair> getWorkflowExecutionsOverview(Set<String> datasetIds,
       Set<PluginStatus> pluginStatuses, Set<PluginType> pluginTypes, Date fromDate, Date toDate,
       int nextPage, int pageCount) {
     return getWorkflowExecutionsOverview(datasetIds, pluginStatuses, pluginTypes, fromDate, toDate,
-            createPagination(nextPage, pageCount, false));
+        createPagination(nextPage, pageCount, false));
   }
 
   ResultList<ExecutionDatasetPair> getWorkflowExecutionsOverview(Set<String> datasetIds,
       Set<PluginStatus> pluginStatuses, Set<PluginType> pluginTypes, Date fromDate, Date toDate,
       Pagination pagination) {
 
-      return retryableExternalRequestForNetworkExceptions(() -> {
+    return retryableExternalRequestForNetworkExceptions(() -> {
 
       // Prepare pagination and check that there is something to query
       if (pagination.getLimit() < 1) {
@@ -502,7 +489,7 @@ ResultList<ExecutionDatasetPair> getWorkflowExecutionsOverview(Set<String> datas
 
       // Create the aggregate pipeline
       final Aggregation<WorkflowExecution> aggregation = morphiaDatastoreProvider.getDatastore()
-          .aggregate(WorkflowExecution.class);
+                                                                                 .aggregate(WorkflowExecution.class);
 
       // Step 1: create filter to match
       final Filter filter = createFilter(datasetIds, pluginStatuses, pluginTypes, fromDate, toDate);
@@ -513,7 +500,7 @@ ResultList<ExecutionDatasetPair> getWorkflowExecutionsOverview(Set<String> datas
 
       // Step 3: Sort - first on the status index, then on the createdDate.
       aggregation
-          .sort(Sort.on().ascending(statusIndexField).descending(CREATED_DATE.getFieldName()));
+          .sort(Sort.sort().ascending(statusIndexField).descending(CREATED_DATE.getFieldName()));
 
       // Step 4: Apply pagination
       aggregation.skip(pagination.getSkip()).limit(pagination.getLimit());
@@ -574,11 +561,11 @@ private String determineOrderingStatusIndex(Aggregation<WorkflowExecution> aggre
         .condition(runningCheckExpression, Expressions.value(RUNNING_POSITION_IN_OVERVIEW),
             Expressions.value(0));
 
-    aggregation.project(Projection.of()
-        .include(statusInQueueField, inqueueConditionExpression)
-        .include(statusRunningField, runningConditionExpression)
-        .include(CREATED_DATE.getFieldName())
-        .include(DATASET_ID.getFieldName()));
+    aggregation.project(Projection.project()
+                                  .include(statusInQueueField, inqueueConditionExpression)
+                                  .include(statusRunningField, runningConditionExpression)
+                                  .include(CREATED_DATE.getFieldName())
+                                  .include(DATASET_ID.getFieldName()));
 
     // Step 2: Copy specific positions to final variable: use default position if no position is set.
     final String statusIndexField = "statusIndex";
@@ -591,10 +578,10 @@ private String determineOrderingStatusIndex(Aggregation<WorkflowExecution> aggre
         .condition(sumCheckExpression, Expressions.value(DEFAULT_POSITION_IN_OVERVIEW),
             sumExpression);
 
-    aggregation.project(Projection.of()
-        .include(statusIndexField, statusIndexExpression)
-        .include(CREATED_DATE.getFieldName())
-        .include(DATASET_ID.getFieldName()));
+    aggregation.project(Projection.project()
+                                  .include(statusIndexField, statusIndexExpression)
+                                  .include(CREATED_DATE.getFieldName())
+                                  .include(DATASET_ID.getFieldName()));
 
     return statusIndexField;
   }
@@ -603,26 +590,27 @@ private void joinDatasetAndWorkflowExecution(Aggregation<WorkflowExecution> aggr
     // Step 1: Join with the dataset and the execution
     final String datasetListField = "datasetList";
     final String executionListField = "executionList";
-    aggregation.lookup(Lookup.from(Dataset.class).localField(DATASET_ID.getFieldName())
-        .foreignField(DATASET_ID.getFieldName()).as(datasetListField));
-    aggregation.lookup(Lookup.from(WorkflowExecution.class).localField(ID.getFieldName())
-        .foreignField(ID.getFieldName()).as(executionListField));
+    aggregation.lookup(Lookup.lookup(Dataset.class).localField(DATASET_ID.getFieldName())
+                             .foreignField(DATASET_ID.getFieldName()).as(datasetListField));
+    aggregation.lookup(Lookup.lookup(WorkflowExecution.class).localField(ID.getFieldName())
+                             .foreignField(ID.getFieldName()).as(executionListField));
 
     // Step 2: Keep only the first entry in the dataset and execution lists.
     final String datasetField = "dataset";
     final String executionField = "execution";
-    final Projection projection = Projection.of()
-        .include(datasetField,
-            ArrayExpressions.elementAt(Expressions.field(datasetListField), Expressions.value(0)))
-        .include(executionField, ArrayExpressions
-            .elementAt(Expressions.field(executionListField), Expressions.value(0)))
-        .suppressId();
+    final Projection projection = Projection.project()
+                                            .include(datasetField,
+                                                ArrayExpressions.elementAt(Expressions.field(datasetListField),
+                                                    Expressions.value(0)))
+                                            .include(executionField, ArrayExpressions
+                                                .elementAt(Expressions.field(executionListField), Expressions.value(0)))
+                                            .suppressId();
     aggregation.project(projection);
   }
 
   /**
-   * This object contains a pair consisting of a dataset and an execution. It is meant to be a
-   * result of aggregate queries, so the field names cannot easily be changed.
+   * This object contains a pair consisting of a dataset and an execution. It is meant to be a result of aggregate queries, so the
+   * field names cannot easily be changed.
    * <p>Annotation {@link Entity} required so that morphia can handle the aggregations.</p>
    */
   @Entity
@@ -637,7 +625,7 @@ public ExecutionDatasetPair() {
     /**
      * Constructor.
      *
-     * @param dataset   The dataset.
+     * @param dataset The dataset.
      * @param execution The execution.
      */
     public ExecutionDatasetPair(Dataset dataset, WorkflowExecution execution) {
@@ -655,8 +643,7 @@ public WorkflowExecution getExecution() {
   }
 
   /**
-   * The number of WorkflowExecutions that would be returned if a get all request would be
-   * performed.
+   * The number of WorkflowExecutions that would be returned if a get all request would be performed.
    *
    * @return the number representing the size during a get all request
    */
@@ -667,8 +654,7 @@ public int getWorkflowExecutionsPerRequest() {
   }
 
   /**
-   * Set the number of WorkflowExecutions that would be returned if a get all request would be
-   * performed.
+   * Set the number of WorkflowExecutions that would be returned if a get all request would be performed.
    *
    * @param workflowExecutionsPerRequest the number to set to
    */
@@ -709,15 +695,15 @@ public void setMaxServedExecutionListLength(int maxServedExecutionListLength) {
   public boolean isCancelled(ObjectId id) {
     WorkflowExecution workflowExecution = retryableExternalRequestForNetworkExceptions(() ->
         morphiaDatastoreProvider.getDatastore().find(WorkflowExecution.class)
-            .filter(Filters.eq(ID.getFieldName(), id))
-            .first(new FindOptions().projection().include(WORKFLOW_STATUS.getFieldName())));
+                                .filter(Filters.eq(ID.getFieldName(), id))
+                                .first(new FindOptions().projection().include(WORKFLOW_STATUS.getFieldName())));
     return workflowExecution != null
         && workflowExecution.getWorkflowStatus() == WorkflowStatus.CANCELLED;
   }
 
   /**
-   * Check if a WorkflowExecution using an execution identifier is in a cancelling state. The state
-   * before finally being {@link WorkflowStatus#CANCELLED}
+   * Check if a WorkflowExecution using an execution identifier is in a cancelling state. The state before finally being
+   * {@link WorkflowStatus#CANCELLED}
    *
    * @param id the execution identifier
    * @return true for cancelling, false for not cancelling
@@ -725,8 +711,8 @@ public boolean isCancelled(ObjectId id) {
   public boolean isCancelling(ObjectId id) {
     WorkflowExecution workflowExecution = retryableExternalRequestForNetworkExceptions(
         () -> morphiaDatastoreProvider.getDatastore().find(WorkflowExecution.class)
-            .filter(Filters.eq(ID.getFieldName(), id))
-            .first(new FindOptions().projection().include("cancelling")));
+                                      .filter(Filters.eq(ID.getFieldName(), id))
+                                      .first(new FindOptions().projection().include("cancelling")));
     return workflowExecution != null && workflowExecution.isCancelling();
   }
 
@@ -738,7 +724,7 @@ public boolean isCancelling(ObjectId id) {
    */
   public boolean deleteAllByDatasetId(String datasetId) {
     Query<WorkflowExecution> query = morphiaDatastoreProvider.getDatastore()
-        .find(WorkflowExecution.class);
+                                                             .find(WorkflowExecution.class);
     query.filter(Filters.eq(DATASET_ID.getFieldName(), datasetId));
     DeleteResult deleteResult = retryableExternalRequestForNetworkExceptions(
         () -> query.delete(new DeleteOptions().multi(true)));
@@ -756,18 +742,17 @@ public WorkflowExecution getByExternalTaskId(long externalTaskId) {
     // TODO JV Validation is disabled because otherwise it complains that the subquery is looking in a
     // list of AbstractMetisPlugin objects that don't have the "externalTaskId" property being queried.
     final Query<WorkflowExecution> query = morphiaDatastoreProvider.getDatastore()
-        .find(WorkflowExecution.class).disableValidation();
+                                                                   .find(WorkflowExecution.class).disableValidation();
     query.filter(Filters.elemMatch(METIS_PLUGINS.getFieldName(),
         Filters.eq("externalTaskId", Long.toString(externalTaskId))));
     return retryableExternalRequestForNetworkExceptions(query::first);
   }
 
   /**
-   * This method retrieves the workflow execution that contains a subtask satisfying the given
-   * parameters.
+   * This method retrieves the workflow execution that contains a subtask satisfying the given parameters.
    *
-   * @param plugin  The plugin ID representing the subtask.
-   * @param datasetId   The dataset ID of the workflow execution.
+   * @param plugin The plugin ID representing the subtask.
+   * @param datasetId The dataset ID of the workflow execution.
    * @return The workflow execution.
    */
   public WorkflowExecution getByTaskExecution(ExecutedMetisPluginId plugin, String datasetId) {
@@ -796,7 +781,7 @@ public WorkflowExecution getAnyByXsltId(String xsltId) {
     // Create query to find workflow execution
     final Query<WorkflowExecution> query =
         morphiaDatastoreProvider.getDatastore().find(WorkflowExecution.class)
-            .disableValidation();
+                                .disableValidation();
     query.disableValidation().filter(Filters.elemMatch(METIS_PLUGINS.getFieldName(),
         Filters.eq(PLUGIN_METADATA.getFieldName() + "." + XSLT_ID.getFieldName(), xsltId)));
     return retryableExternalRequestForNetworkExceptions(query::first);
@@ -863,9 +848,9 @@ public static class ResultList<T> {
     /**
      * Constructor.
      *
-     * @param results               The results.
-     * @param maxResultCountReached Whether the maximum result count has been reached (indicating
-     *                              whether next pages will be served).
+     * @param results The results.
+     * @param maxResultCountReached Whether the maximum result count has been reached (indicating whether next pages will be
+     * served).
      */
     public ResultList(List<T> results, boolean maxResultCountReached) {
       this.results = new ArrayList<>(results);
diff --git a/metis-core/metis-core-service/src/test/java/eu/europeana/metis/core/service/TestProxiesService.java b/metis-core/metis-core-service/src/test/java/eu/europeana/metis/core/service/TestProxiesService.java
index 520dc34938..56b4be524f 100644
--- a/metis-core/metis-core-service/src/test/java/eu/europeana/metis/core/service/TestProxiesService.java
+++ b/metis-core/metis-core-service/src/test/java/eu/europeana/metis/core/service/TestProxiesService.java
@@ -356,8 +356,7 @@ void getListOfFileContentsFromPluginExecution() throws Exception {
 
     // Mock getting the records from eCloud.
     final String ecloudId = "ECLOUDID1";
-    final CloudTagsResponse cloudTagsResponse = new CloudTagsResponse(ecloudId, false, false,
-        false);
+    final CloudTagsResponse cloudTagsResponse = new CloudTagsResponse(ecloudId, false);
     when(ecloudDataSetServiceClient
         .getRevisionsWithDeletedFlagSetToFalse(anyString(), anyString(), anyString(), anyString(), anyString(),
             anyString(), anyInt())).thenReturn(Collections.singletonList(cloudTagsResponse));
diff --git a/metis-core/pom.xml b/metis-core/pom.xml
index 76129fe3f4..d8814c0072 100644
--- a/metis-core/pom.xml
+++ b/metis-core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-framework</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-core</artifactId>
   <packaging>pom</packaging>
diff --git a/metis-dereference/metis-dereference-common/pom.xml b/metis-dereference/metis-dereference-common/pom.xml
index 28523fe221..43e45a2ed3 100644
--- a/metis-dereference/metis-dereference-common/pom.xml
+++ b/metis-dereference/metis-dereference-common/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-dereference</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-dereference-common</artifactId>
   <dependencies>
diff --git a/metis-dereference/metis-dereference-import/pom.xml b/metis-dereference/metis-dereference-import/pom.xml
index a5cbf00079..e51a419fea 100644
--- a/metis-dereference/metis-dereference-import/pom.xml
+++ b/metis-dereference/metis-dereference-import/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-dereference</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>metis-dereference-import</artifactId>
diff --git a/metis-dereference/metis-dereference-rest/pom.xml b/metis-dereference/metis-dereference-rest/pom.xml
index 3c0ce3bc8b..699e0a9257 100644
--- a/metis-dereference/metis-dereference-rest/pom.xml
+++ b/metis-dereference/metis-dereference-rest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-dereference</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-dereference-rest</artifactId>
   <dependencies>
@@ -61,6 +61,11 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
     </dependency>
+    <dependency>
+      <groupId>eu.europeana.metis</groupId>
+      <artifactId>metis-common-spring-properties</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>eu.europeana.metis</groupId>
       <artifactId>metis-dereference-service</artifactId>
diff --git a/metis-dereference/metis-dereference-rest/src/main/java/eu/europeana/metis/dereference/rest/config/ApplicationConfiguration.java b/metis-dereference/metis-dereference-rest/src/main/java/eu/europeana/metis/dereference/rest/config/ApplicationConfiguration.java
index cf5ad4ca2f..1eb4a347fb 100644
--- a/metis-dereference/metis-dereference-rest/src/main/java/eu/europeana/metis/dereference/rest/config/ApplicationConfiguration.java
+++ b/metis-dereference/metis-dereference-rest/src/main/java/eu/europeana/metis/dereference/rest/config/ApplicationConfiguration.java
@@ -2,6 +2,7 @@
 
 import com.mongodb.client.MongoClient;
 import eu.europeana.corelib.web.socks.SocksProxy;
+import eu.europeana.metis.dereference.rest.config.properties.MetisDereferenceConfigurationProperties;
 import eu.europeana.metis.dereference.service.DereferenceService;
 import eu.europeana.metis.dereference.service.DereferencingManagementService;
 import eu.europeana.metis.dereference.service.MongoDereferenceService;
@@ -10,18 +11,24 @@
 import eu.europeana.metis.dereference.service.dao.VocabularyDao;
 import eu.europeana.metis.dereference.vocimport.VocabularyCollectionImporterFactory;
 import eu.europeana.metis.mongo.connection.MongoClientProvider;
+import eu.europeana.metis.mongo.connection.MongoProperties;
+import eu.europeana.metis.mongo.connection.MongoProperties.ReadPreferenceValue;
 import eu.europeana.metis.utils.CustomTruststoreAppender;
-import eu.europeana.metis.utils.CustomTruststoreAppender.TrustStoreConfigurationException;
 import eu.europeana.metis.utils.apm.ElasticAPMConfiguration;
+import java.lang.invoke.MethodHandles;
 import java.util.Set;
 import javax.annotation.PreDestroy;
+import metis.common.config.properties.SocksProxyConfigurationProperties;
+import metis.common.config.properties.TruststoreConfigurationProperties;
+import metis.common.config.properties.mongo.MongoConfigurationProperties;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.filter.ForwardedHeaderFilter;
@@ -34,59 +41,84 @@
  * Entry class with configuration fields and beans initialization for the application.
  */
 @Configuration
-@Import({ElasticAPMConfiguration.class})
+@EnableConfigurationProperties({
+    ElasticAPMConfiguration.class, TruststoreConfigurationProperties.class,
+    SocksProxyConfigurationProperties.class, MongoConfigurationProperties.class,
+    MetisDereferenceConfigurationProperties.class})
 @EnableScheduling
-@ComponentScan(basePackages = {"eu.europeana.metis.dereference.rest.controller",
+@ComponentScan(basePackages = {
+    "eu.europeana.metis.dereference.rest.controller",
     "eu.europeana.metis.dereference.rest.exceptions"})
 @EnableWebMvc
 public class ApplicationConfiguration implements WebMvcConfigurer {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationConfiguration.class);
-
-  private final ConfigurationPropertiesHolder propertiesHolder;
+  private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   private final MongoClient mongoClient;
+  private ProcessedEntityDao processedEntityDao;
 
   /**
-   * Autowired constructor for Spring Configuration class.
+   * Constructor.
    *
-   * @param propertiesHolder the object that holds all boot configuration values
-   * @throws TrustStoreConfigurationException if the configuration of the truststore failed
+   * @param truststoreConfigurationProperties the truststore configuration properties
+   * @param socksProxyConfigurationProperties the socks proxy configuration properties
+   * @param mongoConfigurationProperties the mongo configuration properties
+   * @throws CustomTruststoreAppender.TrustStoreConfigurationException if the configuration of the truststore failed
    */
-  public ApplicationConfiguration(ConfigurationPropertiesHolder propertiesHolder) throws TrustStoreConfigurationException {
-    mongoClient = ApplicationConfiguration.initializeApplication(propertiesHolder);
-    this.propertiesHolder = propertiesHolder;
+  @Autowired
+  public ApplicationConfiguration(TruststoreConfigurationProperties truststoreConfigurationProperties,
+      SocksProxyConfigurationProperties socksProxyConfigurationProperties,
+      MongoConfigurationProperties mongoConfigurationProperties)
+      throws CustomTruststoreAppender.TrustStoreConfigurationException {
+    ApplicationConfiguration.initializeTruststore(truststoreConfigurationProperties);
+    ApplicationConfiguration.initializeSocksProxy(socksProxyConfigurationProperties);
+    this.mongoClient = ApplicationConfiguration.getMongoClient(mongoConfigurationProperties);
   }
 
   /**
-   * This method performs the initializing tasks for the application.
+   * Truststore initializer
    *
-   * @param propertiesHolder The properties.
-   * @return The Mongo client that can be used to access the mongo database.
-   * @throws TrustStoreConfigurationException In case a problem occurred with the truststore.
+   * @param truststoreConfigurationProperties the truststore configuration properties
+   * @throws CustomTruststoreAppender.TrustStoreConfigurationException In case a problem occurred with the truststore.
    */
-  static MongoClient initializeApplication(ConfigurationPropertiesHolder propertiesHolder)
-      throws TrustStoreConfigurationException {
-
-    // Load the trust store file.
-    if (StringUtils.isNotEmpty(propertiesHolder.getTruststorePath()) && StringUtils
-        .isNotEmpty(propertiesHolder.getTruststorePassword())) {
+  static void initializeTruststore(TruststoreConfigurationProperties truststoreConfigurationProperties)
+      throws CustomTruststoreAppender.TrustStoreConfigurationException {
+    if (StringUtils.isNotEmpty(truststoreConfigurationProperties.getPath()) && StringUtils
+        .isNotEmpty(truststoreConfigurationProperties.getPassword())) {
       CustomTruststoreAppender
-          .appendCustomTrustoreToDefault(propertiesHolder.getTruststorePath(),
-              propertiesHolder.getTruststorePassword());
+          .appendCustomTruststoreToDefault(truststoreConfigurationProperties.getPath(),
+              truststoreConfigurationProperties.getPassword());
       LOGGER.info("Custom truststore appended to default truststore");
     }
+  }
 
-    // Initialize the socks proxy.
-    if (propertiesHolder.isSocksProxyEnabled()) {
-      new SocksProxy(propertiesHolder.getSocksProxyHost(), propertiesHolder.getSocksProxyPort(),
-          propertiesHolder
-              .getSocksProxyUsername(),
-          propertiesHolder.getSocksProxyPassword()).init();
+  /**
+   * Socks proxy initializer.
+   *
+   * @param socksProxyConfigurationProperties the socks proxy configuration properties
+   */
+  static void initializeSocksProxy(SocksProxyConfigurationProperties socksProxyConfigurationProperties) {
+    if (socksProxyConfigurationProperties.isEnabled()) {
+      new SocksProxy(socksProxyConfigurationProperties.getHost(), socksProxyConfigurationProperties.getPort(),
+          socksProxyConfigurationProperties.getUsername(),
+          socksProxyConfigurationProperties.getPassword()).init();
       LOGGER.info("Socks proxy enabled");
     }
+  }
 
-    // Initialize the Mongo connection
-    return new MongoClientProvider<>(propertiesHolder.getMongoProperties()).createMongoClient();
+  public static MongoClient getMongoClient(MongoConfigurationProperties mongoConfigurationProperties) {
+    final MongoProperties<IllegalArgumentException> mongoProperties = new MongoProperties<>(
+        IllegalArgumentException::new);
+    mongoProperties.setAllProperties(
+        mongoConfigurationProperties.getHosts(),
+        mongoConfigurationProperties.getPorts(),
+        mongoConfigurationProperties.getAuthenticationDatabase(),
+        mongoConfigurationProperties.getUsername(),
+        mongoConfigurationProperties.getPassword(),
+        mongoConfigurationProperties.isEnableSsl(),
+        ReadPreferenceValue.PRIMARY_PREFERRED,
+        mongoConfigurationProperties.getApplicationName());
+
+    return new MongoClientProvider<>(mongoProperties).createMongoClient();
   }
 
   /**
@@ -133,18 +165,19 @@ public void addViewControllers(ViewControllerRegistry registry) {
   }
 
   @Bean
-  ProcessedEntityDao getProcessedEntityDao() {
-    return new ProcessedEntityDao(mongoClient, propertiesHolder.getEntityDb());
+  ProcessedEntityDao getProcessedEntityDao(MongoConfigurationProperties mongoConfigurationProperties) {
+    processedEntityDao = new ProcessedEntityDao(mongoClient, mongoConfigurationProperties.getDatabase());
+    return processedEntityDao;
   }
 
   @Bean
-  VocabularyDao getVocabularyDao() {
-    return new VocabularyDao(mongoClient, propertiesHolder.getVocabularyDb());
+  VocabularyDao getVocabularyDao(MongoConfigurationProperties mongoConfigurationProperties) {
+    return new VocabularyDao(mongoClient, mongoConfigurationProperties.getDatabase());
   }
 
   @Bean
-  Set<String> getAllowedUrlDomains() {
-    return Set.of(propertiesHolder.getAllowedUrlDomains());
+  Set<String> getAllowedUrlDomains(MetisDereferenceConfigurationProperties metisDereferenceConfigurationProperties) {
+    return Set.of(metisDereferenceConfigurationProperties.getAllowedUrlDomains());
   }
 
   /**
@@ -164,19 +197,19 @@ ForwardedHeaderFilter forwardedHeaderFilter() {
    * redis instance/cluster is used for multiple services then the cache for other services is cleared as well. This task is
    * scheduled by a cron expression.
    */
-
-  @Scheduled(cron = "${dereference.purge.emptyxml.frequency}")
+  // TODO: 24/08/2023 Is there a better way to load the configuration here?
+  @Scheduled(cron = "${metis-dereference.getPurgeEmptyXmlFrequency}")
   public void dereferenceCacheNullOrEmpty() {
-    getProcessedEntityDao().purgeByNullOrEmptyXml();
+    processedEntityDao.purgeByNullOrEmptyXml();
   }
 
   /**
    * Empty Cache. This will remove ALL entries in the cache (Redis). If the same redis instance/cluster is used for multiple
    * services then the cache for other services is cleared as well. This task is scheduled by a cron expression.
    */
-  @Scheduled(cron = "${dereference.purge.all.frequency}")
+  @Scheduled(cron = "${metis-dereference.getPurgeAllFrequency}")
   public void dereferenceCachePurgeAll() {
-    getProcessedEntityDao().purgeAll();
+    processedEntityDao.purgeAll();
   }
 
   /**
diff --git a/metis-dereference/metis-dereference-rest/src/main/java/eu/europeana/metis/dereference/rest/config/ConfigurationPropertiesHolder.java b/metis-dereference/metis-dereference-rest/src/main/java/eu/europeana/metis/dereference/rest/config/ConfigurationPropertiesHolder.java
deleted file mode 100644
index 0c92d35e1c..0000000000
--- a/metis-dereference/metis-dereference-rest/src/main/java/eu/europeana/metis/dereference/rest/config/ConfigurationPropertiesHolder.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package eu.europeana.metis.dereference.rest.config;
-
-import eu.europeana.metis.mongo.connection.MongoProperties;
-import eu.europeana.metis.mongo.connection.MongoProperties.ReadPreferenceValue;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.stereotype.Component;
-
-/**
- * Class that is used to read all configuration properties for the application.
- * <p>
- * It uses {@link PropertySource} to identify the properties on application startup
- * </p>
- */
-@Component
-public class ConfigurationPropertiesHolder {
-
-  //Socks proxy
-  @Value("${socks.proxy.enabled}")
-  private boolean socksProxyEnabled;
-  @Value("${socks.proxy.host}")
-  private String socksProxyHost;
-  @Value("${socks.proxy.port}")
-  private String socksProxyPort;
-  @Value("${socks.proxy.username}")
-  private String socksProxyUsername;
-  @Value("${socks.proxy.password}")
-  private String socksProxyPassword;
-
-  //Custom trustore
-  @Value("${truststore.path}")
-  private String truststorePath;
-  @Value("${truststore.password}")
-  private String truststorePassword;
-
-  //Mongo
-  @Value("${mongo.hosts}")
-  private String[] mongoHosts;
-  @Value("${mongo.port}")
-  private int[] mongoPorts;
-  @Value("${mongo.username}")
-  private String mongoUsername;
-  @Value("${mongo.password}")
-  private String mongoPassword;
-  @Value("${mongo.authentication.db}")
-  private String mongoAuthenticationDb;
-  @Value("${mongo.enableSSL}")
-  private boolean mongoEnableSSL;
-  @Value("${mongo.application.name}")
-  private String mongoApplicationName;
-  @Value("${entity.db}")
-  private String entityDb;
-  @Value("${vocabulary.db}")
-  private String vocabularyDb;
-
-
-  //Valid directories list
-  @Value("${allowed.url.domains}")
-  private String[] allowedUrlDomains;
-
-  public boolean isSocksProxyEnabled() {
-    return socksProxyEnabled;
-  }
-
-  public String getSocksProxyHost() {
-    return socksProxyHost;
-  }
-
-  public String getSocksProxyPort() {
-    return socksProxyPort;
-  }
-
-  public String getSocksProxyUsername() {
-    return socksProxyUsername;
-  }
-
-  public String getSocksProxyPassword() {
-    return socksProxyPassword;
-  }
-
-  public String getTruststorePath() {
-    return truststorePath;
-  }
-
-  public String getTruststorePassword() {
-    return truststorePassword;
-  }
-
-  public MongoProperties<IllegalArgumentException> getMongoProperties() {
-    final MongoProperties<IllegalArgumentException> mongoProperties = new MongoProperties<>(
-        IllegalArgumentException::new);
-    mongoProperties.setAllProperties(mongoHosts, mongoPorts, mongoAuthenticationDb, mongoUsername,
-        mongoPassword, mongoEnableSSL, ReadPreferenceValue.PRIMARY_PREFERRED, mongoApplicationName);
-    return mongoProperties;
-  }
-
-  public String getEntityDb() {
-    return entityDb;
-  }
-
-  public String getVocabularyDb() {
-    return vocabularyDb;
-  }
-
-  public String[] getAllowedUrlDomains() {
-    return allowedUrlDomains == null ? null : allowedUrlDomains.clone();
-  }
-}
diff --git a/metis-dereference/metis-dereference-rest/src/main/java/eu/europeana/metis/dereference/rest/config/properties/MetisDereferenceConfigurationProperties.java b/metis-dereference/metis-dereference-rest/src/main/java/eu/europeana/metis/dereference/rest/config/properties/MetisDereferenceConfigurationProperties.java
new file mode 100644
index 0000000000..d5f312d2d7
--- /dev/null
+++ b/metis-dereference/metis-dereference-rest/src/main/java/eu/europeana/metis/dereference/rest/config/properties/MetisDereferenceConfigurationProperties.java
@@ -0,0 +1,38 @@
+package eu.europeana.metis.dereference.rest.config.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Class using {@link ConfigurationProperties} loading.
+ */
+@ConfigurationProperties(prefix = "metis-dereference")
+public class MetisDereferenceConfigurationProperties {
+
+    private String allowedUrlDomains;
+    private String purgeAllFrequency;
+    private String purgeEmptyXmlFrequency;
+
+    public String getAllowedUrlDomains() {
+        return allowedUrlDomains;
+    }
+
+    public void setAllowedUrlDomains(String allowedUrlDomains) {
+        this.allowedUrlDomains = allowedUrlDomains;
+    }
+
+    public String getPurgeAllFrequency() {
+        return purgeAllFrequency;
+    }
+
+    public void setPurgeAllFrequency(String purgeAllFrequency) {
+        this.purgeAllFrequency = purgeAllFrequency;
+    }
+
+    public String getPurgeEmptyXmlFrequency() {
+        return purgeEmptyXmlFrequency;
+    }
+
+    public void setPurgeEmptyXmlFrequency(String purgeEmptyXmlFrequency) {
+        this.purgeEmptyXmlFrequency = purgeEmptyXmlFrequency;
+    }
+}
diff --git a/metis-dereference/metis-dereference-rest/src/main/java/eu/europeana/metis/dereference/rest/controller/DereferencingManagementController.java b/metis-dereference/metis-dereference-rest/src/main/java/eu/europeana/metis/dereference/rest/controller/DereferencingManagementController.java
index 82475a6dd7..2b4851c31b 100644
--- a/metis-dereference/metis-dereference-rest/src/main/java/eu/europeana/metis/dereference/rest/controller/DereferencingManagementController.java
+++ b/metis-dereference/metis-dereference-rest/src/main/java/eu/europeana/metis/dereference/rest/controller/DereferencingManagementController.java
@@ -1,6 +1,7 @@
 package eu.europeana.metis.dereference.rest.controller;
 
 import eu.europeana.metis.dereference.Vocabulary;
+import eu.europeana.metis.dereference.rest.config.properties.MetisDereferenceConfigurationProperties;
 import eu.europeana.metis.dereference.service.DereferencingManagementService;
 import eu.europeana.metis.dereference.vocimport.exception.VocabularyImportException;
 import eu.europeana.metis.exception.BadContentException;
@@ -43,12 +44,13 @@ public class DereferencingManagementController {
    * Constructor parameterized.
    *
    * @param service the dereferencing management service
-   * @param allowedUrlDomains the allowed valid url prefixes
+   * @param metisDereferenceConfigurationProperties the metis dereference configuration properties
    */
   @Autowired
-  public DereferencingManagementController(DereferencingManagementService service, Set<String> allowedUrlDomains) {
+  public DereferencingManagementController(DereferencingManagementService service,
+      MetisDereferenceConfigurationProperties metisDereferenceConfigurationProperties) {
     this.service = service;
-    this.allowedUrlDomains = new HashSet<>(allowedUrlDomains);
+    this.allowedUrlDomains = new HashSet<>(Set.of(metisDereferenceConfigurationProperties.getAllowedUrlDomains()));
   }
 
   /**
diff --git a/metis-dereference/metis-dereference-rest/src/main/resources/application.properties.example b/metis-dereference/metis-dereference-rest/src/main/resources/application.properties.example
index 43ffe57c5f..b55b064a4a 100644
--- a/metis-dereference/metis-dereference-rest/src/main/resources/application.properties.example
+++ b/metis-dereference/metis-dereference-rest/src/main/resources/application.properties.example
@@ -5,19 +5,15 @@ spring.autoconfigure.exclude=\
   org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoAutoConfiguration, \
   org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration, \
   org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration
-
-#Server
-##Should be '/' for deployments with a host. Should have a value for local deployments without a host
-server.servlet.context-path=/metis-dereference
-##X-forward-header to allow springdoc/swagger to work behind a reverse proxy
-server.forward-headers-strategy=framework
+springdoc.packages-to-scan=eu.europeana.metis.dereference.rest
+springdoc.paths-to-match=/**
 
 #Socks Proxy
-socks.proxy.enabled=
-socks.proxy.host=
-socks.proxy.port=
-socks.proxy.username=
-socks.proxy.password=
+socks-proxy.enabled=false
+socks-proxy.host=
+socks-proxy.port=
+socks-proxy.username=
+socks-proxy.password=
 
 ##Truststore
 truststore.path=
@@ -25,39 +21,33 @@ truststore.password=
 
 #Mongo
 mongo.hosts=
-mongo.port=
-mongo.authentication.db=admin
+mongo.ports=
+mongo.authenticationDatabase=
 mongo.username=
 mongo.password=
-mongo.enableSSL=false
-mongo.application.name=
-entity.db=
-vocabulary.db=
+mongo.enableSsl=
+mongo.database=
+mongo.applicationName=
 
-#The allowed domains for vocabularies loading without the scheme(always validated against https). e.g. raw.githubusercontent.com
-allowed.url.domains=
+metis-dereference.allowedUrlDomains=raw.githubusercontent.com
+metis-dereference.getPurgeAllFrequency=@monthly
+metis-dereference.getPurgeEmptyXmlFrequency=@daily
 
-# Dereferencing cache cron expressions,
-# refer to Spring Framework CronExpression for documentation
-dereference.purge.all.frequency=@monthly
-# purge empty xml
-dereference.purge.emptyxml.frequency=@daily
+#Logging
+logging.config=
 
 #Actuator
 management.endpoint.health.probes.enabled=true
 management.health.livenessState.enabled=true
 management.health.readinessState.enabled=true
 
-#Logging
-logging.config=
-
 # Elastic APM
 elastic.apm.enabled=false
 elastic.apm.recording=true
 elastic.apm.instrument=true
 elastic.apm.service_name=metis-dereference
 elastic.apm.server_url=
-elastic.apm.environment=test
+elastic.apm.environment=local
 elastic.apm.application_packages=eu.europeana
 elastic.apm.log_level=ERROR
 elastic.apm.capture_body=all
diff --git a/metis-dereference/metis-dereference-rest/src/test/java/eu/europeana/metis/dereference/rest/DereferencingManagementControllerTest.java b/metis-dereference/metis-dereference-rest/src/test/java/eu/europeana/metis/dereference/rest/DereferencingManagementControllerTest.java
index 51b7f82ac5..c53c23ede8 100644
--- a/metis-dereference/metis-dereference-rest/src/test/java/eu/europeana/metis/dereference/rest/DereferencingManagementControllerTest.java
+++ b/metis-dereference/metis-dereference-rest/src/test/java/eu/europeana/metis/dereference/rest/DereferencingManagementControllerTest.java
@@ -19,6 +19,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import eu.europeana.metis.dereference.Vocabulary;
+import eu.europeana.metis.dereference.rest.config.properties.MetisDereferenceConfigurationProperties;
 import eu.europeana.metis.dereference.rest.controller.DereferencingController;
 import eu.europeana.metis.dereference.rest.controller.DereferencingManagementController;
 import eu.europeana.metis.dereference.rest.exceptions.RestResponseExceptionHandler;
@@ -28,7 +29,6 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Set;
 import org.bson.types.ObjectId;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -49,8 +49,10 @@ class DereferencingManagementControllerTest {
   void setUp() {
     deRefManagementServiceMock = mock(DereferencingManagementService.class);
 
+    MetisDereferenceConfigurationProperties metisDereferenceConfigurationProperties = new MetisDereferenceConfigurationProperties();
+    metisDereferenceConfigurationProperties.setAllowedUrlDomains("valid.domain.com");
     DereferencingManagementController dereferencingManagementController = new DereferencingManagementController(
-        deRefManagementServiceMock, Set.of("valid.domain.com"));
+        deRefManagementServiceMock, metisDereferenceConfigurationProperties);
 
     deRefManagementControllerMock = MockMvcBuilders.standaloneSetup(dereferencingManagementController)
                                                    .setControllerAdvice(new RestResponseExceptionHandler()).build();
diff --git a/metis-dereference/metis-dereference-service/pom.xml b/metis-dereference/metis-dereference-service/pom.xml
index afdb8ab720..ee7e0b3aab 100644
--- a/metis-dereference/metis-dereference-service/pom.xml
+++ b/metis-dereference/metis-dereference-service/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-dereference</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-dereference-service</artifactId>
   <dependencies>
diff --git a/metis-dereference/metis-dereference-service/src/main/java/eu/europeana/metis/dereference/service/MongoDereferenceService.java b/metis-dereference/metis-dereference-service/src/main/java/eu/europeana/metis/dereference/service/MongoDereferenceService.java
index 2f1c19b851..7b66653dcd 100644
--- a/metis-dereference/metis-dereference-service/src/main/java/eu/europeana/metis/dereference/service/MongoDereferenceService.java
+++ b/metis-dereference/metis-dereference-service/src/main/java/eu/europeana/metis/dereference/service/MongoDereferenceService.java
@@ -1,7 +1,5 @@
 package eu.europeana.metis.dereference.service;
 
-import static eu.europeana.metis.utils.CommonStringValues.CRLF_PATTERN;
-
 import eu.europeana.enrichment.api.external.DereferenceResultStatus;
 import eu.europeana.enrichment.api.external.model.Concept;
 import eu.europeana.enrichment.api.external.model.EnrichmentBase;
@@ -20,6 +18,18 @@
 import eu.europeana.metis.dereference.service.utils.GraphUtils;
 import eu.europeana.metis.dereference.service.utils.VocabularyCandidates;
 import eu.europeana.metis.exception.BadContentException;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.bson.types.ObjectId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.xml.bind.JAXBException;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -33,17 +43,8 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.xml.bind.JAXBException;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-import org.bson.types.ObjectId;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
+
+import static eu.europeana.metis.utils.CommonStringValues.CRLF_PATTERN;
 
 /**
  * Mongo implementation of the dereference service Created by ymamakis on 2/11/16.
@@ -51,361 +52,403 @@
 @Component
 public class MongoDereferenceService implements DereferenceService {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(MongoDereferenceService.class);
-
-  private final RdfRetriever retriever;
-  private final ProcessedEntityDao processedEntityDao;
-  private final VocabularyDao vocabularyDao;
-
-  /**
-   * Constructor.
-   *
-   * @param processedEntityDao Object managing the processed entity cache.
-   * @param vocabularyDao Object that accesses vocabularies.
-   */
-  @Autowired
-  public MongoDereferenceService(ProcessedEntityDao processedEntityDao, VocabularyDao vocabularyDao) {
-    this(new RdfRetriever(), processedEntityDao, vocabularyDao);
-  }
-
-  /**
-   * Constructor.
-   *
-   * @param retriever Object that retrieves entities from their source services.
-   * @param processedEntityDao Object managing the processed entity cache.
-   * @param vocabularyDao Object that accesses vocabularies.
-   */
-  MongoDereferenceService(RdfRetriever retriever, ProcessedEntityDao processedEntityDao, VocabularyDao vocabularyDao) {
-    this.retriever = retriever;
-    this.processedEntityDao = processedEntityDao;
-    this.vocabularyDao = vocabularyDao;
-  }
-
-  /**
-   * Mongo dereference implementation
-   *
-   * @param resourceId The resource ID (URI) to dereference
-   * @return Dereference results with dereference status.
-   * @throws IllegalArgumentException In case the Parameter is null.
-   */
-  @Override
-  public DereferenceResult dereference(String resourceId) {
-    // Sanity check
-    if (resourceId == null) {
-      throw new IllegalArgumentException("Parameter resourceId cannot be null.");
+    private static final Logger LOGGER = LoggerFactory.getLogger(MongoDereferenceService.class);
+
+    private final RdfRetriever retriever;
+    private final ProcessedEntityDao processedEntityDao;
+    private final VocabularyDao vocabularyDao;
+
+    /**
+     * Constructor.
+     *
+     * @param processedEntityDao Object managing the processed entity cache.
+     * @param vocabularyDao      Object that accesses vocabularies.
+     */
+    @Autowired
+    public MongoDereferenceService(ProcessedEntityDao processedEntityDao,
+                                   VocabularyDao vocabularyDao) {
+        this(new RdfRetriever(), processedEntityDao, vocabularyDao);
     }
 
-    return dereferenceResource(resourceId);
-  }
-
-  /**
-   * <p>
-   * This method dereferences a resource. If the resource's vocabulary specifies a positive iteration count, this method also
-   * repeatedly retrieves the 'broader' resources and returns those as well.
-   * </p>
-   * <p>
-   * A resource has references to its 'broader' resources (see {@link #extractBroaderResources(EnrichmentBase, Set)}). As such,
-   * the resources form a directed graph and the iteration count is the distance from the requested resource. This method performs
-   * a breadth-first search through this graph to retrieve all resources within a certain distance from the requested resource.
-   * </p>
-   * <p> The Dereference result contains a collection of dereferenced resources.
-   * Note: That could not be null, but could be empty. The deferenced status could have the following values:
-   * <ul>
-   * <li>NO_VOCABULARY_MATCHING, this occurs if there is no enrichment base and no vocabulary.</li>
-   * <li>NO_ENTITY_FOR_VOCABULARY, this means the resource was found but no vocabulary and enrichment was found.</li>
-   * <li>ENTITY_FOUND_XLT_ERROR, this occurs when an JAXBExcetion happened.</li>
-   * <li>INVALID_URL, this occurs when an URIException happened.</li>
-   * <li>UNKNOWN_ENTITY, this occurs is the entity is unknown.</li>
-   * <li>SUCCESS, this means everything was processed successfully.</li>
-   * </ul>
-   * </p>
-   *
-   * @param resourceId The resource to dereference.
-   * @return An object containing the dereferenced resources and the status of dereference process.
-   */
-  private DereferenceResult dereferenceResource(String resourceId) {
-    DereferenceResult dereferenceResult;
-    try {
-      // Get the main object to dereference. If null, we are done.
-      final DereferenceResultWrapper resource = computeEnrichmentBaseVocabulary(resourceId);
-
-      dereferenceResult = checkEmptyEnrichmentBaseAndVocabulary(resource);
-
-      if (dereferenceResult == null) {
-        // Create value resolver that catches exceptions and logs them.
-        final Function<String, Pair<EnrichmentBase, DereferenceResultStatus>> valueResolver = getValueResolver();
-
-        // Perform the breadth-first search to search for broader terms (if needed).
-        final int iterations = resource.getVocabulary().getIterations();
-        final Map<String, Pair<EnrichmentBase, DereferenceResultStatus>> result;
-        if (iterations > 0) {
-          result = GraphUtils
-              .breadthFirstSearch(resourceId,
-                  new ImmutablePair<>(resource.getEnrichmentBase(), resource.getDereferenceResultStatus()),
-                  resource.getVocabulary().getIterations(),
-                  valueResolver, this::extractBroaderResources);
-        } else {
-          result = new HashMap<>();
-          result.put(resourceId, new ImmutablePair<>(resource.getEnrichmentBase(), resource.getDereferenceResultStatus()));
+    /**
+     * Constructor.
+     *
+     * @param retriever          Object that retrieves entities from their source services.
+     * @param processedEntityDao Object managing the processed entity cache.
+     * @param vocabularyDao      Object that accesses vocabularies.
+     */
+    MongoDereferenceService(RdfRetriever retriever, ProcessedEntityDao processedEntityDao,
+                            VocabularyDao vocabularyDao) {
+        this.retriever = retriever;
+        this.processedEntityDao = processedEntityDao;
+        this.vocabularyDao = vocabularyDao;
+    }
+
+    private static DereferenceResult checkEmptyEnrichmentBaseAndVocabulary(
+            DereferenceResultWrapper resource) {
+        DereferenceResult dereferenceResult = null;
+        // No EnrichmentBase and no Vocabulary.
+        if (resource.getEnrichmentBase() == null && resource.getVocabulary() == null
+                && resource.getDereferenceResultStatus() == DereferenceResultStatus.SUCCESS) {
+            dereferenceResult = new DereferenceResult(DereferenceResultStatus.NO_VOCABULARY_MATCHING);
+            // No EnrichmentBase, no Vocabulary and an error occurred.
+        } else if (resource.getEnrichmentBase() == null && resource.getVocabulary() == null) {
+            dereferenceResult = new DereferenceResult(resource.getDereferenceResultStatus());
         }
-        // Done
-        dereferenceResult = new DereferenceResult(
-            result.values().stream().map(Pair::getLeft).collect(Collectors.toList()),
-            result.values().stream().map(Pair::getRight).filter(Objects::nonNull).findFirst()
-                  .orElse(DereferenceResultStatus.UNKNOWN_ENTITY));
-      }
-    } catch (JAXBException jaxbException) {
-      LOGGER.warn(String.format("Problem occurred while dereferencing resource %s.", resourceId), jaxbException);
-      // No EnrichmentBase + Status
-      dereferenceResult = new DereferenceResult(DereferenceResultStatus.ENTITY_FOUND_XML_XSLT_ERROR);
-    } catch (URISyntaxException uriSyntaxException) {
-      LOGGER.warn(String.format("Problem occurred while dereferencing resource %s.", resourceId), uriSyntaxException);
-      // No EnrichmentBase + Status
-      dereferenceResult = new DereferenceResult(DereferenceResultStatus.INVALID_URL);
+        return dereferenceResult;
     }
-    return dereferenceResult;
-  }
-
-  private Function<String, Pair<EnrichmentBase, DereferenceResultStatus>> getValueResolver() {
-    return key -> {
-      DereferenceResultWrapper result;
-      try {
-        result = computeEnrichmentBaseVocabulary(key);
-        if (result.getEnrichmentBase() == null && result.getVocabulary() == null
-            && result.getDereferenceResultStatus() == DereferenceResultStatus.SUCCESS) {
-          // No EnrichmentBase + Status
-          return new ImmutablePair<>(null, DereferenceResultStatus.NO_ENTITY_FOR_VOCABULARY);
+
+    private static <T> Stream<T> getStream(Collection<T> collection) {
+        return collection == null ? Stream.empty() : collection.stream();
+    }
+
+    private static DereferenceResultWrapper evaluateTransformedEntityAndVocabulary(
+            VocabularyCandidates vocabularyCandidates,
+            String transformedEntity, Vocabulary chosenVocabulary,
+            MongoDereferencedEntity originalEntity) {
+        final DereferenceResultWrapper dereferenceResultWrapper;
+        // If retrieval or transformation of entity failed, and we have one vocabulary then we store that
+        if (transformedEntity == null && vocabularyCandidates.getVocabularies().size() == 1) {
+            dereferenceResultWrapper = new DereferenceResultWrapper(
+                    vocabularyCandidates.getVocabularies().get(0),
+                    originalEntity.getDereferenceResultStatus());
         } else {
-          // EnrichmentBase + Status
-          return new ImmutablePair<>(result.getEnrichmentBase(), result.getDereferenceResultStatus());
+            if (transformedEntity == null && chosenVocabulary == null && originalEntity.getDereferenceResultStatus() == null) {
+                dereferenceResultWrapper = new DereferenceResultWrapper((EnrichmentBase) null,
+                        null,
+                        DereferenceResultStatus.NO_VOCABULARY_MATCHING);
+            } else {
+                dereferenceResultWrapper = new DereferenceResultWrapper(transformedEntity, chosenVocabulary,
+                        originalEntity.getDereferenceResultStatus());
+            }
         }
-      } catch (JAXBException jaxbException) {
-        LOGGER.warn(String.format("Problem occurred while dereferencing broader resource %s.", key), jaxbException);
-        // No EnrichmentBase + Status
-        return new ImmutablePair<>(null, DereferenceResultStatus.ENTITY_FOUND_XML_XSLT_ERROR);
-      } catch (URISyntaxException uriSyntaxException) {
-        LOGGER.warn(String.format("Problem occurred while dereferencing broader resource %s.", key), uriSyntaxException);
-        // No EnrichmentBase + Status
-        return new ImmutablePair<>(null, DereferenceResultStatus.INVALID_URL);
-      }
-    };
-  }
-
-  private static DereferenceResult checkEmptyEnrichmentBaseAndVocabulary(DereferenceResultWrapper resource) {
-    DereferenceResult dereferenceResult = null;
-    // No EnrichmentBase and no Vocabulary.
-    if (resource.getEnrichmentBase() == null && resource.getVocabulary() == null
-        && resource.getDereferenceResultStatus() == DereferenceResultStatus.SUCCESS) {
-      dereferenceResult = new DereferenceResult(DereferenceResultStatus.NO_VOCABULARY_MATCHING);
-      // No EnrichmentBase, no Vocabulary and an error occurred.
-    } else if (resource.getEnrichmentBase() == null && resource.getVocabulary() == null) {
-      dereferenceResult = new DereferenceResult(resource.getDereferenceResultStatus());
+        return dereferenceResultWrapper;
     }
-    return dereferenceResult;
-  }
-
-  private void extractBroaderResources(Pair<EnrichmentBase, DereferenceResultStatus> resource, Set<String> destination) {
-    final Stream<String> resourceIdStream;
-    if (resource.getLeft() instanceof Concept) {
-      resourceIdStream = getStream(((Concept) resource.getLeft()).getBroader()).map(Resource::getResource);
-    } else if (resource.getLeft() instanceof TimeSpan) {
-      resourceIdStream = Optional.ofNullable(((TimeSpan) resource.getLeft()).getIsPartOf()).stream()
-                                 .flatMap(List::stream).map(LabelResource::getResource);
-    } else if (resource.getLeft() instanceof Place) {
-      resourceIdStream = Optional.ofNullable(((Place) resource.getLeft()).getIsPartOf()).stream()
-                                 .flatMap(Collection::stream).map(LabelResource::getResource);
-    } else {
-      resourceIdStream = Stream.empty();
+
+    /**
+     * Mongo dereference implementation
+     *
+     * @param resourceId The resource ID (URI) to dereference
+     * @return Dereference results with dereference status.
+     * @throws IllegalArgumentException In case the Parameter is null.
+     */
+    @Override
+    public DereferenceResult dereference(String resourceId) {
+        // Sanity check
+        if (resourceId == null) {
+            throw new IllegalArgumentException("Parameter resourceId cannot be null.");
+        }
+
+        return dereferenceResource(resourceId);
     }
-    resourceIdStream.filter(Objects::nonNull).forEach(destination::add);
-  }
-
-  private static <T> Stream<T> getStream(Collection<T> collection) {
-    return collection == null ? Stream.empty() : collection.stream();
-  }
-
-  /**
-   * Computes the entity and vocabulary.
-   * <p>It will use the cache if it's still valid, otherwise it will retrieve(if applicable) the
-   * original entity and transform the result. </p>
-   * <p>The possible outcomes are:
-   * <ul>
-   *   <li>Both items of the pair are null. We do not have a vocabulary candidate or we have more
-   *   than one vocabulary candidate and all have not succeed either retrieving the original
-   *   entity or transforming the retrieved entity.</li>
-   *   <li>Entity xml(Left) is null, and vocabulary(Right) is non null. We have a vocabulary
-   *   and the entity xml failed either to be retried or failed transformation.</li>
-   *   <li>Entity xml(Left) is non null, and vocabulary(Right) is non null. We have a
-   *   successful retrieval and transformation.</li>
-   * </ul>
-   * </p>
-   *
-   * @param resourceId the url of the provider entity
-   * @param cachedEntity the cached entity object
-   * @return a EnrichmentEntityVocabulary with the entity, vocabulary, and status.
-   * @throws URISyntaxException if the resource identifier url is invalid
-   */
-  private DereferenceResultWrapper computeEntityVocabulary(String resourceId, ProcessedEntity cachedEntity)
-      throws URISyntaxException {
-
-    final DereferenceResultWrapper transformedEntityVocabulary;
-
-    //Check if vocabulary actually exists
-    Vocabulary cachedVocabulary = null;
-    boolean cachedVocabularyChanged = false;
-    if (cachedEntity != null && StringUtils.isNotBlank(cachedEntity.getVocabularyId())) {
-      cachedVocabulary = vocabularyDao.get(cachedEntity.getVocabularyId());
-      cachedVocabularyChanged = cachedVocabulary == null;
+
+    /**
+     * <p>
+     * This method dereferences a resource. If the resource's vocabulary specifies a positive
+     * iteration count, this method also repeatedly retrieves the 'broader' resources and returns
+     * those as well.
+     * </p>
+     * <p>
+     * A resource has references to its 'broader' resources (see
+     * {@link #extractBroaderResources(EnrichmentBase, Set)}). As such, the resources form a directed
+     * graph and the iteration count is the distance from the requested resource. This method performs
+     * a breadth-first search through this graph to retrieve all resources within a certain distance
+     * from the requested resource.
+     * </p>
+     * <p> The Dereference result contains a collection of dereferenced resources.
+     * Note: That could not be null, but could be empty. The deferenced status could have the
+     * following values:
+     * <ul>
+     * <li>NO_VOCABULARY_MATCHING, this occurs if there is no enrichment base and no vocabulary.</li>
+     * <li>NO_ENTITY_FOR_VOCABULARY, this means the resource was found but no vocabulary and enrichment was found.</li>
+     * <li>ENTITY_FOUND_XLT_ERROR, this occurs when an JAXBExcetion happened.</li>
+     * <li>INVALID_URL, this occurs when an URIException happened.</li>
+     * <li>UNKNOWN_EUROPEANA_ENTITY, this occurs when the europeana entity is unknown.</li>
+     * <li>SUCCESS, this means everything was processed successfully.</li>
+     * </ul>
+     * </p>
+     *
+     * @param resourceId The resource to dereference.
+     * @return An object containing the dereferenced resources and the status of dereference process.
+     */
+    private DereferenceResult dereferenceResource(String resourceId) {
+        DereferenceResult dereferenceResult;
+        try {
+            // Get the main object to dereference. If null, we are done.
+            final DereferenceResultWrapper resource = computeEnrichmentBaseVocabulary(resourceId);
+
+            dereferenceResult = checkEmptyEnrichmentBaseAndVocabulary(resource);
+
+            if (dereferenceResult == null) {
+                // Create value resolver that catches exceptions and logs them.
+                final Function<String, Pair<EnrichmentBase, DereferenceResultStatus>> valueResolver = getValueResolver();
+
+                // Perform the breadth-first search to search for broader terms (if needed).
+                final int iterations = resource.getVocabulary().getIterations();
+                final Map<String, Pair<EnrichmentBase, DereferenceResultStatus>> result;
+                if (iterations > 0) {
+                    result = GraphUtils
+                            .breadthFirstSearch(resourceId,
+                                    new ImmutablePair<>(resource.getEnrichmentBase(),
+                                            resource.getDereferenceResultStatus()),
+                                    resource.getVocabulary().getIterations(),
+                                    valueResolver, this::extractBroaderResources);
+                } else {
+                    result = new HashMap<>();
+                    result.put(resourceId, new ImmutablePair<>(resource.getEnrichmentBase(),
+                            resource.getDereferenceResultStatus()));
+                }
+                // Done
+                dereferenceResult = new DereferenceResult(
+                        result.values().stream().map(Pair::getLeft).collect(Collectors.toList()),
+                        result.values().stream().map(Pair::getRight).filter(Objects::nonNull).findFirst()
+                                .orElse(DereferenceResultStatus.SUCCESS));
+            }
+        } catch (JAXBException jaxbException) {
+            LOGGER.warn(String.format("Problem occurred while dereferencing resource %s.", resourceId),
+                    jaxbException);
+            // No EnrichmentBase + Status
+            dereferenceResult = new DereferenceResult(
+                    DereferenceResultStatus.ENTITY_FOUND_XML_XSLT_ERROR);
+        } catch (URISyntaxException uriSyntaxException) {
+            LOGGER.warn(String.format("Problem occurred while dereferencing resource %s.", resourceId),
+                    uriSyntaxException);
+            // No EnrichmentBase + Status
+            dereferenceResult = new DereferenceResult(DereferenceResultStatus.INVALID_URL);
+        }
+        return dereferenceResult;
     }
 
-    // If we do not have any cached entity, we need to compute it
-    if (cachedEntity == null || cachedVocabularyChanged) {
-      transformedEntityVocabulary = retrieveAndTransformEntity(resourceId);
-      saveEntity(resourceId, cachedEntity, new DereferenceResultWrapper(transformedEntityVocabulary.getEntity(),
-          transformedEntityVocabulary.getVocabulary()));
-    } else {
-      // If we have something in the cache we return that instead
-      transformedEntityVocabulary = new DereferenceResultWrapper(cachedEntity.getXml(),
-          cachedVocabulary, DereferenceResultStatus.SUCCESS);
+    private Function<String, Pair<EnrichmentBase, DereferenceResultStatus>> getValueResolver() {
+        return key -> {
+            DereferenceResultWrapper result;
+            try {
+                result = computeEnrichmentBaseVocabulary(key);
+                if (result.getEnrichmentBase() == null && result.getVocabulary() == null
+                        && result.getDereferenceResultStatus() == DereferenceResultStatus.SUCCESS) {
+                    // No EnrichmentBase + Status
+                    return new ImmutablePair<>(null, DereferenceResultStatus.NO_ENTITY_FOR_VOCABULARY);
+                } else {
+                    // EnrichmentBase + Status
+                    return new ImmutablePair<>(result.getEnrichmentBase(),
+                            result.getDereferenceResultStatus());
+                }
+            } catch (JAXBException jaxbException) {
+                LOGGER.warn(String.format("Problem occurred while dereferencing broader resource %s.", key),
+                        jaxbException);
+                // No EnrichmentBase + Status
+                return new ImmutablePair<>(null, DereferenceResultStatus.ENTITY_FOUND_XML_XSLT_ERROR);
+            } catch (URISyntaxException uriSyntaxException) {
+                LOGGER.warn(String.format("Problem occurred while dereferencing broader resource %s.", key),
+                        uriSyntaxException);
+                // No EnrichmentBase + Status
+                return new ImmutablePair<>(null, DereferenceResultStatus.INVALID_URL);
+            }
+        };
     }
 
-    return transformedEntityVocabulary;
-  }
-
-  private DereferenceResultWrapper retrieveAndTransformEntity(String resourceId) throws URISyntaxException {
-
-    final VocabularyCandidates vocabularyCandidates = VocabularyCandidates
-        .findVocabulariesForUrl(resourceId, vocabularyDao::getByUriSearch);
-
-    String transformedEntity = null;
-    Vocabulary chosenVocabulary = null;
-
-    MongoDereferencedEntity originalEntity = new MongoDereferencedEntity(resourceId, null);
-    MongoDereferencedEntity entityTransformed = new MongoDereferencedEntity(null, null);
-    //Only if we have vocabularies we continue
-    if (!vocabularyCandidates.isEmpty()) {
-      originalEntity = retrieveOriginalEntity(resourceId, vocabularyCandidates);
-      //If original entity exists, try transformation
-      if (originalEntity.getEntity() != null && originalEntity.getDereferenceResultStatus() == DereferenceResultStatus.SUCCESS) {
-        // Transform the original entity and find vocabulary if applicable.
-        for (Vocabulary vocabulary : vocabularyCandidates.getVocabularies()) {
-          entityTransformed = transformEntity(vocabulary, originalEntity.getEntity(), resourceId);
-          transformedEntity = entityTransformed.getEntity();
-          if (transformedEntity != null) {
-            chosenVocabulary = vocabulary;
-            break;
-          }
+    private void extractBroaderResources(Pair<EnrichmentBase, DereferenceResultStatus> resource,
+                                         Set<String> destination) {
+        final Stream<String> resourceIdStream;
+        if (resource.getLeft() instanceof Concept) {
+            resourceIdStream = getStream(((Concept) resource.getLeft()).getBroader()).map(
+                    Resource::getResource);
+        } else if (resource.getLeft() instanceof TimeSpan) {
+            resourceIdStream = Optional.ofNullable(((TimeSpan) resource.getLeft()).getIsPartOf()).stream()
+                    .flatMap(List::stream).map(LabelResource::getResource);
+        } else if (resource.getLeft() instanceof Place) {
+            resourceIdStream = Optional.ofNullable(((Place) resource.getLeft()).getIsPartOf()).stream()
+                    .flatMap(Collection::stream).map(LabelResource::getResource);
+        } else {
+            resourceIdStream = Stream.empty();
         }
-        // There was an update in transforming, so we update the result status.
-        if (originalEntity.getDereferenceResultStatus() != entityTransformed.getDereferenceResultStatus()) {
-          originalEntity = new MongoDereferencedEntity(originalEntity.getEntity(),
-              entityTransformed.getDereferenceResultStatus());
+        resourceIdStream.filter(Objects::nonNull).forEach(destination::add);
+    }
+
+    /**
+     * Computes the entity and vocabulary.
+     * <p>It will use the cache if it's still valid, otherwise it will retrieve(if applicable) the
+     * original entity and transform the result. </p>
+     * <p>The possible outcomes are:
+     * <ul>
+     *   <li>Both items of the pair are null. We do not have a vocabulary candidate or we have more
+     *   than one vocabulary candidate and all have not succeed either retrieving the original
+     *   entity or transforming the retrieved entity.</li>
+     *   <li>Entity xml(Left) is null, and vocabulary(Right) is non null. We have a vocabulary
+     *   and the entity xml failed either to be retried or failed transformation.</li>
+     *   <li>Entity xml(Left) is non null, and vocabulary(Right) is non null. We have a
+     *   successful retrieval and transformation.</li>
+     * </ul>
+     * </p>
+     *
+     * @param resourceId   the url of the provider entity
+     * @param cachedEntity the cached entity object
+     * @return a EnrichmentEntityVocabulary with the entity, vocabulary, and status.
+     * @throws URISyntaxException if the resource identifier url is invalid
+     */
+    private DereferenceResultWrapper computeEntityVocabulary(String resourceId,
+                                                             ProcessedEntity cachedEntity)
+            throws URISyntaxException {
+
+        final DereferenceResultWrapper transformedEntityVocabulary;
+
+        //Check if vocabulary actually exists
+        Vocabulary cachedVocabulary = null;
+        boolean cachedVocabularyChanged = false;
+        if (cachedEntity != null && StringUtils.isNotBlank(cachedEntity.getVocabularyId())) {
+            cachedVocabulary = vocabularyDao.get(cachedEntity.getVocabularyId());
+            cachedVocabularyChanged = cachedVocabulary == null;
+        }
+
+        // If we do not have any cached entity, we need to compute it
+        if (cachedEntity == null || cachedVocabularyChanged) {
+            transformedEntityVocabulary = retrieveAndTransformEntity(resourceId);
+            saveEntity(resourceId, cachedEntity,
+                    new DereferenceResultWrapper(transformedEntityVocabulary.getEntity(),
+                            transformedEntityVocabulary.getVocabulary()));
+        } else {
+            // if there was no xml entity but a vocabulary that means no entity for vocabulary
+            if (cachedEntity.getXml() == null && StringUtils.isNotBlank(cachedEntity.getVocabularyId())) {
+                transformedEntityVocabulary = new DereferenceResultWrapper((EnrichmentBase) null,
+                cachedVocabulary, DereferenceResultStatus.NO_ENTITY_FOR_VOCABULARY);
+            } else {
+                // otherwise If we have something in the cache we return that instead
+                transformedEntityVocabulary = new DereferenceResultWrapper(cachedEntity.getXml(),
+                        cachedVocabulary, DereferenceResultStatus.SUCCESS);
+            }
         }
-      }
+
+        return transformedEntityVocabulary;
     }
 
-    return evaluateTransformedEntityAndVocabulary(vocabularyCandidates, transformedEntity, chosenVocabulary, originalEntity);
-  }
-
-  private static DereferenceResultWrapper evaluateTransformedEntityAndVocabulary(VocabularyCandidates vocabularyCandidates,
-      String transformedEntity, Vocabulary chosenVocabulary, MongoDereferencedEntity originalEntity) {
-    final DereferenceResultWrapper dereferenceResultWrapper;
-    // If retrieval or transformation of entity failed, and we have one vocabulary then we store that
-    if (transformedEntity == null && vocabularyCandidates.getVocabularies().size() == 1) {
-      dereferenceResultWrapper = new DereferenceResultWrapper(vocabularyCandidates.getVocabularies().get(0),
-          originalEntity.getDereferenceResultStatus());
-    } else {
-      dereferenceResultWrapper = new DereferenceResultWrapper(transformedEntity, chosenVocabulary,
-          originalEntity.getDereferenceResultStatus());
+    private DereferenceResultWrapper retrieveAndTransformEntity(String resourceId)
+            throws URISyntaxException {
+
+        final VocabularyCandidates vocabularyCandidates = VocabularyCandidates
+                .findVocabulariesForUrl(resourceId, vocabularyDao::getByUriSearch);
+
+        String transformedEntity = null;
+        Vocabulary chosenVocabulary = null;
+
+        MongoDereferencedEntity originalEntity = new MongoDereferencedEntity(resourceId, null);
+        MongoDereferencedEntity entityTransformed = new MongoDereferencedEntity(null, null);
+        //Only if we have vocabularies we continue
+        if (!vocabularyCandidates.isEmpty()) {
+            originalEntity = retrieveOriginalEntity(resourceId, vocabularyCandidates);
+            //If original entity exists, try transformation
+            if (originalEntity.getEntity() != null
+                    && originalEntity.getDereferenceResultStatus() == DereferenceResultStatus.SUCCESS) {
+                // Transform the original entity and find vocabulary if applicable.
+                for (Vocabulary vocabulary : vocabularyCandidates.getVocabularies()) {
+                    entityTransformed = transformEntity(vocabulary, originalEntity.getEntity(), resourceId);
+                    transformedEntity = entityTransformed.getEntity();
+                    if (transformedEntity != null) {
+                        chosenVocabulary = vocabulary;
+                        break;
+                    }
+                }
+                // There was an update in transforming, so we update the result status.
+                if (originalEntity.getDereferenceResultStatus()
+                        != entityTransformed.getDereferenceResultStatus()) {
+                    originalEntity = new MongoDereferencedEntity(originalEntity.getEntity(),
+                            entityTransformed.getDereferenceResultStatus());
+                }
+            }
+        }
+
+        return evaluateTransformedEntityAndVocabulary(vocabularyCandidates, transformedEntity,
+                chosenVocabulary, originalEntity);
     }
-    return dereferenceResultWrapper;
-  }
-
-  private void saveEntity(String resourceId, ProcessedEntity cachedEntity,
-      DereferenceResultWrapper transformedEntityAndVocabularyPair) {
-
-    final String entityXml = transformedEntityAndVocabularyPair.getEntity();
-    final Vocabulary vocabulary = transformedEntityAndVocabularyPair.getVocabulary();
-    final String vocabularyIdString = Optional.ofNullable(vocabulary).map(Vocabulary::getId)
-                                              .map(ObjectId::toString).orElse(null);
-    //Save entity
-    ProcessedEntity entityToCache = (cachedEntity == null) ? new ProcessedEntity() : cachedEntity;
-    entityToCache.setResourceId(resourceId);
-    entityToCache.setXml(entityXml);
-    entityToCache.setVocabularyId(vocabularyIdString);
-    processedEntityDao.save(entityToCache);
-  }
-
-  private MongoDereferencedEntity transformEntity(Vocabulary vocabulary,
-      final String originalEntity, final String resourceId) {
-    Optional<String> result;
-    DereferenceResultStatus resultStatus;
-    try {
-      final IncomingRecordToEdmTransformer incomingRecordToEdmTransformer = new IncomingRecordToEdmTransformer(
-          vocabulary.getXslt());
-      result = incomingRecordToEdmTransformer.transform(originalEntity, resourceId);
-      if (result.isEmpty()) {
-        resultStatus = DereferenceResultStatus.ENTITY_FOUND_XML_XSLT_PRODUCE_NO_CONTEXTUAL_CLASS;
-      } else {
-        resultStatus = DereferenceResultStatus.SUCCESS;
-      }
-    } catch (TransformerException | BadContentException | ParserConfigurationException e) {
-      LOGGER.warn("Error transforming entity: {} with message: {}", resourceId, e.getMessage());
-      LOGGER.debug("Transformation issue: ", e);
-      resultStatus = DereferenceResultStatus.ENTITY_FOUND_XML_XSLT_ERROR;
-      result = Optional.empty();
+
+    private void saveEntity(String resourceId, ProcessedEntity cachedEntity,
+                            DereferenceResultWrapper transformedEntityAndVocabularyPair) {
+
+        final String entityXml = transformedEntityAndVocabularyPair.getEntity();
+        final Vocabulary vocabulary = transformedEntityAndVocabularyPair.getVocabulary();
+        final String vocabularyIdString = Optional.ofNullable(vocabulary).map(Vocabulary::getId)
+                .map(ObjectId::toString).orElse(null);
+        //Save entity
+        ProcessedEntity entityToCache = (cachedEntity == null) ? new ProcessedEntity() : cachedEntity;
+        entityToCache.setResourceId(resourceId);
+        entityToCache.setXml(entityXml);
+        entityToCache.setVocabularyId(vocabularyIdString);
+        processedEntityDao.save(entityToCache);
     }
-    return new MongoDereferencedEntity(result.orElse(null), resultStatus);
-  }
-
-  private MongoDereferencedEntity retrieveOriginalEntity(String resourceId, VocabularyCandidates candidates) {
-    DereferenceResultStatus dereferenceResultStatus = DereferenceResultStatus.SUCCESS;
-
-    if (candidates.isEmpty()) {
-      dereferenceResultStatus = DereferenceResultStatus.NO_VOCABULARY_MATCHING;
-      return new MongoDereferencedEntity(null, dereferenceResultStatus);
-    } else {
-      try {
-        // Check the input (check the resource ID for URI syntax).
-        new URI(resourceId);
-      } catch (URISyntaxException e) {
-        LOGGER.error("Invalid URI: {} with message: {}", resourceId, e.getMessage());
-        dereferenceResultStatus = DereferenceResultStatus.INVALID_URL;
-        return new MongoDereferencedEntity(null, dereferenceResultStatus);
-      }
-      // Compute the result (a URI syntax issue is considered a problem with the suffix).
-      final String originalEntity = candidates.getVocabulariesSuffixes().stream().map(suffix -> {
+
+    private MongoDereferencedEntity transformEntity(Vocabulary vocabulary,
+                                                    final String originalEntity, final String resourceId) {
+        Optional<String> result;
+        DereferenceResultStatus resultStatus;
         try {
-          return retriever.retrieve(resourceId, suffix);
-        } catch (IOException | URISyntaxException e) {
-          LOGGER.warn("Failed to retrieve: {} with message: {}", resourceId, e.getMessage());
-          LOGGER.debug("Problem retrieving resource.", e);
-          return null;
+            final IncomingRecordToEdmTransformer incomingRecordToEdmTransformer = new IncomingRecordToEdmTransformer(
+                    vocabulary.getXslt());
+            result = incomingRecordToEdmTransformer.transform(originalEntity, resourceId);
+            if (result.isEmpty()) {
+                resultStatus = DereferenceResultStatus.ENTITY_FOUND_XML_XSLT_PRODUCE_NO_CONTEXTUAL_CLASS;
+            } else {
+                resultStatus = DereferenceResultStatus.SUCCESS;
+            }
+        } catch (TransformerException | BadContentException | ParserConfigurationException e) {
+            LOGGER.warn("Error transforming entity: {} with message: {}", resourceId, e.getMessage());
+            LOGGER.debug("Transformation issue: ", e);
+            resultStatus = DereferenceResultStatus.ENTITY_FOUND_XML_XSLT_ERROR;
+            result = Optional.empty();
+        }
+        return new MongoDereferencedEntity(result.orElse(null), resultStatus);
+    }
+
+    private MongoDereferencedEntity retrieveOriginalEntity(String resourceId,
+                                                           VocabularyCandidates candidates) {
+        DereferenceResultStatus dereferenceResultStatus = DereferenceResultStatus.SUCCESS;
+
+        if (candidates.isEmpty()) {
+            dereferenceResultStatus = DereferenceResultStatus.NO_VOCABULARY_MATCHING;
+            return new MongoDereferencedEntity(null, dereferenceResultStatus);
+        } else {
+            try {
+                // Check the input (check the resource ID for URI syntax).
+                new URI(resourceId);
+            } catch (URISyntaxException e) {
+                LOGGER.error("Invalid URI: {} with message: {}", resourceId, e.getMessage());
+                dereferenceResultStatus = DereferenceResultStatus.INVALID_URL;
+                return new MongoDereferencedEntity(null, dereferenceResultStatus);
+            }
+            // Compute the result (a URI syntax issue is considered a problem with the suffix).
+            final String originalEntity = candidates.getVocabulariesSuffixes().stream().map(suffix -> {
+                try {
+                    return retriever.retrieve(resourceId, suffix);
+                } catch (IOException | URISyntaxException e) {
+                    LOGGER.warn("Failed to retrieve: {} with message: {}", resourceId, e.getMessage());
+                    LOGGER.debug("Problem retrieving resource.", e);
+                    return null;
+                }
+            }).filter(Objects::nonNull).findAny().orElse(null);
+
+            // Evaluate the result.
+            if (originalEntity == null) {
+                if (LOGGER.isInfoEnabled()) {
+                    LOGGER.info("No entity XML for uri {}", CRLF_PATTERN.matcher(resourceId).replaceAll(""));
+                }
+                dereferenceResultStatus = DereferenceResultStatus.NO_ENTITY_FOR_VOCABULARY;
+            }
+            return new MongoDereferencedEntity(originalEntity, dereferenceResultStatus);
         }
-      }).filter(Objects::nonNull).findAny().orElse(null);
-
-      // Evaluate the result.
-      if (originalEntity == null && LOGGER.isInfoEnabled()) {
-        LOGGER.info("No entity XML for uri {}", CRLF_PATTERN.matcher(resourceId).replaceAll(""));
-        dereferenceResultStatus = DereferenceResultStatus.UNKNOWN_ENTITY;
-      }
-      return new MongoDereferencedEntity(originalEntity, dereferenceResultStatus);
     }
-  }
-
-  DereferenceResultWrapper computeEnrichmentBaseVocabulary(String resourceId) throws JAXBException, URISyntaxException {
-    // Try to get the entity and its vocabulary from the cache.
-    final ProcessedEntity cachedEntity = processedEntityDao.getByResourceId(resourceId);
-    final DereferenceResultWrapper result = computeEntityVocabulary(resourceId, cachedEntity);
-
-    // Parse the entity.
-    if (result.getEntity() == null || result.getVocabulary() == null) {
-      return new DereferenceResultWrapper(result.getDereferenceResultStatus());
-    } else {
-      return new DereferenceResultWrapper(
-          EnrichmentBaseConverter.convertToEnrichmentBase(result.getEntity()),
-          result.getVocabulary(),
-          result.getDereferenceResultStatus());
+
+    DereferenceResultWrapper computeEnrichmentBaseVocabulary(String resourceId)
+            throws JAXBException, URISyntaxException {
+        // Try to get the entity and its vocabulary from the cache.
+        final ProcessedEntity cachedEntity = processedEntityDao.getByResourceId(resourceId);
+        final DereferenceResultWrapper result = computeEntityVocabulary(resourceId, cachedEntity);
+
+        // Parse the entity.
+        if (result.getEntity() == null || result.getVocabulary() == null) {
+            return new DereferenceResultWrapper(result.getDereferenceResultStatus());
+        } else {
+            return new DereferenceResultWrapper(
+                    EnrichmentBaseConverter.convertToEnrichmentBase(result.getEntity()),
+                    result.getVocabulary(),
+                    result.getDereferenceResultStatus());
+        }
     }
-  }
 }
diff --git a/metis-dereference/metis-dereference-service/src/main/java/eu/europeana/metis/dereference/service/dao/ProcessedEntityDao.java b/metis-dereference/metis-dereference-service/src/main/java/eu/europeana/metis/dereference/service/dao/ProcessedEntityDao.java
index e9a6a6c0c8..7c6c808df9 100644
--- a/metis-dereference/metis-dereference-service/src/main/java/eu/europeana/metis/dereference/service/dao/ProcessedEntityDao.java
+++ b/metis-dereference/metis-dereference-service/src/main/java/eu/europeana/metis/dereference/service/dao/ProcessedEntityDao.java
@@ -10,7 +10,7 @@
 import dev.morphia.mapping.DiscriminatorFunction;
 import dev.morphia.mapping.MapperOptions;
 import dev.morphia.mapping.NamingStrategy;
-import dev.morphia.query.experimental.filters.Filters;
+import dev.morphia.query.filters.Filters;
 import eu.europeana.metis.dereference.ProcessedEntity;
 import java.util.Optional;
 import org.bson.types.ObjectId;
diff --git a/metis-dereference/metis-dereference-service/src/main/java/eu/europeana/metis/dereference/service/dao/VocabularyDao.java b/metis-dereference/metis-dereference-service/src/main/java/eu/europeana/metis/dereference/service/dao/VocabularyDao.java
index 52bdb7d9ed..b8b1b48827 100644
--- a/metis-dereference/metis-dereference-service/src/main/java/eu/europeana/metis/dereference/service/dao/VocabularyDao.java
+++ b/metis-dereference/metis-dereference-service/src/main/java/eu/europeana/metis/dereference/service/dao/VocabularyDao.java
@@ -11,7 +11,7 @@
 import dev.morphia.mapping.MapperOptions;
 import dev.morphia.mapping.NamingStrategy;
 import dev.morphia.query.Query;
-import dev.morphia.query.experimental.filters.Filters;
+import dev.morphia.query.filters.Filters;
 import eu.europeana.metis.dereference.Vocabulary;
 import java.util.List;
 import java.util.regex.Pattern;
diff --git a/metis-dereference/metis-dereference-service/src/test/java/eu/europeana/metis/dereference/service/MongoDereferenceServiceTest.java b/metis-dereference/metis-dereference-service/src/test/java/eu/europeana/metis/dereference/service/MongoDereferenceServiceTest.java
index 1be759e4c6..12dc8cd855 100644
--- a/metis-dereference/metis-dereference-service/src/test/java/eu/europeana/metis/dereference/service/MongoDereferenceServiceTest.java
+++ b/metis-dereference/metis-dereference-service/src/test/java/eu/europeana/metis/dereference/service/MongoDereferenceServiceTest.java
@@ -15,6 +15,7 @@
 import com.mongodb.client.MongoClients;
 import dev.morphia.Datastore;
 import eu.europeana.enrichment.api.external.DereferenceResultStatus;
+import eu.europeana.enrichment.api.external.model.Concept;
 import eu.europeana.enrichment.api.external.model.Place;
 import eu.europeana.metis.dereference.DereferenceResult;
 import eu.europeana.metis.dereference.RdfRetriever;
@@ -111,7 +112,7 @@ void testDereference_AbsentObject() throws JAXBException, URISyntaxException {
   }
 
   @Test
-  void testDereference_UnknownEntity() throws JAXBException, URISyntaxException, IOException {
+  void testDereference_UnknownEuropeanaEntity() throws JAXBException, URISyntaxException, IOException {
     // Create vocabulary for geonames and save it.
     final Vocabulary geonames = new Vocabulary();
     geonames.setUris(Collections.singleton("http://sws.geonames.org/"));
@@ -131,7 +132,43 @@ void testDereference_UnknownEntity() throws JAXBException, URISyntaxException, I
     final DereferenceResult emptyResult = service.dereference(entityId);
     assertNotNull(emptyResult);
     assertFalse(emptyResult.getEnrichmentBasesAsList().isEmpty());
-    assertEquals(DereferenceResultStatus.UNKNOWN_ENTITY, emptyResult.getDereferenceStatus());
+    assertEquals(DereferenceResultStatus.SUCCESS, emptyResult.getDereferenceStatus());
+  }
+
+  @Test
+  void testDereference_NoVocabularyMatching() {
+     // Create concept
+    final Concept concept = new Concept();
+    final String entityId = "http://data.europeana.eu/concept/XXXXXXXXX";
+    concept.setAbout(entityId);
+
+    final DereferenceResult emptyResult = service.dereference(entityId);
+    assertNotNull(emptyResult);
+    assertTrue(emptyResult.getEnrichmentBasesAsList().isEmpty());
+    assertEquals(DereferenceResultStatus.NO_VOCABULARY_MATCHING, emptyResult.getDereferenceStatus());
+  }
+
+  @Test
+  void testDereference_NoEntityForVocabulary() throws JAXBException, URISyntaxException, IOException {
+    // Create vocabulary for geonames and save it.
+    final Vocabulary geonames = new Vocabulary();
+    geonames.setUris(Collections.singleton("http://sws.geonames.org/"));
+    geonames.setXslt(IOUtils
+            .toString(Objects.requireNonNull(this.getClass().getClassLoader().getResourceAsStream("geonames.xsl")),
+                    StandardCharsets.UTF_8));
+    geonames.setName("Geonames");
+    geonames.setIterations(0);
+    vocabularyDaoDatastore.save(geonames);
+
+    // Create geonames entity
+    final Place place = new Place();
+    final String entityId = "http://sws.geonames.org/302025X/";
+    place.setAbout(entityId);
+
+    final DereferenceResult emptyResult = service.dereference(entityId);
+    assertNotNull(emptyResult);
+    assertTrue(emptyResult.getEnrichmentBasesAsList().isEmpty());
+    assertEquals(DereferenceResultStatus.NO_ENTITY_FOR_VOCABULARY, emptyResult.getDereferenceStatus());
   }
 
   @Test
diff --git a/metis-dereference/pom.xml b/metis-dereference/pom.xml
index 0af1f8402b..74250fbd53 100644
--- a/metis-dereference/pom.xml
+++ b/metis-dereference/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
     <artifactId>metis-framework</artifactId>
   </parent>
 
diff --git a/metis-enrichment/metis-enrichment-client/pom.xml b/metis-enrichment/metis-enrichment-client/pom.xml
index fc17b5735d..896ad8d82f 100644
--- a/metis-enrichment/metis-enrichment-client/pom.xml
+++ b/metis-enrichment/metis-enrichment-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-enrichment</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-enrichment-client</artifactId>
   <packaging>jar</packaging>
@@ -67,5 +67,11 @@
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.core</groupId>
+      <artifactId>jersey-common</artifactId>
+      <version>${version.jersey}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/rest/client/dereference/Dereferencer.java b/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/rest/client/dereference/Dereferencer.java
index b4edec2e52..2288f2a78b 100644
--- a/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/rest/client/dereference/Dereferencer.java
+++ b/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/rest/client/dereference/Dereferencer.java
@@ -1,9 +1,10 @@
 package eu.europeana.enrichment.rest.client.dereference;
 
+import eu.europeana.enrichment.api.internal.ReferenceTerm;
 import eu.europeana.enrichment.rest.client.report.Report;
 import eu.europeana.metis.schema.jibx.AboutType;
 import eu.europeana.metis.schema.jibx.RDF;
-
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -28,7 +29,7 @@ public interface Dereferencer {
    * @return DereferencedEntity which contains a list of RDF field names with the information associated with it and a report
    * containing messages of dereference process.
    */
-  List<DereferencedEntities> dereferenceEntities(Map<Class<? extends AboutType>,Set<String>> resourceIds);
+  List<DereferencedEntities> dereferenceEntities(Map<Class<? extends AboutType>, Set<String>> resourceIds);
 
   /**
    * It extracts the references for dereferencing from a RDF file
@@ -36,6 +37,9 @@ public interface Dereferencer {
    * @param rdf The RDF where the references are extracted from
    * @return A map with a class type associated with a set of extracted references
    */
-  Map<Class<? extends AboutType>,Set<String>> extractReferencesForDereferencing(RDF rdf);
+  Map<Class<? extends AboutType>, Set<String>> extractReferencesForDereferencing(RDF rdf);
 
+  DereferencedEntities dereferenceOwnEntities(Set<ReferenceTerm> resourceIds,
+      HashSet<Report> reports,
+      Class<? extends AboutType> classType);
 }
diff --git a/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/rest/client/dereference/DereferencerImpl.java b/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/rest/client/dereference/DereferencerImpl.java
index ac6aba46a4..bc5b44834b 100644
--- a/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/rest/client/dereference/DereferencerImpl.java
+++ b/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/rest/client/dereference/DereferencerImpl.java
@@ -44,304 +44,322 @@
  */
 public class DereferencerImpl implements Dereferencer {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(DereferencerImpl.class);
-
-  private final EntityMergeEngine entityMergeEngine;
-  private final EntityResolver entityResolver;
-  private final DereferenceClient dereferenceClient;
-
-  /**
-   * Constructor.
-   *
-   * @param entityMergeEngine The entity merge engine. Cannot be null.
-   * @param entityResolver Remove entity resolver: Can be null if we only dereference own entities.
-   * @param dereferenceClient Dereference client. Can be null if we don't dereference own entities.
-   */
-  public DereferencerImpl(EntityMergeEngine entityMergeEngine, EntityResolver entityResolver,
-      DereferenceClient dereferenceClient) {
-    this.entityMergeEngine = entityMergeEngine;
-    this.entityResolver = entityResolver;
-    this.dereferenceClient = dereferenceClient;
-  }
-
-  private static URL checkIfUrlIsValid(HashSet<Report> reports, String id) {
-    try {
-      URI uri = new URI(id);
-      return new URL(uri.toString());
-    } catch (URISyntaxException | MalformedURLException e) {
-      reports.add(Report
-          .buildDereferenceIgnore()
-          .withStatus(HttpStatus.OK)
-          .withValue(id)
-          .withException(e)
-          .build());
-      LOGGER.debug("Invalid enrichment reference found: {}", id);
-      return null;
+    private static final Logger LOGGER = LoggerFactory.getLogger(DereferencerImpl.class);
+
+    private final EntityMergeEngine entityMergeEngine;
+    private final EntityResolver entityResolver;
+    private final DereferenceClient dereferenceClient;
+
+    /**
+     * Constructor.
+     *
+     * @param entityMergeEngine The entity merge engine. Cannot be null.
+     * @param entityResolver    Remove entity resolver: Can be null if we only dereference own entities.
+     * @param dereferenceClient Dereference client. Can be null if we don't dereference own entities.
+     */
+    public DereferencerImpl(EntityMergeEngine entityMergeEngine, EntityResolver entityResolver,
+                            DereferenceClient dereferenceClient) {
+        this.entityMergeEngine = entityMergeEngine;
+        this.entityResolver = entityResolver;
+        this.dereferenceClient = dereferenceClient;
     }
-  }
-
-  private static void setDereferenceStatusInReport(String resourceId, HashSet<Report> reports,
-      DereferenceResultStatus resultStatus) {
-    if (!resultStatus.equals(DereferenceResultStatus.SUCCESS)) {
-      String resultMessage;
-      switch (resultStatus) {
-        case ENTITY_FOUND_XML_XSLT_ERROR:
-          resultMessage = "Entity was found, applying the XSLT results in an XML error (either because the entity is malformed or the XSLT is malformed).";
-          break;
-        case ENTITY_FOUND_XML_XSLT_PRODUCE_NO_CONTEXTUAL_CLASS:
-          resultMessage = "Entity was found, but the XSLT mapping did not produce a contextual class.";
-          break;
-        case INVALID_URL:
-          resultMessage = "A URL to be dereferenced is invalid.";
-          break;
-        case NO_VOCABULARY_MATCHING:
-          resultMessage = "Could not find a vocabulary matching the URL.";
-          break;
-        case UNKNOWN_ENTITY:
-          resultMessage = "Dereferencing or Coreferencing: the europeana entity does not exist.";
-          break;
-        case NO_ENTITY_FOR_VOCABULARY:
-          resultMessage = "Could not find an entity for a known vocabulary.";
-          break;
-        default:
-          resultMessage = "";
-      }
-      if (resultStatus.equals(DereferenceResultStatus.INVALID_URL) ||
-          resultStatus.equals(DereferenceResultStatus.NO_VOCABULARY_MATCHING) ||
-          resultStatus.equals(DereferenceResultStatus.ENTITY_FOUND_XML_XSLT_PRODUCE_NO_CONTEXTUAL_CLASS)) {
-        reports.add(Report
-            .buildDereferenceIgnore()
-            .withStatus(HttpStatus.OK)
-            .withValue(resourceId)
-            .withMessage(resultMessage)
-            .build());
-      } else {
-        reports.add(Report
-            .buildDereferenceWarn()
-            .withStatus(HttpStatus.OK)
-            .withValue(resourceId)
-            .withMessage(resultMessage)
-            .build());
-      }
+
+    private static URL checkIfUrlIsValid(HashSet<Report> reports, String id) {
+        try {
+            URI uri = new URI(id);
+            return new URL(uri.toString());
+        } catch (URISyntaxException | MalformedURLException e) {
+            reports.add(Report
+                    .buildDereferenceIgnore()
+                    .withStatus(HttpStatus.OK)
+                    .withValue(id)
+                    .withException(e)
+                    .build());
+            LOGGER.debug("Invalid enrichment reference found: {}", id);
+            return null;
+        }
+    }
+
+    private static void setDereferenceStatusInReport(String resourceId, HashSet<Report> reports,
+                                                     DereferenceResultStatus resultStatus) {
+        if (!resultStatus.equals(DereferenceResultStatus.SUCCESS)) {
+            String resultMessage;
+            switch (resultStatus) {
+                case ENTITY_FOUND_XML_XSLT_ERROR:
+                    resultMessage = "Entity was found, applying the XSLT results in an XML error"
+                            .concat("either because the entity is malformed or the XSLT is malformed).");
+                    break;
+                case ENTITY_FOUND_XML_XSLT_PRODUCE_NO_CONTEXTUAL_CLASS:
+                    resultMessage = "Entity was found, but the XSLT mapping did not produce a contextual class.";
+                    break;
+                case INVALID_URL:
+                    resultMessage = "A URL to be dereferenced is invalid.";
+                    break;
+                case NO_VOCABULARY_MATCHING:
+                    resultMessage = "Could not find a vocabulary matching the URL.";
+                    break;
+                case UNKNOWN_EUROPEANA_ENTITY:
+                    resultMessage = "Dereferencing or Coreferencing: the europeana entity does not exist.";
+                    break;
+                case NO_ENTITY_FOR_VOCABULARY:
+                    resultMessage = "Could not find an entity for a known vocabulary.";
+                    break;
+                case FAILURE:
+                    resultMessage = "Dereference or Coreferencing failed.";
+                    break;
+                default:
+                    resultMessage = "";
+            }
+            if (resultStatus.equals(DereferenceResultStatus.FAILURE)) {
+                reports.add(Report.buildDereferenceError()
+                        .withValue(resourceId)
+                        .withMessage(resultMessage)
+                        .build());
+            } else if (resultStatus.equals(DereferenceResultStatus.INVALID_URL) ||
+                    resultStatus.equals(DereferenceResultStatus.NO_VOCABULARY_MATCHING) ||
+                    resultStatus.equals(DereferenceResultStatus.ENTITY_FOUND_XML_XSLT_PRODUCE_NO_CONTEXTUAL_CLASS)) {
+                reports.add(Report
+                        .buildDereferenceIgnore()
+                        .withStatus(HttpStatus.OK)
+                        .withValue(resourceId)
+                        .withMessage(resultMessage)
+                        .build());
+            } else {
+                reports.add(Report
+                        .buildDereferenceWarn()
+                        .withStatus(HttpStatus.OK)
+                        .withValue(resourceId)
+                        .withMessage(resultMessage)
+                        .build());
+            }
+        }
     }
-  }
-
-  @Override
-  public Set<Report> dereference(RDF rdf) {
-    // Extract fields from the RDF for dereferencing
-    LOGGER.debug(" Extracting fields from RDF for dereferencing...");
-    Map<Class<? extends AboutType>, Set<String>> resourceIds = extractReferencesForDereferencing(rdf);
-
-    // Get the dereferenced information to add to the RDF using the extracted fields
-    LOGGER.debug("Using extracted fields to gather enrichment-via-dereferencing information...");
-    List<DereferencedEntities> dereferenceInformation = dereferenceEntities(resourceIds);
-    Set<Report> reports = dereferenceInformation.stream()
-                                                .map(DereferencedEntities::getReportMessages)
-                                                .flatMap(Collection::stream)
-                                                .collect(Collectors.toSet());
-
-    // Merge the acquired information into the RDF
-    LOGGER.debug("Merging Dereference Information...");
-    entityMergeEngine.mergeReferenceEntitiesFromDereferencedEntities(rdf, dereferenceInformation);
-
-    // Done.
-    LOGGER.debug("Dereference completed.");
-    return reports;
-  }
-
-  @Override
-  public List<DereferencedEntities> dereferenceEntities(Map<Class<? extends AboutType>, Set<String>> resourceIds) {
-
-    // Sanity check.
-    if (resourceIds.isEmpty()) {
-      return List.of(new DereferencedEntities(Collections.emptyMap(), new HashSet<>()));
+
+    @Override
+    public Set<Report> dereference(RDF rdf) {
+        // Extract fields from the RDF for dereferencing
+        LOGGER.debug(" Extracting fields from RDF for dereferencing...");
+        Map<Class<? extends AboutType>, Set<String>> resourceIds = extractReferencesForDereferencing(rdf);
+
+        // Get the dereferenced information to add to the RDF using the extracted fields
+        LOGGER.debug("Using extracted fields to gather enrichment-via-dereferencing information...");
+        List<DereferencedEntities> dereferenceInformation = dereferenceEntities(resourceIds);
+        Set<Report> reports = dereferenceInformation.stream()
+                .map(DereferencedEntities::getReportMessages)
+                .flatMap(Collection::stream)
+                .collect(Collectors.toSet());
+
+        // Merge the acquired information into the RDF
+        LOGGER.debug("Merging Dereference Information...");
+        entityMergeEngine.mergeReferenceEntitiesFromDereferencedEntities(rdf, dereferenceInformation);
+
+        // Done.
+        LOGGER.debug("Dereference completed.");
+        return reports;
     }
 
-    //TODO Using TreeMap to sort out the elements because unit tests were failing due to "incorrect" order
-    //TODO The order should not matter, the unit tests need fixing
-    //TODO There's already ticket MET-5065 to handle it
-
-    // First try to get them from our own entity collection database.
-    TreeMap<Class<? extends AboutType>, Set<ReferenceTerm>> mappedReferenceTerms = new TreeMap<>(
-        Comparator.comparing(Class::getName));
-    TreeMap<Class<? extends AboutType>, DereferencedEntities> dereferencedResultEntities = new TreeMap<>(
-        Comparator.comparing(Class::getName));
-    resourceIds.forEach((key, value) -> {
-      HashSet<Report> reports = new HashSet<>();
-      Set<ReferenceTerm> referenceTermSet = setUpReferenceTermSet(value, reports);
-      mappedReferenceTerms.put(key, referenceTermSet);
-      final DereferencedEntities dereferencedOwnEntities = dereferenceOwnEntities(referenceTermSet, reports, key);
-      dereferencedResultEntities.put(key, dereferencedOwnEntities);
-    });
-
-    final Set<String> foundOwnEntityIds = dereferencedResultEntities
-        .values().stream()
-        .map(DereferencedEntities::getReferenceTermListMap)
-        .map(Map::values).flatMap(Collection::stream).flatMap(Collection::stream)
-        .map(EnrichmentBase::getAbout)
-        .collect(Collectors.toSet());
-
-    // For the remaining ones, get them from the dereference service.
-    for (Map.Entry<Class<? extends AboutType>, Set<ReferenceTerm>> entry : mappedReferenceTerms.entrySet()) {
-      DereferencedEntities dereferencedEntities;
-      Set<ReferenceTerm> notFoundOwnReferenceTerms = entry.getValue().stream().filter(
-          referenceTerm -> !foundOwnEntityIds.contains(referenceTerm.getReference().toString())).collect(
-          Collectors.toSet());
-      if (notFoundOwnReferenceTerms.isEmpty()) {
-        continue;
-      }
-
-      if (entry.getKey().equals(Aggregation.class)) {
-        dereferencedEntities = dereferenceAggregation(notFoundOwnReferenceTerms, entry.getKey());
-      } else {
-        dereferencedEntities = dereferenceExternalEntity(notFoundOwnReferenceTerms, entry.getKey());
-      }
-
-      updateDereferencedEntitiesMap(dereferencedResultEntities, entry.getKey(), dereferencedEntities);
+    @Override
+    public List<DereferencedEntities> dereferenceEntities(Map<Class<? extends AboutType>, Set<String>> resourceIds) {
+
+        // Sanity check.
+        if (resourceIds.isEmpty()) {
+            return List.of(new DereferencedEntities(Collections.emptyMap(), new HashSet<>()));
+        }
+
+        //TODO Using TreeMap to sort out the elements because unit tests were failing due to "incorrect" order
+        //TODO The order should not matter, the unit tests need fixing
+        //TODO There's already ticket MET-5065 to handle it
+
+        // First try to get them from our own entity collection database.
+        TreeMap<Class<? extends AboutType>, Set<ReferenceTerm>> mappedReferenceTerms = new TreeMap<>(
+                Comparator.comparing(Class::getName));
+        TreeMap<Class<? extends AboutType>, DereferencedEntities> dereferencedResultEntities = new TreeMap<>(
+                Comparator.comparing(Class::getName));
+        resourceIds.forEach((key, value) -> {
+            HashSet<Report> reports = new HashSet<>();
+            Set<ReferenceTerm> referenceTermSet = setUpReferenceTermSet(value, reports);
+            mappedReferenceTerms.put(key, referenceTermSet);
+            final DereferencedEntities dereferencedOwnEntities = dereferenceOwnEntities(referenceTermSet, reports, key);
+            dereferencedResultEntities.put(key, dereferencedOwnEntities);
+        });
+
+        final Set<String> foundOwnEntityIds = dereferencedResultEntities
+                .values().stream()
+                .map(DereferencedEntities::getReferenceTermListMap)
+                .map(Map::values).flatMap(Collection::stream).flatMap(Collection::stream)
+                .map(EnrichmentBase::getAbout)
+                .collect(Collectors.toSet());
+
+        // For the remaining ones, get them from the dereference service.
+        for (Map.Entry<Class<? extends AboutType>, Set<ReferenceTerm>> entry : mappedReferenceTerms.entrySet()) {
+            DereferencedEntities dereferencedEntities;
+            Set<ReferenceTerm> notFoundOwnReferenceTerms = entry.getValue().stream().filter(
+                    referenceTerm -> !foundOwnEntityIds.contains(referenceTerm.getReference().toString())).collect(
+                    Collectors.toSet());
+            if (notFoundOwnReferenceTerms.isEmpty()) {
+                continue;
+            }
+
+            if (entry.getKey().equals(Aggregation.class)) {
+                dereferencedEntities = dereferenceAggregation(notFoundOwnReferenceTerms, entry.getKey());
+            } else {
+                dereferencedEntities = dereferenceExternalEntity(notFoundOwnReferenceTerms, entry.getKey());
+            }
+
+            updateDereferencedEntitiesMap(dereferencedResultEntities, entry.getKey(), dereferencedEntities);
+        }
+        // Done.
+        return new ArrayList<>(dereferencedResultEntities.values());
     }
-    // Done.
-    return new ArrayList<>(dereferencedResultEntities.values());
-  }
 
-  private DereferencedEntities dereferenceAggregation(Set<ReferenceTerm> referenceTerms, Class<? extends AboutType> classType) {
+    private DereferencedEntities dereferenceAggregation(Set<ReferenceTerm> referenceTerms, Class<? extends AboutType> classType) {
 
-    DereferencedEntities result = dereferenceEntitiesWithUri(referenceTerms,
-        new HashSet<>(), classType);
+        DereferencedEntities result = dereferenceEntitiesWithUri(referenceTerms,
+                new HashSet<>(), classType);
 
-    //Collect references that returned empty lists values for references that we checked with uri
-    Set<ReferenceTerm> remainingReferences = referenceTerms.stream().filter(
-                                                               referenceTerm -> result.getReferenceTermListMap().get(referenceTerm).isEmpty())
-                                                           .collect(Collectors.toSet());
+        //Collect references that returned empty lists values for references that we checked with uri
+        Set<ReferenceTerm> remainingReferences = referenceTerms.stream().filter(
+                        referenceTerm -> result.getReferenceTermListMap().get(referenceTerm).isEmpty())
+                .collect(Collectors.toSet());
 
-    //If there are any remaining references then do external dereferencing
-    if (CollectionUtils.isNotEmpty(remainingReferences)) {
-      DereferencedEntities aggregationRemainingDereferencingResult = dereferenceExternalEntity(remainingReferences, classType);
-      result.getReferenceTermListMap().putAll(aggregationRemainingDereferencingResult.getReferenceTermListMap());
-      result.getReportMessages().addAll(aggregationRemainingDereferencingResult.getReportMessages());
-    }
+        //If there are any remaining references then do external dereferencing
+        if (CollectionUtils.isNotEmpty(remainingReferences)) {
+            DereferencedEntities aggregationRemainingDereferencingResult = dereferenceExternalEntity(remainingReferences, classType);
+            result.getReferenceTermListMap().putAll(aggregationRemainingDereferencingResult.getReferenceTermListMap());
+            result.getReportMessages().addAll(aggregationRemainingDereferencingResult.getReportMessages());
+        }
 
-    return result;
-  }
+        return result;
+    }
 
-  @Override
-  public Map<Class<? extends AboutType>, Set<String>> extractReferencesForDereferencing(RDF rdf) {
-    return DereferenceUtils.extractReferencesForDereferencing(rdf);
-  }
+    @Override
+    public Map<Class<? extends AboutType>, Set<String>> extractReferencesForDereferencing(RDF rdf) {
+        return DereferenceUtils.extractReferencesForDereferencing(rdf);
+    }
 
-  private DereferencedEntities dereferenceOwnEntities(Set<ReferenceTerm> resourceIds,
-      HashSet<Report> reports,
-      Class<? extends AboutType> classType) {
-    if (entityResolver == null) {
-      return new DereferencedEntities(Collections.emptyMap(), new HashSet<>());
+    public DereferencedEntities dereferenceOwnEntities(Set<ReferenceTerm> resourceIds,
+        HashSet<Report> reports,
+        Class<? extends AboutType> classType) {
+        if (entityResolver == null) {
+            return new DereferencedEntities(Collections.emptyMap(), new HashSet<>());
+        }
+        try {
+            Map<ReferenceTerm, List<EnrichmentBase>> result = new HashMap<>();
+            Set<ReferenceTerm> ownEntities = resourceIds.stream()
+                    .filter(id -> EntityResolver.europeanaLinkPattern.matcher(id.getReference().toString()).matches())
+                    .collect(Collectors.toSet());
+            entityResolver.resolveById(ownEntities)
+                    .forEach((key, value) -> result.put(key, List.of(value)));
+            ownEntities.stream().filter(id -> result.get(id) == null || result.get(id).isEmpty())
+                    .forEach(notFoundOwnId -> {
+                        setDereferenceStatusInReport(notFoundOwnId.getReference().toString(),
+                                reports, DereferenceResultStatus.UNKNOWN_EUROPEANA_ENTITY);
+                        result.putIfAbsent(notFoundOwnId, Collections.emptyList());
+                    });
+            return new DereferencedEntities(result, reports, classType);
+        } catch (Exception e) {
+            return handleDereferencingException(resourceIds, reports, e, classType);
+        }
     }
-    try {
-      Map<ReferenceTerm, List<EnrichmentBase>> result = new HashMap<>();
-      entityResolver.resolveById(resourceIds).forEach((key, value) -> result.put(key, List.of(value)));
-      return new DereferencedEntities(result, reports, classType);
-    } catch (Exception e) {
-      return handleDereferencingException(resourceIds, reports, e, classType);
+
+    private DereferencedEntities dereferenceEntitiesWithUri(Set<ReferenceTerm> resourceIds,
+                                                            HashSet<Report> reports,
+                                                            Class<? extends AboutType> classType) {
+        if (entityResolver == null) {
+            return new DereferencedEntities(Collections.emptyMap(), new HashSet<>());
+        }
+        try {
+            return new DereferencedEntities(new HashMap<>(entityResolver.resolveByUri(resourceIds)), reports, classType);
+        } catch (Exception e) {
+            return handleDereferencingException(resourceIds, reports, e, classType);
+        }
     }
-  }
 
-  private DereferencedEntities dereferenceEntitiesWithUri(Set<ReferenceTerm> resourceIds,
-      HashSet<Report> reports,
-      Class<? extends AboutType> classType) {
-    if (entityResolver == null) {
-      return new DereferencedEntities(Collections.emptyMap(), new HashSet<>());
+    private DereferencedEntities dereferenceExternalEntity(Set<ReferenceTerm> referenceTerms,
+                                                           Class<? extends AboutType> classType) {
+        HashSet<Report> reports = new HashSet<>();
+        // Check that there is something to do.
+        if (dereferenceClient == null) {
+            return new DereferencedEntities(Collections.emptyMap(), reports, classType);
+        }
+
+        // Perform the dereferencing.
+        EnrichmentResultList result;
+        Map<ReferenceTerm, List<EnrichmentBase>> resultMap = new HashMap<>();
+        for (ReferenceTerm referenceTerm : referenceTerms) {
+            String resourceId = referenceTerm.getReference().toString();
+            try {
+                LOGGER.debug("Dereference external entity processing {}", resourceId);
+                result = retryableExternalRequestForNetworkExceptions(
+                        () -> dereferenceClient.dereference(resourceId));
+                DereferenceResultStatus resultStatus = Optional.ofNullable(result)
+                        .map(EnrichmentResultList::getEnrichmentBaseResultWrapperList)
+                        .orElseGet(Collections::emptyList).stream()
+                        .map(EnrichmentResultBaseWrapper::getDereferenceStatus)
+                        .filter(Objects::nonNull).findFirst()
+                        .orElse(DereferenceResultStatus.FAILURE);
+
+                setDereferenceStatusInReport(resourceId, reports, resultStatus);
+            } catch (BadRequest e) {
+                // We are forgiving for these errors
+                LOGGER.warn("ResourceId {}, failed", resourceId, e);
+                reports.add(Report
+                        .buildDereferenceWarn()
+                        .withStatus(HttpStatus.BAD_REQUEST)
+                        .withValue(resourceId)
+                        .withException(e)
+                        .build());
+                result = null;
+            } catch (Exception e) {
+                DereferenceException dereferenceException = new DereferenceException(
+                        "Exception occurred while trying to perform dereferencing.", e);
+                    reports.add(Report
+                            .buildDereferenceError()
+                            .withValue(resourceId)
+                            .withException(dereferenceException)
+                            .build());
+                result = null;
+            }
+            resultMap.put(referenceTerm, Optional.ofNullable(result).map(EnrichmentResultList::getEnrichmentBaseResultWrapperList)
+                    .orElseGet(Collections::emptyList).stream()
+                    .map(EnrichmentResultBaseWrapper::getEnrichmentBaseList).filter(Objects::nonNull)
+                    .flatMap(List::stream).collect(Collectors.toList()));
+        }
+
+        // Return the result.
+        return new DereferencedEntities(resultMap, reports, classType);
     }
-    try {
-      return new DereferencedEntities(new HashMap<>(entityResolver.resolveByUri(resourceIds)), reports, classType);
-    } catch (Exception e) {
-      return handleDereferencingException(resourceIds, reports, e, classType);
+
+    private Set<ReferenceTerm> setUpReferenceTermSet(Set<String> resourcesIds, HashSet<Report> reports) {
+        return resourcesIds.stream()
+                .map(id -> checkIfUrlIsValid(reports, id))
+                .filter(Objects::nonNull)
+                .map(validateUrl -> new ReferenceTermImpl(validateUrl, new HashSet<>()))
+                .collect(Collectors.toSet());
     }
-  }
-
-  private DereferencedEntities dereferenceExternalEntity(Set<ReferenceTerm> referenceTerms,
-      Class<? extends AboutType> classType) {
-    HashSet<Report> reports = new HashSet<>();
-    // Check that there is something to do.
-    if (dereferenceClient == null) {
-      return new DereferencedEntities(Collections.emptyMap(), reports, classType);
+
+    private void updateDereferencedEntitiesMap(TreeMap<Class<? extends AboutType>, DereferencedEntities> mapToUpdate,
+                                               Class<? extends AboutType> classType,
+                                               DereferencedEntities elementToUpdateWith) {
+
+        DereferencedEntities foundEntities = mapToUpdate.get(classType);
+        foundEntities.getReferenceTermListMap().putAll(elementToUpdateWith.getReferenceTermListMap());
+        foundEntities.getReportMessages().addAll(elementToUpdateWith.getReportMessages());
+
     }
 
-    // Perform the dereferencing.
-    EnrichmentResultList result;
-    Map<ReferenceTerm, List<EnrichmentBase>> resultMap = new HashMap<>();
-    for (ReferenceTerm referenceTerm : referenceTerms) {
-      String resourceId = referenceTerm.getReference().toString();
-      try {
-        LOGGER.debug("== Processing {}", resourceId);
-        result = retryableExternalRequestForNetworkExceptions(
-            () -> dereferenceClient.dereference(resourceId));
-        DereferenceResultStatus resultStatus = Optional.ofNullable(result)
-                                                       .map(EnrichmentResultList::getEnrichmentBaseResultWrapperList)
-                                                       .orElseGet(Collections::emptyList).stream()
-                                                       .map(EnrichmentResultBaseWrapper::getDereferenceStatus)
-                                                       .filter(Objects::nonNull).findFirst()
-                                                       .orElse(DereferenceResultStatus.UNKNOWN_ENTITY);
-
-        setDereferenceStatusInReport(resourceId, reports, resultStatus);
-      } catch (BadRequest e) {
-        // We are forgiving for these errors
-        LOGGER.warn("ResourceId {}, failed", resourceId, e);
-        reports.add(Report
-            .buildDereferenceWarn()
-            .withStatus(HttpStatus.BAD_REQUEST)
-            .withValue(resourceId)
-            .withException(e)
-            .build());
-        result = null;
-      } catch (Exception e) {
+    private DereferencedEntities handleDereferencingException(Set<ReferenceTerm> resourceIds, HashSet<Report> reports,
+                                                              Exception exception, Class<? extends AboutType> classType) {
         DereferenceException dereferenceException = new DereferenceException(
-            "Exception occurred while trying to perform dereferencing.", e);
+                "Exception occurred while trying to perform dereferencing.", exception);
         reports.add(Report
-            .buildDereferenceWarn()
-            .withStatus(HttpStatus.OK)
-            .withValue(resourceId)
-            .withException(dereferenceException)
-            .build());
-        result = null;
-      }
-      resultMap.put(referenceTerm, Optional.ofNullable(result).map(EnrichmentResultList::getEnrichmentBaseResultWrapperList)
-                                           .orElseGet(Collections::emptyList).stream()
-                                           .map(EnrichmentResultBaseWrapper::getEnrichmentBaseList).filter(Objects::nonNull)
-                                           .flatMap(List::stream).collect(Collectors.toList()));
+                .buildDereferenceWarn()
+                .withStatus(HttpStatus.OK)
+                .withValue(resourceIds.stream()
+                        .map(resourceId -> resourceId.getReference().toString())
+                        .collect(Collectors.joining(",")))
+                .withException(dereferenceException)
+                .build());
+        return new DereferencedEntities(new HashMap<>(), reports, classType);
     }
-
-    // Return the result.
-    return new DereferencedEntities(resultMap, reports, classType);
-  }
-
-  private Set<ReferenceTerm> setUpReferenceTermSet(Set<String> resourcesIds, HashSet<Report> reports) {
-    return resourcesIds.stream()
-                       .map(id -> checkIfUrlIsValid(reports, id))
-                       .filter(Objects::nonNull)
-                       .map(validateUrl -> new ReferenceTermImpl(validateUrl, new HashSet<>()))
-                       .collect(Collectors.toSet());
-  }
-
-  private void updateDereferencedEntitiesMap(TreeMap<Class<? extends AboutType>, DereferencedEntities> mapToUpdate,
-      Class<? extends AboutType> classType,
-      DereferencedEntities elementToUpdateWith) {
-
-    DereferencedEntities foundEntities = mapToUpdate.get(classType);
-    foundEntities.getReferenceTermListMap().putAll(elementToUpdateWith.getReferenceTermListMap());
-    foundEntities.getReportMessages().addAll(elementToUpdateWith.getReportMessages());
-
-  }
-
-  private DereferencedEntities handleDereferencingException(Set<ReferenceTerm> resourceIds, HashSet<Report> reports,
-      Exception exception, Class<? extends AboutType> classType) {
-    DereferenceException dereferenceException = new DereferenceException(
-        "Exception occurred while trying to perform dereferencing.", exception);
-    reports.add(Report
-        .buildDereferenceWarn()
-        .withStatus(HttpStatus.OK)
-        .withValue(resourceIds.stream()
-                              .map(resourceId -> resourceId.getReference().toString())
-                              .collect(Collectors.joining(",")))
-        .withException(dereferenceException)
-        .build());
-    return new DereferencedEntities(new HashMap<>(), reports, classType);
-  }
 }
diff --git a/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/rest/client/enrichment/MetisRecordParser.java b/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/rest/client/enrichment/MetisRecordParser.java
index 405cfd9dcf..8cdac94f3a 100644
--- a/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/rest/client/enrichment/MetisRecordParser.java
+++ b/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/rest/client/enrichment/MetisRecordParser.java
@@ -47,11 +47,14 @@ public Set<SearchTermContext> parseSearchTerms(RDF rdf) {
     //Proxy search terms
     final Set<SearchTermContext> resultSearchTermsSet = getFieldValueSet(ProxyFieldType.values(),
         RdfEntityUtils.getProviderProxies(rdf));
-    resultSearchTermsSet
-        .addAll(getFieldValueSet(AggregationFieldType.values(), rdf.getAggregationList()));
+    resultSearchTermsSet.addAll(getAggregationSearchTerms(rdf));
     return resultSearchTermsSet;
   }
 
+  public Set<SearchTermContext> getAggregationSearchTerms(RDF rdf) {
+    return getFieldValueSet(AggregationFieldType.values(), rdf.getAggregationList());
+  }
+
   private <T extends AboutType> Set<SearchTermContext> getFieldValueSet(FieldType<T>[] fieldTypes,
       List<T> aboutTypes) {
     final Map<FieldValue, Set<FieldType<T>>> fieldValueFieldTypesMap = new HashMap<>();
diff --git a/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/rest/client/report/Report.java b/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/rest/client/report/Report.java
index 00502ec72e..121d25dcbf 100644
--- a/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/rest/client/report/Report.java
+++ b/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/rest/client/report/Report.java
@@ -106,7 +106,7 @@ public static Report buildEnrichmentWarn() {
   }
 
   /**
-   * Create a report message for enrichment with error status and error type
+   * Create a report message for enrichment with error type
    *
    * @return a reference to this Builder
    */
@@ -135,6 +135,16 @@ public static Report buildDereferenceWarn() {
                        .withMessageType(Type.WARN);
   }
 
+  /**
+   * Create a report message for dereference with error type
+   *
+   * @return a reference to this Builder
+   */
+  public static Report buildDereferenceError() {
+    return new Report().withMode(Mode.DEREFERENCE)
+            .withMessageType(Type.ERROR);
+  }
+
   /**
    * Sets the {@code status} and returns a reference to this Builder enabling method chaining.
    *
diff --git a/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/utils/EntityMergeEngine.java b/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/utils/EntityMergeEngine.java
index cdbb416946..2b75ef29c3 100644
--- a/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/utils/EntityMergeEngine.java
+++ b/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/utils/EntityMergeEngine.java
@@ -11,34 +11,25 @@
 import eu.europeana.enrichment.api.external.model.Part;
 import eu.europeana.enrichment.api.external.model.Place;
 import eu.europeana.enrichment.api.external.model.TimeSpan;
-
 import eu.europeana.enrichment.api.internal.AggregationFieldType;
+import eu.europeana.enrichment.api.internal.FieldType;
 import eu.europeana.enrichment.api.internal.ProxyFieldType;
 import eu.europeana.enrichment.api.internal.ReferenceTerm;
 import eu.europeana.enrichment.api.internal.ReferenceTermContext;
 import eu.europeana.enrichment.api.internal.SearchTermContext;
 import eu.europeana.enrichment.rest.client.dereference.DereferencedEntities;
-
+import eu.europeana.metis.schema.jibx.AboutType;
 import eu.europeana.metis.schema.jibx.AgentType;
 import eu.europeana.metis.schema.jibx.Aggregation;
 import eu.europeana.metis.schema.jibx.Alt;
-import eu.europeana.metis.schema.jibx.Concept.Choice;
-import eu.europeana.metis.schema.jibx.Date;
-
-import eu.europeana.metis.schema.jibx.Lat;
-import eu.europeana.metis.schema.jibx.PlaceType;
 import eu.europeana.metis.schema.jibx.AltLabel;
-import eu.europeana.metis.schema.jibx.HasPart;
-import eu.europeana.metis.schema.jibx.IsPartOf;
-import eu.europeana.metis.schema.jibx._Long;
-import eu.europeana.metis.schema.jibx.Note;
-import eu.europeana.metis.schema.jibx.PrefLabel;
-import eu.europeana.metis.schema.jibx.SameAs;
 import eu.europeana.metis.schema.jibx.Begin;
 import eu.europeana.metis.schema.jibx.BiographicalInformation;
-import eu.europeana.metis.schema.jibx.ProfessionOrOccupation;
-import eu.europeana.metis.schema.jibx.PlaceOfBirth;
-import eu.europeana.metis.schema.jibx.PlaceOfDeath;
+import eu.europeana.metis.schema.jibx.BroadMatch;
+import eu.europeana.metis.schema.jibx.Broader;
+import eu.europeana.metis.schema.jibx.CloseMatch;
+import eu.europeana.metis.schema.jibx.Concept.Choice;
+import eu.europeana.metis.schema.jibx.Date;
 import eu.europeana.metis.schema.jibx.DateOfBirth;
 import eu.europeana.metis.schema.jibx.DateOfDeath;
 import eu.europeana.metis.schema.jibx.DateOfEstablishment;
@@ -47,24 +38,29 @@
 import eu.europeana.metis.schema.jibx.ExactMatch;
 import eu.europeana.metis.schema.jibx.Gender;
 import eu.europeana.metis.schema.jibx.HasMet;
+import eu.europeana.metis.schema.jibx.HasPart;
 import eu.europeana.metis.schema.jibx.HiddenLabel;
 import eu.europeana.metis.schema.jibx.Identifier;
 import eu.europeana.metis.schema.jibx.InScheme;
 import eu.europeana.metis.schema.jibx.IsNextInSequence;
+import eu.europeana.metis.schema.jibx.IsPartOf;
 import eu.europeana.metis.schema.jibx.IsRelatedTo;
+import eu.europeana.metis.schema.jibx.Lat;
 import eu.europeana.metis.schema.jibx.NarrowMatch;
 import eu.europeana.metis.schema.jibx.Narrower;
 import eu.europeana.metis.schema.jibx.Notation;
+import eu.europeana.metis.schema.jibx.Note;
+import eu.europeana.metis.schema.jibx.PlaceOfBirth;
+import eu.europeana.metis.schema.jibx.PlaceOfDeath;
+import eu.europeana.metis.schema.jibx.PlaceType;
+import eu.europeana.metis.schema.jibx.PrefLabel;
+import eu.europeana.metis.schema.jibx.ProfessionOrOccupation;
 import eu.europeana.metis.schema.jibx.RDF;
 import eu.europeana.metis.schema.jibx.Related;
 import eu.europeana.metis.schema.jibx.RelatedMatch;
+import eu.europeana.metis.schema.jibx.SameAs;
 import eu.europeana.metis.schema.jibx.TimeSpanType;
-import eu.europeana.enrichment.api.internal.FieldType;
-import eu.europeana.metis.schema.jibx.AboutType;
-import eu.europeana.metis.schema.jibx.BroadMatch;
-import eu.europeana.metis.schema.jibx.Broader;
-import eu.europeana.metis.schema.jibx.CloseMatch;
-
+import eu.europeana.metis.schema.jibx._Long;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -379,7 +375,7 @@ private static <I extends EnrichmentBase, T extends AboutType> T convertAndAddEn
     return convertedEntity;
   }
 
-  private static AboutType convertAndAddEntity(RDF rdf, EnrichmentBase enrichmentBase) {
+  public static AboutType convertAndAddEntity(RDF rdf, EnrichmentBase enrichmentBase) {
 
     // Convert the entity and add it to the RDF.
     final AboutType entity;
diff --git a/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/utils/RdfEntityUtils.java b/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/utils/RdfEntityUtils.java
index 6bd952bf58..954ac69f71 100644
--- a/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/utils/RdfEntityUtils.java
+++ b/metis-enrichment/metis-enrichment-client/src/main/java/eu/europeana/enrichment/utils/RdfEntityUtils.java
@@ -166,7 +166,7 @@ public static List<ProxyType> getProviderProxies(RDF rdf) {
         .collect(Collectors.toList());
   }
 
-  private static boolean isEuropeanaProxy(ProxyType proxy) {
+  public static boolean isEuropeanaProxy(ProxyType proxy) {
     return proxy.getEuropeanaProxy() != null && proxy.getEuropeanaProxy().isEuropeanaProxy();
   }
 
diff --git a/metis-enrichment/metis-enrichment-client/src/test/java/eu/europeana/enrichment/rest/client/EnrichmentWorkerImplTest.java b/metis-enrichment/metis-enrichment-client/src/test/java/eu/europeana/enrichment/rest/client/EnrichmentWorkerImplTest.java
index b1e163406f..d0d06a1945 100644
--- a/metis-enrichment/metis-enrichment-client/src/test/java/eu/europeana/enrichment/rest/client/EnrichmentWorkerImplTest.java
+++ b/metis-enrichment/metis-enrichment-client/src/test/java/eu/europeana/enrichment/rest/client/EnrichmentWorkerImplTest.java
@@ -1,21 +1,5 @@
 package eu.europeana.enrichment.rest.client;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.common.ConsoleNotifier;
 import com.github.tomakehurst.wiremock.http.JvmProxyConfigurer;
@@ -34,10 +18,6 @@
 import eu.europeana.enrichment.rest.client.report.Type;
 import eu.europeana.metis.schema.convert.SerializationException;
 import eu.europeana.metis.schema.jibx.RDF;
-import java.io.IOException;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.stream.Stream;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -48,443 +28,563 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 
+import java.io.IOException;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.stream.Stream;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 class EnrichmentWorkerImplTest {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(EnrichmentWorkerImplTest.class);
-  private static WireMockServer wireMockServer;
-
-  @BeforeAll
-  static void createWireMock() {
-    wireMockServer = new WireMockServer(wireMockConfig()
-        .dynamicPort()
-        .enableBrowserProxying(true)
-        .notifier(new ConsoleNotifier(true)));
-    wireMockServer.start();
-    JvmProxyConfigurer.configureFor(wireMockServer);
-  }
-
-  @AfterAll
-  static void tearDownWireMock() {
-    wireMockServer.stop();
-  }
-
-  private static Stream<Arguments> providedInputRecords() {
-    return Stream.of(
-        Arguments.of(getResourceFileContent("enrichment/sample_enrichment_exception.rdf"), RecordStatus.STOP),
-        Arguments.of(getResourceFileContent("enrichment/sample_dereference_not_found.rdf"), RecordStatus.CONTINUE),
-        Arguments.of(getResourceFileContent("enrichment/sample_dereference_redirect.rdf"), RecordStatus.CONTINUE),
-        Arguments.of(getResourceFileContent("enrichment/sample_enrichment_noentity.rdf"), RecordStatus.CONTINUE),
-        Arguments.of(getResourceFileContent("enrichment/sample_enrichment_success.rdf"), RecordStatus.CONTINUE)
-    );
-  }
-
-  private static String getResourceFileContent(String fileName) {
-    try {
-      return new String(
-          EnrichmentWorkerImplTest.class.getClassLoader().getResourceAsStream(fileName).readAllBytes()
-      );
-    } catch (IOException ioException) {
-      return "";
+    private static final Logger LOGGER = LoggerFactory.getLogger(EnrichmentWorkerImplTest.class);
+    private static WireMockServer wireMockServer;
+
+    @BeforeAll
+    static void createWireMock() {
+        wireMockServer = new WireMockServer(wireMockConfig()
+                .dynamicPort()
+                .enableBrowserProxying(true)
+                .notifier(new ConsoleNotifier(true)));
+        wireMockServer.start();
+        JvmProxyConfigurer.configureFor(wireMockServer);
+    }
+
+    @AfterAll
+    static void tearDownWireMock() {
+        wireMockServer.stop();
     }
-  }
-
-  @ParameterizedTest
-  @MethodSource("providedInputRecords")
-  void testEnrichmentWorkerHappyFlow(String inputRecord, RecordStatus recordStatus)
-      throws DereferenceException, EnrichmentException {
-    setDereferenceMocks();
-    setEntityAPIMocks();
-
-    TreeSet<Mode> modeSetWithBoth = new TreeSet<>();
-    modeSetWithBoth.add(Mode.ENRICHMENT);
-    modeSetWithBoth.add(Mode.DEREFERENCE);
-
-    EnricherProvider enricherProvider = new EnricherProvider();
-    enricherProvider.setEnrichmentPropertiesValues("http://localhost:" + wireMockServer.port() + "/entitymgmt",
-        "http://localhost:" + wireMockServer.port() + "/entity",
-        "api2demo");
-
-    final Enricher enricher = enricherProvider.create();
-
-    DereferencerProvider dereferencerProvider = new DereferencerProvider();
-    dereferencerProvider.setEnrichmentPropertiesValues("http://entity-api.mock/entity",
-        "http://entity-api.mock/entity",
-        "api2demo");
-
-    dereferencerProvider.setDereferenceUrl("http://dereference-rest.mock");
-    final Dereferencer dereferencer = dereferencerProvider.create();
-
-    // Execute the worker
-    final EnrichmentWorkerImpl worker = new EnrichmentWorkerImpl(dereferencer, enricher);
-
-    ProcessedResult<String> output = worker.process(inputRecord, modeSetWithBoth);
-
-    LOGGER.info("REPORT: {}\n\n", output.getReport());
-    LOGGER.info("RECORD: {}\n\n", output.getProcessedRecord());
-    LOGGER.info("STATUS: {}", output.getRecordStatus());
-    assertEquals(recordStatus, output.getRecordStatus());
-  }
-
-  private static void setEntityAPIMocks() {
-    wireMockServer.stubFor(get(urlEqualTo("/entitymgmt/concept/base/84?wskey=api2demo"))
-        .willReturn(aResponse()
-            .withHeader("Content-Type", "application/json")
-            .withBody(getResourceFileContent("entity-api/entity-api-response-concept-base.json"))
-            .withStatus(HttpStatus.OK.value())));
-
-    wireMockServer.stubFor(get(urlEqualTo("/entity/enrich?wskey=api2demo&text=Religion&lang=en&type=concept"))
-        .willReturn(aResponse()
-            .withHeader("Content-Type", "application/json")
-            .withBody(getResourceFileContent("entity-api/entity-api-response-concept.json"))
-            .withStatus(HttpStatus.OK.value())));
-
-    wireMockServer.stubFor(get(urlEqualTo("/entity/enrich?wskey=api2demo&text=Piotras%20Kalabuchovas&type=agent"))
-        .willReturn(aResponse()
-            .withHeader("Content-Type", "application/json")
-            .withBody(getResourceFileContent("entity-api/entity-api-response-agent-nomatch.json"))
-            .withStatus(HttpStatus.OK.value())));
-
-    wireMockServer.stubFor(get(urlEqualTo("/entity/enrich?wskey=api2demo&text=Paranguaricutirimicuaro&lang=en&type=concept"))
-        .willReturn(aResponse()
-            .withHeader("Content-Type", "application/json")
-            .withBody(getResourceFileContent("entity-api/entity-api-response-concept-nomatch.json"))
-            .withStatus(HttpStatus.OK.value())));
-    wireMockServer.stubFor(
-        get(urlEqualTo("/entity/enrich?wskey=api2demo&text=Lietuvos%20Centrinis%20Valstyb%C3%A9s%20Archyvas&type=organization"))
-            .willReturn(aResponse()
-                .withHeader("Content-Type", "application/json")
-                .withBody(getResourceFileContent("entity-api/entity-api-response-organization.json"))
-                .withStatus(HttpStatus.OK.value())));
-    wireMockServer.stubFor(
-        get(urlEqualTo("/entity/enrich?wskey=api2demo&text=EFG%20-%20The%20European%20Film%20Gateway&lang=en&type=organization"))
-            .willReturn(aResponse()
-                .withHeader("Content-Type", "application/json")
-                .withBody(getResourceFileContent("entity-api/entity-api-response-organization.json"))
-                .withStatus(HttpStatus.OK.value())));
-
-    wireMockServer.stubFor(get(urlEqualTo("/entitymgmt/organization/base/1482250000004671158?wskey=api2demo"))
-        .willReturn(aResponse()
-            .withHeader("Content-Type", "application/json")
-            .withBody(getResourceFileContent("entity-api/entity-api-response-organization-base.json"))
-            .withStatus(HttpStatus.OK.value())));
-
-    wireMockServer.stubFor(get(urlEqualTo("/entity/enrich?wskey=api2demo&text=1957&lang=en&type=timespan"))
-        .willReturn(aResponse()
-            .withHeader("Content-Type", "application/json")
-            .withBody(getResourceFileContent("entity-api/entity-api-response-timespan.json"))
-            .withStatus(HttpStatus.OK.value())));
-
-    wireMockServer.stubFor(get(urlEqualTo(
-        "/entity/resolve?uri=http://dbpedia.org/resource/Lithuanian_Soviet_Socialist_Republic_%25281918%25E2%2580%25931919%2529&wskey=api2demo"))
-        .willReturn(aResponse()
-            .withHeader("Content-Type", "application/json")
-            .withBody(getResourceFileContent("entity-api/entity-api-response-resolve-uri-nomatch.json"))
-            .withStatus(HttpStatus.OK.value())));
-
-    wireMockServer.stubFor(get(urlEqualTo("/entity/resolve?uri=https://sws.geonames.org/597427/&wskey=api2demo"))
-        .willReturn(aResponse()
-            .withHeader("Content-Type", "application/json")
-            .withBody(getResourceFileContent("entity-api/entity-api-response-resolve-uri-concept.json"))
-            .withStatus(HttpStatus.OK.value())));
-
-    wireMockServer.stubFor(get(urlEqualTo("/entity/resolve?uri=http://vocab.getty.edu/aat/300136900&wskey=api2demo"))
-        .willReturn(aResponse()
-            .withHeader("Content-Type", "application/json")
-            .withBody(getResourceFileContent("entity-api/entity-api-response-resolve-uri-concept.json"))
-            .withStatus(HttpStatus.OK.value())));
-    wireMockServer.stubFor(get(urlEqualTo("/entity/resolve?uri=http://dbpedia.org/resource/Lithuania&wskey=api2demo"))
-        .willReturn(aResponse()
-            .withHeader("Content-Type", "application/json")
-            .withBody(getResourceFileContent("entity-api/entity-api-response-resolve-uri-place.json"))
-            .withStatus(HttpStatus.OK.value())));
-    wireMockServer.stubFor(get(urlEqualTo("/entity/enrich?wskey=api2demo&text=Muziek&lang=nl&type=concept"))
-        .willReturn(aResponse()
-            .withHeader("Content-Type", "application/json")
-            .withBody(getResourceFileContent("entity-api/entity-api-response-concept-ii.json"))
-            .withStatus(HttpStatus.OK.value())));
-    wireMockServer.stubFor(get(urlEqualTo("/entitymgmt/concept/base/62?wskey=api2demo"))
-        .willReturn(aResponse()
-            .withHeader("Content-Type", "application/json")
-            .withBody(getResourceFileContent("entity-api/entity-api-response-concept-ii-base.json"))
-            .withStatus(HttpStatus.OK.value())));
-    wireMockServer.stubFor(get(urlEqualTo("/entity/enrich?wskey=api2demo&text=G%C3%BCiro&lang=es&type=concept"))
-        .willReturn(aResponse()
-            .withHeader("Content-Type", "application/json")
-            .withBody(getResourceFileContent("entity-api/entity-api-response-concept-iii.json"))
-            .withStatus(HttpStatus.OK.value())));
-    wireMockServer.stubFor(get(urlEqualTo("/entity/resolve?uri=http://www.mimo-db.eu/InstrumentsKeywords/0&wskey=api2demo"))
-        .willReturn(aResponse()
-            .withHeader("Content-Type", "application/json")
-            .withBody(getResourceFileContent("entity-api/entity-api-response-resolve-uri-concept-ii.json"))
-            .withStatus(HttpStatus.OK.value())));
-    wireMockServer.stubFor(get(urlEqualTo("/entity/resolve?uri=http://www.mimo-db.eu/InstrumentsKeywords/3052&wskey=api2demo"))
-        .willReturn(aResponse()
-            .withHeader("Content-Type", "application/json")
-            .withBody(getResourceFileContent("entity-api/entity-api-response-resolve-uri-concept-ii.json"))
-            .withStatus(HttpStatus.OK.value())));
-  }
-
-  private static void setDereferenceMocks() {
-    wireMockServer.stubFor(get(urlEqualTo("/dereference?uri=https%3A%2F%2Fsws.geonames.org%2F597427%2F"))
-        .withHost(equalTo("dereference-rest.mock"))
-        .willReturn(aResponse()
-            .withHeader("Content-Type", "application/xml")
-            .withBody(getResourceFileContent("dereference/dereference-geoname.xml"))
-            .withStatus(HttpStatus.OK.value())));
-    wireMockServer.stubFor(get(urlEqualTo("/dereference?uri=http%3A%2F%2Fvocab.getty.edu%2Faat%2F300136900"))
-        .withHost(equalTo("dereference-rest.mock"))
-        .willReturn(aResponse()
-            .withHeader("Content-Type", "application/xml")
-            .withBody(getResourceFileContent("dereference/dereference-vocabulary.xml"))
-            .withStatus(HttpStatus.OK.value())));
-    wireMockServer.stubFor(get(urlEqualTo("/dereference?uri=http%3A%2F%2Fwww.mimo-db.eu%2FInstrumentsKeywords%2F3052"))
-        .withHost(equalTo("dereference-rest.mock"))
-        .willReturn(aResponse()
-            .withHeader("Content-Type", "application/xml")
-            .withBody(getResourceFileContent("dereference/dereference-normal.xml"))
-            .withStatus(HttpStatus.OK.value())));
-    wireMockServer.stubFor(get(urlEqualTo("/dereference?uri=http%3A%2F%2Fwww.mimo-db.eu%2FInstrumentsKeywords%2F0"))
-        .withHost(equalTo("dereference-rest.mock"))
-        .willReturn(aResponse()
-            .withHeader("Content-Type", "application/xml")
-            .withBody(getResourceFileContent("dereference/dereference-no-entity.xml"))
-            .withStatus(HttpStatus.OK.value())));
-    wireMockServer.stubFor(get(urlEqualTo("/dereference?uri=http%3A%2F%2Fsemantics.gr%2Fauthorities%2Fthematic_tags%2F994210004"))
-        .withHost(equalTo("dereference-rest.mock"))
-        .willReturn(aResponse()
-            .withHeader("Content-Type", "application/xml")
-            .withBody(getResourceFileContent("dereference/dereference-normal-redirect.xml"))
-            .withStatus(HttpStatus.OK.value())));
-  }
-
-  @Test
-  void testEnrichmentWorkerHappyFlow() throws DereferenceException, EnrichmentException {
-    TreeSet<Mode> modeSetWithOnlyEnrichment = new TreeSet<>();
-    TreeSet<Mode> modeSetWithOnlyDereference = new TreeSet<>();
-    TreeSet<Mode> modeSetWithBoth = new TreeSet<>();
-
-    modeSetWithOnlyEnrichment.add(Mode.ENRICHMENT);
-    testEnrichmentWorkerHappyFlow(modeSetWithOnlyEnrichment);
-    modeSetWithOnlyDereference.add(Mode.DEREFERENCE);
-    testEnrichmentWorkerHappyFlow(modeSetWithOnlyDereference);
-    modeSetWithBoth.add(Mode.ENRICHMENT);
-    modeSetWithBoth.add(Mode.DEREFERENCE);
-    testEnrichmentWorkerHappyFlow(modeSetWithBoth);
-  }
-
-  @Test
-  void testEnrichmentWorkerNullFlow() throws DereferenceException, EnrichmentException {
-    TreeSet<Mode> modeSetWithOnlyEnrichment = new TreeSet<>();
-    TreeSet<Mode> modeSetWithOnlyDereference = new TreeSet<>();
-    TreeSet<Mode> modeSetWithBoth = new TreeSet<>();
-
-    modeSetWithOnlyEnrichment.add(Mode.ENRICHMENT);
-    testEnrichmentWorkerNullFlow(modeSetWithOnlyEnrichment);
-    modeSetWithOnlyDereference.add(Mode.DEREFERENCE);
-    testEnrichmentWorkerNullFlow(modeSetWithOnlyDereference);
-    modeSetWithBoth.add(Mode.ENRICHMENT);
-    modeSetWithBoth.add(Mode.DEREFERENCE);
-    testEnrichmentWorkerNullFlow(modeSetWithBoth);
-  }
-
-  private void testEnrichmentWorkerHappyFlow(Set<Mode> modes)
-      throws DereferenceException, EnrichmentException {
-
-    // Create enricher and mock it.
-    final Enricher enricher = mock(EnricherImpl.class);
-
-    final Dereferencer dereferencer = mock(DereferencerImpl.class);
-
-    // Execute the worker
-    final EnrichmentWorkerImpl worker = new EnrichmentWorkerImpl(dereferencer, enricher);
-    final RDF inputRdf = new RDF();
-    worker.process(inputRdf, modes);
-
-    // Counters of method calls depend on the mode
-    final boolean doDereferencing = modes.contains(Mode.DEREFERENCE);
-    final boolean doEnrichment = modes.contains(Mode.ENRICHMENT);
-
-    // Check the performed tasks
-    verifyDereferencingHappyFlow(doDereferencing, dereferencer, inputRdf);
-    verifyEnrichmentHappyFlow(doEnrichment, enricher, inputRdf);
-    //    verifyMergeHappyFlow(doEnrichment, doDereferencing, entityMergeEngine);
-  }
-
-  private void testEnrichmentWorkerNullFlow(Set<Mode> modes)
-      throws DereferenceException, EnrichmentException {
-
-    // Create enrichment worker and mock the enrichment and dereferencing results.
-    final Enricher enricher = mock(EnricherImpl.class);
-
-    final Dereferencer dereferencer = mock(DereferencerImpl.class);
-
-    // Execute the worker
-    final EnrichmentWorkerImpl worker =
-        spy(new EnrichmentWorkerImpl(dereferencer, enricher));
-    final RDF inputRdf = new RDF();
-    worker.process(inputRdf, modes);
-
-    // Counters of method calls depend on the mode
-    final boolean doDereferencing = modes.contains(Mode.DEREFERENCE);
-    final boolean doEnrichment = modes.contains(Mode.ENRICHMENT);
-
-    // Check the performed tasks
-    verifyDereferencingNullFlow(doDereferencing, dereferencer, inputRdf);
-    verifyEnrichmentNullFlow(doEnrichment, enricher, inputRdf);
-
-  }
-
-  // Verify dereference related calls
-  private void verifyDereferencingHappyFlow(boolean doDereferencing, Dereferencer dereferencer,
-      RDF inputRdf) throws DereferenceException {
-    if (doDereferencing) {
-      verify(dereferencer, times(1)).dereference(inputRdf);
-
-    } else {
-      verify(dereferencer, never()).dereference(any());
+
+    private static Stream<Arguments> providedInputRecords() {
+        return Stream.of(
+                Arguments.of(getResourceFileContent("enrichment/sample_enrichment_exception.rdf"), RecordStatus.STOP),
+                Arguments.of(getResourceFileContent("enrichment/sample_dereference_not_found.rdf"), RecordStatus.STOP),
+                Arguments.of(getResourceFileContent("enrichment/sample_dereference_redirect.rdf"), RecordStatus.CONTINUE),
+                Arguments.of(getResourceFileContent("enrichment/sample_enrichment_noentity.rdf"), RecordStatus.CONTINUE),
+                Arguments.of(getResourceFileContent("enrichment/sample_enrichment_failure.rdf"), RecordStatus.STOP),
+                Arguments.of(getResourceFileContent("enrichment/sample_enrichment_success.rdf"), RecordStatus.CONTINUE)
+        );
     }
-  }
 
-  private void verifyDereferencingNullFlow(boolean doDereferencing, Dereferencer dereferencer,
-      RDF inputRdf) throws DereferenceException {
-    if (doDereferencing) {
+    private static String getResourceFileContent(String fileName) {
+        try {
+            return new String(
+                    EnrichmentWorkerImplTest.class.getClassLoader().getResourceAsStream(fileName).readAllBytes()
+            );
+        } catch (IOException ioException) {
+            return "";
+        }
+    }
 
-      verify(dereferencer, times(1)).dereference(inputRdf);
+    private static void setEntityAPIMocks() {
+        wireMockServer.stubFor(get(urlEqualTo("/entitymgmt/concept/base/84?wskey=api2demo"))
+                .willReturn(aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody(getResourceFileContent("entity-api/entity-api-response-mgmt-concept-base.json"))
+                        .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(get(urlEqualTo("/entitymgmt/concept/base/3401?wskey=api2demo"))
+                .willReturn(aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody(getResourceFileContent("entity-api/entity-api-response-mgmt-concept-base-ii.json"))
+                        .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(
+                get(urlEqualTo("/entity/enrich?wskey=api2demo&text=Religion&lang=en&type=concept"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/json")
+                                .withBody(getResourceFileContent("entity-api/entity-api-response-concept.json"))
+                                .withStatus(HttpStatus.OK.value())));
+
+        wireMockServer.stubFor(
+                get(urlEqualTo("/entity/enrich?wskey=api2demo&text=Piotras%20Kalabuchovas&type=agent"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/json")
+                                .withBody(getResourceFileContent("entity-api/entity-api-response-agent-nomatch.json"))
+                                .withStatus(HttpStatus.OK.value())));
+
+        wireMockServer.stubFor(get(urlEqualTo(
+                "/entity/enrich?wskey=api2demo&text=Paranguaricutirimicuaro&lang=en&type=concept"))
+                .willReturn(aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody(getResourceFileContent("entity-api/entity-api-response-concept-nomatch.json"))
+                        .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(
+                get(urlEqualTo(
+                        "/entity/enrich?wskey=api2demo&text=Lietuvos%20Centrinis%20Valstyb%C3%A9s%20Archyvas&type=organization"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/json")
+                                .withBody(getResourceFileContent("entity-api/entity-api-response-organization.json"))
+                                .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(
+                get(urlEqualTo(
+                        "/entity/enrich?wskey=api2demo&text=EFG%20-%20The%20European%20Film%20Gateway&lang=en&type=organization"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/json")
+                                .withBody(getResourceFileContent("entity-api/entity-api-response-organization.json"))
+                                .withStatus(HttpStatus.OK.value())));
+
+        wireMockServer.stubFor(
+                get(urlEqualTo("/entitymgmt/organization/base/1482250000004671158?wskey=api2demo"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/json")
+                                .withBody(getResourceFileContent("entity-api/entity-api-response-mgmt-organization-base.json"))
+                                .withStatus(HttpStatus.OK.value())));
+
+        wireMockServer.stubFor(
+                get(urlEqualTo("/entity/enrich?wskey=api2demo&text=1957&lang=en&type=timespan"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/json")
+                                .withBody(getResourceFileContent("entity-api/entity-api-response-timespan.json"))
+                                .withStatus(HttpStatus.OK.value())));
+
+        wireMockServer.stubFor(get(urlEqualTo(
+                "/entity/resolve?uri=http://dbpedia.org/resource/Lithuanian_Soviet_Socialist_Republic_%25281918%25E2%2580%25931919%2529&wskey=api2demo"))
+                .willReturn(aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody(getResourceFileContent("entity-api/entity-api-response-resolve-uri-nomatch.json"))
+                        .withStatus(HttpStatus.OK.value())));
+
+        wireMockServer.stubFor(
+                get(urlEqualTo("/entity/resolve?uri=https://sws.geonames.org/597427/&wskey=api2demo"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/json")
+                                .withBody(getResourceFileContent("entity-api/entity-api-response-resolve-uri-concept.json"))
+                                .withStatus(HttpStatus.OK.value())));
+
+        wireMockServer.stubFor(
+                get(urlEqualTo("/entity/resolve?uri=http://vocab.getty.edu/aat/300136900&wskey=api2demo"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/json")
+                                .withBody(getResourceFileContent("entity-api/entity-api-response-resolve-uri-concept.json"))
+                                .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(
+                get(urlEqualTo("/entity/resolve?uri=http://vocab.getty.edu/aat/300008372&wskey=api2demo"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/json")
+                                .withBody(getResourceFileContent("entity-api/entity-api-response-resolve-uri-nomatch.json"))
+                                .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(
+                get(urlEqualTo("/entity/resolve?uri=http://vocab.getty.edu/aat/300000810&wskey=api2demo"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/json")
+                                .withBody(getResourceFileContent("entity-api/entity-api-response-resolve-uri-nomatch.json"))
+                                .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(
+                get(urlEqualTo("/entity/resolve?uri=http://data.europeana.eu/concept/3401&wskey=api2demo"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/json")
+                                .withBody(getResourceFileContent("entity-api/entity-api-response-concept-iv.json"))
+                                .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(get(urlEqualTo(
+                "/entity/resolve?uri=http://data.europeana.eu/concept/XXXXXXXXX&wskey=api2demo"))
+                .willReturn(aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody(getResourceFileContent("entity-api/entity-api-response-concept-notfound.json"))
+                        .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(
+                get(urlEqualTo("/entity/resolve?uri=http://dbpedia.org/resource/Lithuania&wskey=api2demo"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/json")
+                                .withBody(getResourceFileContent("entity-api/entity-api-response-resolve-uri-place.json"))
+                                .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(
+                get(urlEqualTo("/entity/enrich?wskey=api2demo&text=Muziek&lang=nl&type=concept"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/json")
+                                .withBody(getResourceFileContent("entity-api/entity-api-response-concept-ii.json"))
+                                .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(get(urlEqualTo("/entitymgmt/concept/base/62?wskey=api2demo"))
+                .willReturn(aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody(
+                                getResourceFileContent("entity-api/entity-api-response-mgmt-concept-ii-base.json"))
+                        .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(
+                get(urlEqualTo("/entity/enrich?wskey=api2demo&text=G%C3%BCiro&lang=es&type=concept"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/json")
+                                .withBody(getResourceFileContent("entity-api/entity-api-response-concept-iii.json"))
+                                .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(get(urlEqualTo(
+                "/entity/resolve?uri=http://www.mimo-db.eu/InstrumentsKeywords/0&wskey=api2demo"))
+                .willReturn(aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody(getResourceFileContent("entity-api/entity-api-response-resolve-uri-concept-ii.json"))
+                        .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(get(urlEqualTo(
+                "/entity/resolve?uri=http://www.mimo-db.eu/InstrumentsKeywords/3052&wskey=api2demo"))
+                .willReturn(aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody(getResourceFileContent("entity-api/entity-api-response-resolve-uri-concept-ii.json"))
+                        .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(
+                get(urlEqualTo("/entity/resolve?uri=http://vocab.getty.edu/aat/400136800&wskey=api2demo"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/json")
+                                .withBody(getResourceFileContent("entity-api/entity-api-response-resolve-uri-concept.json"))
+                                .withStatus(HttpStatus.OK.value())));
+    }
 
-    } else {
-      verify(dereferencer, never()).dereference(any());
+    private static void setDereferenceMocks() {
+        wireMockServer.stubFor(
+                get(urlEqualTo("/dereference?uri=https%3A%2F%2Fsws.geonames.org%2F597427%2F"))
+                        .withHost(equalTo("dereference-rest.mock"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/xml")
+                                .withBody(getResourceFileContent("dereference/dereference-geoname.xml"))
+                                .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(
+                get(urlEqualTo("/dereference?uri=https%3A%2F%2Fsws.geonames.org%2F597427%2F1"))
+                        .withHost(equalTo("dereference-rest.mock"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/xml")
+                                .withStatus(HttpStatus.NOT_FOUND.value())));
+        wireMockServer.stubFor(
+                get(urlEqualTo("/dereference?uri=http%3A%2F%2Fvocab.getty.edu%2Faat%2F300136900"))
+                        .withHost(equalTo("dereference-rest.mock"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/xml")
+                                .withBody(getResourceFileContent("dereference/dereference-vocabulary.xml"))
+                                .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(
+                get(urlEqualTo("/dereference?uri=http%3A%2F%2Fvocab.getty.edu%2Faat%2F300008372"))
+                        .withHost(equalTo("dereference-rest.mock"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/xml")
+                                .withBody(getResourceFileContent("dereference/dereference-null.xml"))
+                                .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(
+                get(urlEqualTo("/dereference?uri=http%3A%2F%2Fvocab.getty.edu%2Faat%2F300000810"))
+                        .withHost(equalTo("dereference-rest.mock"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/xml")
+                                .withBody(getResourceFileContent("dereference/dereference-no-vocabulary.xml"))
+                                .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(
+                get(urlEqualTo("/dereference?uri=http%3A%2F%2Fdata.europeana.eu%2Fconcept%2F3401"))
+                        .withHost(equalTo("dereference-rest.mock"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/xml")
+                                .withBody(getResourceFileContent("dereference/dereference-normal-ii.xml"))
+                                .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(
+                get(urlEqualTo("/dereference?uri=http%3A%2F%2Fdata.europeana.eu%2Fconcept%2FXXXXXXXXX"))
+                        .withHost(equalTo("dereference-rest.mock"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/xml")
+                                .withBody(
+                                        getResourceFileContent("dereference/dereference-unknown-europeana-entity.xml"))
+                                .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(
+                get(urlEqualTo("/dereference?uri=http%3A%2F%2Fwww.mimo-db.eu%2FInstrumentsKeywords%2F3052"))
+                        .withHost(equalTo("dereference-rest.mock"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/xml")
+                                .withBody(getResourceFileContent("dereference/dereference-normal.xml"))
+                                .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(
+                get(urlEqualTo("/dereference?uri=http%3A%2F%2Fwww.mimo-db.eu%2FInstrumentsKeywords%2F0"))
+                        .withHost(equalTo("dereference-rest.mock"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/xml")
+                                .withBody(getResourceFileContent("dereference/dereference-null.xml"))
+                                .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(get(urlEqualTo(
+                "/dereference?uri=http%3A%2F%2Fsemantics.gr%2Fauthorities%2Fthematic_tags%2F994210004"))
+                .withHost(equalTo("dereference-rest.mock"))
+                .willReturn(aResponse()
+                        .withHeader("Content-Type", "application/xml")
+                        .withBody(getResourceFileContent("dereference/dereference-normal-redirect.xml"))
+                        .withStatus(HttpStatus.OK.value())));
+        wireMockServer.stubFor(
+                get(urlEqualTo("/dereference?uri=http%3A%2F%2Fvocab.getty.edu%2Faat%2F400136800"))
+                        .withHost(equalTo("dereference-rest.mock"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", "application/xml")
+                                .withBody(getResourceFileContent("dereference/dereference-failure.xml"))
+                                .withStatus(HttpStatus.OK.value())));
     }
-  }
 
-  // Verify enrichment related calls
-  private void verifyEnrichmentHappyFlow(boolean doEnrichment, Enricher enricher,
-      RDF inputRdf) throws EnrichmentException {
-    if (doEnrichment) {
-      verify(enricher, times(1)).enrichment(inputRdf);
+    @ParameterizedTest
+    @MethodSource("providedInputRecords")
+    void testEnrichmentWorkerHappyFlow(String inputRecord, RecordStatus recordStatus)
+            throws DereferenceException, EnrichmentException {
+        setDereferenceMocks();
+        setEntityAPIMocks();
+
+        TreeSet<Mode> modeSetWithBoth = new TreeSet<>();
+        modeSetWithBoth.add(Mode.ENRICHMENT);
+        modeSetWithBoth.add(Mode.DEREFERENCE);
+
+        EnricherProvider enricherProvider = new EnricherProvider();
+        enricherProvider.setEnrichmentPropertiesValues(
+                "http://localhost:" + wireMockServer.port() + "/entitymgmt",
+                "http://localhost:" + wireMockServer.port() + "/entity",
+                "api2demo");
+
+        final Enricher enricher = enricherProvider.create();
 
-    } else {
-      verify(enricher, never()).enrichment(any());
+        DereferencerProvider dereferencerProvider = new DereferencerProvider();
+        dereferencerProvider.setEnrichmentPropertiesValues("http://entity-api.mock/entitymgmt",
+                "http://entity-api.mock/entity",
+                "api2demo");
+
+        dereferencerProvider.setDereferenceUrl("http://dereference-rest.mock");
+        final Dereferencer dereferencer = dereferencerProvider.create();
+
+        // Execute the worker
+        final EnrichmentWorkerImpl worker = new EnrichmentWorkerImpl(dereferencer, enricher);
+
+        ProcessedResult<String> output = worker.process(inputRecord, modeSetWithBoth);
+
+        LOGGER.info("REPORT: {}\n\n", output.getReport());
+        LOGGER.info("RECORD: {}\n\n", output.getProcessedRecord());
+        LOGGER.info("STATUS: {}", output.getRecordStatus());
+        assertEquals(recordStatus, output.getRecordStatus());
     }
-  }
 
-  private void verifyEnrichmentNullFlow(boolean doEnrichment, Enricher worker, RDF inputRdf)
-      throws EnrichmentException {
-    if (doEnrichment) {
-      verify(worker, times(1)).enrichment(inputRdf);
+    @Test
+    void testEnrichmentWorkerHappyFlow() throws DereferenceException, EnrichmentException {
+        TreeSet<Mode> modeSetWithOnlyEnrichment = new TreeSet<>();
+        TreeSet<Mode> modeSetWithOnlyDereference = new TreeSet<>();
+        TreeSet<Mode> modeSetWithBoth = new TreeSet<>();
+
+        modeSetWithOnlyEnrichment.add(Mode.ENRICHMENT);
+        testEnrichmentWorkerHappyFlow(modeSetWithOnlyEnrichment);
+        modeSetWithOnlyDereference.add(Mode.DEREFERENCE);
+        testEnrichmentWorkerHappyFlow(modeSetWithOnlyDereference);
+        modeSetWithBoth.add(Mode.ENRICHMENT);
+        modeSetWithBoth.add(Mode.DEREFERENCE);
+        testEnrichmentWorkerHappyFlow(modeSetWithBoth);
+    }
 
-    } else {
-      verify(worker, never()).enrichment(any());
+    @Test
+    void testEnrichmentWorkerNullFlow() throws DereferenceException, EnrichmentException {
+        TreeSet<Mode> modeSetWithOnlyEnrichment = new TreeSet<>();
+        TreeSet<Mode> modeSetWithOnlyDereference = new TreeSet<>();
+        TreeSet<Mode> modeSetWithBoth = new TreeSet<>();
+
+        modeSetWithOnlyEnrichment.add(Mode.ENRICHMENT);
+        testEnrichmentWorkerNullFlow(modeSetWithOnlyEnrichment);
+        modeSetWithOnlyDereference.add(Mode.DEREFERENCE);
+        testEnrichmentWorkerNullFlow(modeSetWithOnlyDereference);
+        modeSetWithBoth.add(Mode.ENRICHMENT);
+        modeSetWithBoth.add(Mode.DEREFERENCE);
+        testEnrichmentWorkerNullFlow(modeSetWithBoth);
     }
-  }
-
-  @Test
-  void testProcessWrapperMethods() throws SerializationException {
-    // Create enrichment worker and mock the actual worker method as well as the RDF conversion
-    // methods.
-    final EnrichmentWorkerImpl worker = spy(new EnrichmentWorkerImpl(null, null));
-    final RDF inputRdf = new RDF();
-    final String outputString = "OutputString";
-    doReturn(inputRdf).when(worker).convertStringToRdf(anyString());
-    doReturn(outputString).when(worker).convertRdfToString(inputRdf);
-
-    doReturn(new ProcessedResult<>(inputRdf)).when(worker).process(any(RDF.class), any());
-
-    // Perform the operations and verify the result
-    final ProcessedResult<RDF> rdfProcessedResult = worker.process(inputRdf);
-    final RDF returnedRdf = rdfProcessedResult.getProcessedRecord();
-    assertEquals(inputRdf, returnedRdf);
-    assertTrue(rdfProcessedResult.getReport().isEmpty());
-    assertEquals(RecordStatus.CONTINUE, rdfProcessedResult.getRecordStatus());
-
-    final ProcessedResult<String> stringProcessedResult = worker.process("");
-    final String returnedString = stringProcessedResult.getProcessedRecord();
-    assertEquals(outputString, returnedString);
-    assertTrue(rdfProcessedResult.getReport().isEmpty());
-    assertEquals(RecordStatus.CONTINUE, rdfProcessedResult.getRecordStatus());
-
-    TreeSet<Mode> modeSetWithBoth = new TreeSet<>();
-    modeSetWithBoth.add(Mode.ENRICHMENT);
-    modeSetWithBoth.add(Mode.DEREFERENCE);
-
-    // Validate the method calls to the actual worker method
-    verify(worker, times(2)).process(any(RDF.class), any());
-    verify(worker, times(2)).process(inputRdf, modeSetWithBoth);
-
-    // Test null string input
-    ProcessedResult<String> resultString = worker.process((String) null);
-    assertEquals(RecordStatus.STOP, resultString.getRecordStatus());
-    for (Report report : resultString.getReport()) {
-      assertEquals(Type.ERROR, report.getMessageType());
-      assertTrue(report.getMessage().contains("Input RDF string cannot be null."));
-      assertTrue(report.getStackTrace().contains("IllegalArgumentException"));
+
+    private void testEnrichmentWorkerHappyFlow(Set<Mode> modes)
+            throws DereferenceException, EnrichmentException {
+
+        // Create enricher and mock it.
+        final Enricher enricher = mock(EnricherImpl.class);
+
+        final Dereferencer dereferencer = mock(DereferencerImpl.class);
+
+        // Execute the worker
+        final EnrichmentWorkerImpl worker = new EnrichmentWorkerImpl(dereferencer, enricher);
+        final RDF inputRdf = new RDF();
+        worker.process(inputRdf, modes);
+
+        // Counters of method calls depend on the mode
+        final boolean doDereferencing = modes.contains(Mode.DEREFERENCE);
+        final boolean doEnrichment = modes.contains(Mode.ENRICHMENT);
+
+        // Check the performed tasks
+        verifyDereferencingHappyFlow(doDereferencing, dereferencer, inputRdf);
+        verifyEnrichmentHappyFlow(doEnrichment, enricher, inputRdf);
+        //    verifyMergeHappyFlow(doEnrichment, doDereferencing, entityMergeEngine);
     }
-    assertEquals(1, resultString.getReport().size());
-    assertEquals(RecordStatus.STOP, resultString.getRecordStatus());
-  }
-
-  @Test
-  void testEnrichmentWorkerSerializationException() {
-    final EnrichmentWorkerImpl worker = spy(new EnrichmentWorkerImpl(null, null));
-
-    final ProcessedResult<String> stringProcessedResult = worker.process(
-        "<?xml version=\"1.0\"?>\n"
-        + "<rdf:RDF\n"
-        + "xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n"
-        + "xmlns:si=\"https://www.europeana.eu/rdf/\">\n"
-        + "<rdf:Description rdf:about=\"https://www.europeana.eu\">\n"
-        + "  <si:title>Europe Cultural Heritage</si:title>\n"
-        + "  <si:author>Europeana</si:author>\n"
-        + "</rdf:Description>\n"
-        + "</rdf:RDF>");
-    final String returnedString = stringProcessedResult.getProcessedRecord();
-    assertEquals(null, returnedString);
-    for (Report report : stringProcessedResult.getReport()) {
-      assertEquals(Type.ERROR, report.getMessageType());
-      assertTrue(report.getMessage().contains("Error serializing rdf"));
-      assertTrue(report.getStackTrace().contains("SerializationException: Something went wrong with converting to or from the RDF format."));
+
+    private void testEnrichmentWorkerNullFlow(Set<Mode> modes)
+            throws DereferenceException, EnrichmentException {
+
+        // Create enrichment worker and mock the enrichment and dereferencing results.
+        final Enricher enricher = mock(EnricherImpl.class);
+
+        final Dereferencer dereferencer = mock(DereferencerImpl.class);
+
+        // Execute the worker
+        final EnrichmentWorkerImpl worker =
+                spy(new EnrichmentWorkerImpl(dereferencer, enricher));
+        final RDF inputRdf = new RDF();
+        worker.process(inputRdf, modes);
+
+        // Counters of method calls depend on the mode
+        final boolean doDereferencing = modes.contains(Mode.DEREFERENCE);
+        final boolean doEnrichment = modes.contains(Mode.ENRICHMENT);
+
+        // Check the performed tasks
+        verifyDereferencingNullFlow(doDereferencing, dereferencer, inputRdf);
+        verifyEnrichmentNullFlow(doEnrichment, enricher, inputRdf);
+
+    }
+
+    // Verify dereference related calls
+    private void verifyDereferencingHappyFlow(boolean doDereferencing, Dereferencer dereferencer,
+                                              RDF inputRdf) throws DereferenceException {
+        if (doDereferencing) {
+            verify(dereferencer, times(1)).dereference(inputRdf);
+
+        } else {
+            verify(dereferencer, never()).dereference(any());
+        }
     }
-    assertEquals(1, stringProcessedResult.getReport().size());
-    assertEquals(RecordStatus.STOP, stringProcessedResult.getRecordStatus());
-
-    // Validate the method calls to the actual worker method
-    verify(worker, times(1)).process(any(String.class), any());
-  }
-
-  @Test
-  void testEnrichmentWorkerInputNullValues() {
-    // Create enrichment worker
-    final EnrichmentWorkerImpl worker = new EnrichmentWorkerImpl(null, null);
-
-    TreeSet<Mode> modeSetWithBoth = new TreeSet<>();
-    modeSetWithBoth.add(Mode.ENRICHMENT);
-    modeSetWithBoth.add(Mode.DEREFERENCE);
-
-    // Test null string input
-    ProcessedResult<String> resultString = worker.process((String) null, modeSetWithBoth);
-    assertEquals(RecordStatus.STOP, resultString.getRecordStatus());
-    for (Report report : resultString.getReport()) {
-      assertEquals(Type.ERROR, report.getMessageType());
-      assertTrue(report.getMessage().contains("Input RDF string cannot be null."));
-      assertTrue(report.getStackTrace().contains("IllegalArgumentException"));
+
+    private void verifyDereferencingNullFlow(boolean doDereferencing, Dereferencer dereferencer,
+                                             RDF inputRdf) throws DereferenceException {
+        if (doDereferencing) {
+
+            verify(dereferencer, times(1)).dereference(inputRdf);
+
+        } else {
+            verify(dereferencer, never()).dereference(any());
+        }
+    }
+
+    // Verify enrichment related calls
+    private void verifyEnrichmentHappyFlow(boolean doEnrichment, Enricher enricher,
+                                           RDF inputRdf) throws EnrichmentException {
+        if (doEnrichment) {
+            verify(enricher, times(1)).enrichment(inputRdf);
+
+        } else {
+            verify(enricher, never()).enrichment(any());
+        }
     }
-    assertEquals(1, resultString.getReport().size());
-    assertEquals(RecordStatus.STOP, resultString.getRecordStatus());
-  }
-
-  @Test
-  void testEnrichmentWorkerModeNullValues() {
-    // Create enrichment worker
-    final EnrichmentWorkerImpl worker = new EnrichmentWorkerImpl(null, null);
-
-    // Test empty RDF input
-    ProcessedResult<RDF> resultRdf = worker.process(new RDF(), null);
-    assertEquals(RecordStatus.STOP, resultRdf.getRecordStatus());
-    for (Report report : resultRdf.getReport()) {
-      assertEquals(Type.ERROR, report.getMessageType());
-      assertTrue(report.getMessage().contains("Set of Modes cannot be null"));
-      assertTrue(report.getStackTrace().contains("IllegalArgumentException"));
+
+    private void verifyEnrichmentNullFlow(boolean doEnrichment, Enricher worker, RDF inputRdf)
+            throws EnrichmentException {
+        if (doEnrichment) {
+            verify(worker, times(1)).enrichment(inputRdf);
+
+        } else {
+            verify(worker, never()).enrichment(any());
+        }
+    }
+
+    @Test
+    void testProcessWrapperMethods() throws SerializationException {
+        // Create enrichment worker and mock the actual worker method as well as the RDF conversion
+        // methods.
+        final EnrichmentWorkerImpl worker = spy(new EnrichmentWorkerImpl(null, null));
+        final RDF inputRdf = new RDF();
+        final String outputString = "OutputString";
+        doReturn(inputRdf).when(worker).convertStringToRdf(anyString());
+        doReturn(outputString).when(worker).convertRdfToString(inputRdf);
+
+        doReturn(new ProcessedResult<>(inputRdf)).when(worker).process(any(RDF.class), any());
+
+        // Perform the operations and verify the result
+        final ProcessedResult<RDF> rdfProcessedResult = worker.process(inputRdf);
+        final RDF returnedRdf = rdfProcessedResult.getProcessedRecord();
+        assertEquals(inputRdf, returnedRdf);
+        assertTrue(rdfProcessedResult.getReport().isEmpty());
+        assertEquals(RecordStatus.CONTINUE, rdfProcessedResult.getRecordStatus());
+
+        final ProcessedResult<String> stringProcessedResult = worker.process("");
+        final String returnedString = stringProcessedResult.getProcessedRecord();
+        assertEquals(outputString, returnedString);
+        assertTrue(rdfProcessedResult.getReport().isEmpty());
+        assertEquals(RecordStatus.CONTINUE, rdfProcessedResult.getRecordStatus());
+
+        TreeSet<Mode> modeSetWithBoth = new TreeSet<>();
+        modeSetWithBoth.add(Mode.ENRICHMENT);
+        modeSetWithBoth.add(Mode.DEREFERENCE);
+
+        // Validate the method calls to the actual worker method
+        verify(worker, times(2)).process(any(RDF.class), any());
+        verify(worker, times(2)).process(inputRdf, modeSetWithBoth);
+
+        // Test null string input
+        ProcessedResult<String> resultString = worker.process((String) null);
+        assertEquals(RecordStatus.STOP, resultString.getRecordStatus());
+        for (Report report : resultString.getReport()) {
+            assertEquals(Type.ERROR, report.getMessageType());
+            assertTrue(report.getMessage().contains("Input RDF string cannot be null."));
+            assertTrue(report.getStackTrace().contains("IllegalArgumentException"));
+        }
+        assertEquals(1, resultString.getReport().size());
+        assertEquals(RecordStatus.STOP, resultString.getRecordStatus());
+    }
+
+    @Test
+    void testEnrichmentWorkerSerializationException() {
+        final EnrichmentWorkerImpl worker = spy(new EnrichmentWorkerImpl(null, null));
+
+        final ProcessedResult<String> stringProcessedResult = worker.process(
+                "<?xml version=\"1.0\"?>\n"
+                        + "<rdf:RDF\n"
+                        + "xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n"
+                        + "xmlns:si=\"https://www.europeana.eu/rdf/\">\n"
+                        + "<rdf:Description rdf:about=\"https://www.europeana.eu\">\n"
+                        + "  <si:title>Europe Cultural Heritage</si:title>\n"
+                        + "  <si:author>Europeana</si:author>\n"
+                        + "</rdf:Description>\n"
+                        + "</rdf:RDF>");
+        final String returnedString = stringProcessedResult.getProcessedRecord();
+        assertEquals(null, returnedString);
+        for (Report report : stringProcessedResult.getReport()) {
+            assertEquals(Type.ERROR, report.getMessageType());
+            assertTrue(report.getMessage().contains("Error serializing rdf"));
+            assertTrue(report.getStackTrace().contains(
+                    "SerializationException: Something went wrong with converting to or from the RDF format."));
+        }
+        assertEquals(1, stringProcessedResult.getReport().size());
+        assertEquals(RecordStatus.STOP, stringProcessedResult.getRecordStatus());
+
+        // Validate the method calls to the actual worker method
+        verify(worker, times(1)).process(any(String.class), any());
+    }
+
+    @Test
+    void testEnrichmentWorkerInputNullValues() {
+        // Create enrichment worker
+        final EnrichmentWorkerImpl worker = new EnrichmentWorkerImpl(null, null);
+
+        TreeSet<Mode> modeSetWithBoth = new TreeSet<>();
+        modeSetWithBoth.add(Mode.ENRICHMENT);
+        modeSetWithBoth.add(Mode.DEREFERENCE);
+
+        // Test null string input
+        ProcessedResult<String> resultString = worker.process((String) null, modeSetWithBoth);
+        assertEquals(RecordStatus.STOP, resultString.getRecordStatus());
+        for (Report report : resultString.getReport()) {
+            assertEquals(Type.ERROR, report.getMessageType());
+            assertTrue(report.getMessage().contains("Input RDF string cannot be null."));
+            assertTrue(report.getStackTrace().contains("IllegalArgumentException"));
+        }
+        assertEquals(1, resultString.getReport().size());
+        assertEquals(RecordStatus.STOP, resultString.getRecordStatus());
+    }
+
+    @Test
+    void testEnrichmentWorkerModeNullValues() {
+        // Create enrichment worker
+        final EnrichmentWorkerImpl worker = new EnrichmentWorkerImpl(null, null);
+
+        // Test empty RDF input
+        ProcessedResult<RDF> resultRdf = worker.process(new RDF(), null);
+        assertEquals(RecordStatus.STOP, resultRdf.getRecordStatus());
+        for (Report report : resultRdf.getReport()) {
+            assertEquals(Type.ERROR, report.getMessageType());
+            assertTrue(report.getMessage().contains("Set of Modes cannot be null"));
+            assertTrue(report.getStackTrace().contains("IllegalArgumentException"));
+        }
+        assertEquals(1, resultRdf.getReport().size());
+        assertEquals(RecordStatus.STOP, resultRdf.getRecordStatus());
     }
-    assertEquals(1, resultRdf.getReport().size());
-    assertEquals(RecordStatus.STOP, resultRdf.getRecordStatus());
-  }
 }
diff --git a/metis-enrichment/metis-enrichment-client/src/test/java/eu/europeana/enrichment/rest/client/dereference/DereferencerImplTest.java b/metis-enrichment/metis-enrichment-client/src/test/java/eu/europeana/enrichment/rest/client/dereference/DereferencerImplTest.java
index 4e3cf17fe1..c98fb91050 100644
--- a/metis-enrichment/metis-enrichment-client/src/test/java/eu/europeana/enrichment/rest/client/dereference/DereferencerImplTest.java
+++ b/metis-enrichment/metis-enrichment-client/src/test/java/eu/europeana/enrichment/rest/client/dereference/DereferencerImplTest.java
@@ -1,22 +1,5 @@
 package eu.europeana.enrichment.rest.client.dereference;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.ok;
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anySet;
-import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.common.ConsoleNotifier;
 import com.github.tomakehurst.wiremock.http.JvmProxyConfigurer;
@@ -40,8 +23,25 @@
 import eu.europeana.metis.schema.jibx.Concept;
 import eu.europeana.metis.schema.jibx.PlaceType;
 import eu.europeana.metis.schema.jibx.RDF;
+import org.apache.commons.collections.CollectionUtils;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.ArgumentCaptor;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.HttpServerErrorException;
+
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.ServiceUnavailableException;
 import java.net.MalformedURLException;
+import java.net.SocketTimeoutException;
 import java.net.URL;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -52,363 +52,402 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
-import org.apache.commons.collections.CollectionUtils;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.client.HttpClientErrorException;
+import java.util.stream.Stream;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.ok;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anySet;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 /**
  * Unit tests for {@link DereferencerImpl} class
  */
 class DereferencerImplTest {
 
-  private static final Map<Class<? extends AboutType>, Set<String>> DEREFERENCE_EXTRACT_RESULT_INVALID = Map.of(
-      AboutType.class, Set.of("htt://invalid-example.host/about"),
-      Concept.class, Set.of("httpx://invalid-example.host/concept"),
-      PlaceType.class, Set.of("http://invalid-example host/place?val=ab"));
-
-  private static final Map<Class<? extends AboutType>, Set<String>> DEREFERENCE_EXTRACT_RESULT_VALID = Map.of(
-      AboutType.class, Set.of("http://valid-example.host/about"),
-      Concept.class, Set.of("http://valid-example.host/concept"),
-      PlaceType.class, Set.of("http://valid-example.host/place"));
-
-  private static final List<EnrichmentResultList> DEREFERENCE_RESULT;
-  private static final Map<SearchTerm, List<EnrichmentBase>> ENRICHMENT_RESULT = new HashMap<>();
-
-  private static WireMockServer wireMockServer;
-
-  @BeforeAll
-  static void createWireMock() {
-    wireMockServer = new WireMockServer(wireMockConfig()
-        .dynamicPort()
-        .enableBrowserProxying(true)
-        .notifier(new ConsoleNotifier(true)));
-    wireMockServer.start();
-    JvmProxyConfigurer.configureFor(wireMockServer);
-  }
-
-  @AfterAll
-  static void tearDownWireMock() {
-    wireMockServer.stop();
-  }
-
-  static {
-    final Agent agent1 = new Agent();
-    agent1.setAbout("agent1");
-    final Agent agent2 = new Agent();
-    agent2.setAbout("agent2");
-    final Place place1 = new Place();
-    place1.setAbout("place1");
-    final Place place2 = new Place();
-    place2.setAbout("place2");
-    final TimeSpan timeSpan1 = new TimeSpan();
-    timeSpan1.setAbout("timespan1");
-    final TimeSpan timeSpan2 = new TimeSpan();
-    timeSpan2.setAbout("timespan2");
-    final List<EnrichmentResultBaseWrapper> enrichmentResultBaseWrapperList1 = EnrichmentResultBaseWrapper
-        .createEnrichmentResultBaseWrapperList(List.of(Arrays.asList(agent1, null, agent2)), DereferenceResultStatus.SUCCESS);
-    final EnrichmentResultList dereferenceResult1 = new EnrichmentResultList(
-        enrichmentResultBaseWrapperList1);
-    final List<EnrichmentResultBaseWrapper> enrichmentResultBaseWrapperList2 = EnrichmentResultBaseWrapper
-        .createEnrichmentResultBaseWrapperList(List.of(Arrays.asList(timeSpan1, timeSpan2, null)),
-            DereferenceResultStatus.SUCCESS);
-    final EnrichmentResultList dereferenceResult2 = new EnrichmentResultList(
-        enrichmentResultBaseWrapperList2);
-    DEREFERENCE_RESULT = Arrays.asList(dereferenceResult1, null, dereferenceResult2);
-
-    SearchTerm searchTerm1 = new SearchTermImpl("value1", "en", Set.of(EntityType.PLACE));
-    SearchTerm searchTerm2 = new SearchTermImpl("value2", "en", Set.of(EntityType.CONCEPT));
-    SearchTerm searchTerm3 = new SearchTermImpl("value3", "en", Set.of(EntityType.AGENT));
-
-    ENRICHMENT_RESULT.put(searchTerm1, List.of(place1));
-    ENRICHMENT_RESULT.put(searchTerm2, null);
-    ENRICHMENT_RESULT.put(searchTerm3, List.of(place2));
-  }
-
-  @Test
-  void testDereferencerHappyFlow() throws MalformedURLException {
-    // Create mocks of the dependencies
-    final ClientEntityResolver clientEntityResolver = mock(ClientEntityResolver.class);
-    doReturn(ENRICHMENT_RESULT).when(clientEntityResolver).resolveByText(anySet());
-    final DereferenceClient dereferenceClient = mock(DereferenceClient.class);
-    doReturn(DEREFERENCE_RESULT.get(0),
-        DEREFERENCE_RESULT.subList(1, DEREFERENCE_RESULT.size()).toArray()).when(dereferenceClient)
-                                                                           .dereference(any());
-    final EntityMergeEngine entityMergeEngine = mock(EntityMergeEngine.class);
-
-    final Dereferencer dereferencer = spy(
-        new DereferencerImpl(entityMergeEngine, clientEntityResolver, dereferenceClient));
-    doReturn(DEREFERENCE_EXTRACT_RESULT_VALID).when(dereferencer).extractReferencesForDereferencing(any());
-
-    wireMockServer.stubFor(get("/about")
-        .withHost(equalTo("valid-example.host"))
-        .willReturn(ok("about")));
-    wireMockServer.stubFor(get("/concept")
-        .withHost(equalTo("valid-example.host"))
-        .willReturn(ok("concept")));
-    wireMockServer.stubFor(get("/place")
-        .withHost(equalTo("valid-example.host"))
-        .willReturn(ok("place")));
-
-    final RDF inputRdf = new RDF();
-    Set<Report> reports = dereferencer.dereference(inputRdf);
-
-    verifyDereferenceHappyFlow(dereferenceClient, dereferencer, inputRdf, reports);
-    verifyMergeHappyFlow(entityMergeEngine);
-  }
-
-  @Test
-  void testDereferencerNullFlow() {
-    // Create mocks of the dependencies
-    final ClientEntityResolver entityResolver = mock(ClientEntityResolver.class);
-    final DereferenceClient dereferenceClient = mock(DereferenceClient.class);
-
-    final EntityMergeEngine entityMergeEngine = mock(EntityMergeEngine.class);
-
-    // Create dereferencer.
-    final Dereferencer dereferencer = spy(
-        new DereferencerImpl(entityMergeEngine, entityResolver, dereferenceClient));
-    doReturn(Collections.emptyMap()).when(dereferencer).extractReferencesForDereferencing(any());
-
-    final RDF inputRdf = new RDF();
-    dereferencer.dereference(inputRdf);
-
-    verifyDereferenceNullFlow(dereferenceClient, dereferencer, inputRdf);
-    verifyMergeNullFlow(entityMergeEngine);
-  }
-
-  @Test
-  void testDereferenceInvalidUrl() throws MalformedURLException {
-    // Create mocks of the dependencies
-    final ClientEntityResolver clientEntityResolver = mock(ClientEntityResolver.class);
-    doReturn(ENRICHMENT_RESULT).when(clientEntityResolver).resolveByText(anySet());
-    final DereferenceClient dereferenceClient = mock(DereferenceClient.class);
-    doReturn(DEREFERENCE_RESULT.get(0),
-        DEREFERENCE_RESULT.subList(1, DEREFERENCE_RESULT.size()).toArray()).when(dereferenceClient)
-                                                                           .dereference(any());
-    final EntityMergeEngine entityMergeEngine = mock(EntityMergeEngine.class);
-
-    final Dereferencer dereferencer = spy(
-        new DereferencerImpl(entityMergeEngine, clientEntityResolver, dereferenceClient));
-    doReturn(DEREFERENCE_EXTRACT_RESULT_INVALID).when(dereferencer).extractReferencesForDereferencing(any());
-
-    final RDF inputRdf = new RDF();
-    Set<Report> reports = dereferencer.dereference(inputRdf);
-
-    verifyDereferenceInvalidUrlFlow(dereferenceClient, dereferencer, inputRdf, reports);
-    verifyMergeExceptionFlow(entityMergeEngine);
-  }
-
-  @Test
-  void testDereferenceHttpException() throws MalformedURLException {
-    // Create mocks of the dependencies
-    final ClientEntityResolver clientEntityResolver = mock(ClientEntityResolver.class);
-    doReturn(ENRICHMENT_RESULT).when(clientEntityResolver).resolveByText(anySet());
-    final DereferenceClient dereferenceClient = mock(DereferenceClient.class);
-    when(dereferenceClient.dereference(any()))
-        .thenThrow(HttpClientErrorException.create(HttpStatus.BAD_REQUEST, "", null, null, null));
-    final EntityMergeEngine entityMergeEngine = mock(EntityMergeEngine.class);
-
-    final Dereferencer dereferencer = spy(
-        new DereferencerImpl(entityMergeEngine, clientEntityResolver, dereferenceClient));
-    doReturn(DEREFERENCE_EXTRACT_RESULT_VALID).when(dereferencer).extractReferencesForDereferencing(any());
-
-    final RDF inputRdf = new RDF();
-    Set<Report> reports = dereferencer.dereference(inputRdf);
-
-    verifyDereferenceExceptionFlow(dereferenceClient, dereferencer, inputRdf, reports);
-    verifyMergeExceptionFlow(entityMergeEngine);
-  }
-
-  private void verifyDereferenceHappyFlow(DereferenceClient dereferenceClient,
-      Dereferencer dereferencer, RDF inputRdf, Set<Report> reports) {
-
-    verifyDerefencer(dereferencer, inputRdf);
-
-    // Actually dereferencing.
-    verify(dereferenceClient, times(DEREFERENCE_EXTRACT_RESULT_VALID.size())).dereference(anyString());
-
-    assertEquals(1, reports.size());
-    for (Report report : reports) {
-      assertTrue(report.getMessage().contains("Dereferencing or Coreferencing: the europeana entity does not exist"));
-      assertEquals(Type.WARN, report.getMessageType());
-      assertEquals(Mode.DEREFERENCE, report.getMode());
-      assertEquals("http://valid-example.host/concept", report.getValue());
-      assertEquals("", report.getStackTrace());
+    private static final Map<Class<? extends AboutType>, Set<String>> DEREFERENCE_EXTRACT_RESULT_INVALID = Map.of(
+            AboutType.class, Set.of("htt://invalid-example.host/about"),
+            Concept.class, Set.of("httpx://invalid-example.host/concept"),
+            PlaceType.class, Set.of("http://invalid-example host/place?val=ab"));
+
+    private static final Map<Class<? extends AboutType>, Set<String>> DEREFERENCE_EXTRACT_RESULT_VALID = Map.of(
+            AboutType.class, Set.of("http://valid-example.host/about"),
+            Concept.class, Set.of("http://data.europeana.eu.host/concept"),
+            PlaceType.class, Set.of("http://valid-example.host/place"));
+
+    private static final List<EnrichmentResultList> DEREFERENCE_RESULT;
+    private static final Map<SearchTerm, List<EnrichmentBase>> ENRICHMENT_RESULT = new HashMap<>();
+
+    private static WireMockServer wireMockServer;
+
+    static {
+        final Agent agent1 = new Agent();
+        agent1.setAbout("agent1");
+        final Agent agent2 = new Agent();
+        agent2.setAbout("agent2");
+        final Place place1 = new Place();
+        place1.setAbout("place1");
+        final Place place2 = new Place();
+        place2.setAbout("place2");
+        final TimeSpan timeSpan1 = new TimeSpan();
+        timeSpan1.setAbout("timespan1");
+        final TimeSpan timeSpan2 = new TimeSpan();
+        timeSpan2.setAbout("timespan2");
+        final List<EnrichmentResultBaseWrapper> enrichmentResultBaseWrapperList1 = EnrichmentResultBaseWrapper
+                .createEnrichmentResultBaseWrapperList(List.of(Arrays.asList(agent1, null, agent2)), DereferenceResultStatus.SUCCESS);
+        final EnrichmentResultList dereferenceResult1 = new EnrichmentResultList(
+                enrichmentResultBaseWrapperList1);
+        final List<EnrichmentResultBaseWrapper> enrichmentResultBaseWrapperList2 = EnrichmentResultBaseWrapper
+                .createEnrichmentResultBaseWrapperList(List.of(Arrays.asList(timeSpan1, timeSpan2, null)),
+                        DereferenceResultStatus.SUCCESS);
+        final EnrichmentResultList dereferenceResult2 = new EnrichmentResultList(
+                enrichmentResultBaseWrapperList2);
+        DEREFERENCE_RESULT = Arrays.asList(dereferenceResult1, null, dereferenceResult2);
+
+        SearchTerm searchTerm1 = new SearchTermImpl("value1", "en", Set.of(EntityType.PLACE));
+        SearchTerm searchTerm2 = new SearchTermImpl("value2", "en", Set.of(EntityType.CONCEPT));
+        SearchTerm searchTerm3 = new SearchTermImpl("value3", "en", Set.of(EntityType.AGENT));
+
+        ENRICHMENT_RESULT.put(searchTerm1, List.of(place1));
+        ENRICHMENT_RESULT.put(searchTerm2, null);
+        ENRICHMENT_RESULT.put(searchTerm3, List.of(place2));
+    }
+
+    @BeforeAll
+    static void createWireMock() {
+        wireMockServer = new WireMockServer(wireMockConfig()
+                .dynamicPort()
+                .enableBrowserProxying(true)
+                .notifier(new ConsoleNotifier(true)));
+        wireMockServer.start();
+        JvmProxyConfigurer.configureFor(wireMockServer);
+    }
+
+    @AfterAll
+    static void tearDownWireMock() {
+        wireMockServer.stop();
+    }
+
+    private static Stream<Arguments> providedExceptions() {
+        return Stream.of(
+                Arguments.of(HttpClientErrorException.create(HttpStatus.BAD_REQUEST, "", null, null, null), Type.WARN, "400 Bad Request"),
+                Arguments.of(HttpServerErrorException.create(HttpStatus.INTERNAL_SERVER_ERROR, "Error with service", null, null, null), Type.ERROR,
+                        "Exception occurred while trying to perform dereferencing."),
+                Arguments.of(new RuntimeException(new UnknownHostException("")), Type.ERROR,
+                        "Exception occurred while trying to perform dereferencing."),
+                Arguments.of(new RuntimeException(new SocketTimeoutException("Time out exceeded")), Type.ERROR,
+                        "Exception occurred while trying to perform dereferencing."),
+                Arguments.of(new RuntimeException(new ServiceUnavailableException("No service")), Type.ERROR,
+                        "Exception occurred while trying to perform dereferencing."),
+                Arguments.of(new NotFoundException(), Type.ERROR,
+                        "Exception occurred while trying to perform dereferencing."),
+                Arguments.of(new RuntimeException(new IllegalArgumentException("argument invalid")), Type.ERROR,
+                        "Exception occurred while trying to perform dereferencing.")
+        );
+    }
+
+    @Test
+    void testDereferencerHappyFlow() throws MalformedURLException {
+        // Create mocks of the dependencies
+        final ClientEntityResolver clientEntityResolver = mock(ClientEntityResolver.class);
+        doReturn(ENRICHMENT_RESULT).when(clientEntityResolver).resolveByText(anySet());
+        final DereferenceClient dereferenceClient = mock(DereferenceClient.class);
+        doReturn(DEREFERENCE_RESULT.get(0),
+                DEREFERENCE_RESULT.subList(1, DEREFERENCE_RESULT.size()).toArray()).when(dereferenceClient)
+                .dereference(any());
+        final EntityMergeEngine entityMergeEngine = mock(EntityMergeEngine.class);
+
+        final Dereferencer dereferencer = spy(
+                new DereferencerImpl(entityMergeEngine, clientEntityResolver, dereferenceClient));
+        doReturn(DEREFERENCE_EXTRACT_RESULT_VALID).when(dereferencer).extractReferencesForDereferencing(any());
+
+        wireMockServer.stubFor(get("/about")
+                .withHost(equalTo("valid-example.host"))
+                .willReturn(ok("about")));
+        wireMockServer.stubFor(get("/concept")
+                .withHost(equalTo("data.europeana.eu.host"))
+                .willReturn(ok("concept")));
+        wireMockServer.stubFor(get("/place")
+                .withHost(equalTo("valid-example.host"))
+                .willReturn(ok("place")));
+
+        final RDF inputRdf = new RDF();
+        Set<Report> reports = dereferencer.dereference(inputRdf);
+
+        verifyDereferenceHappyFlow(dereferenceClient, dereferencer, inputRdf, reports);
+        verifyMergeHappyFlow(entityMergeEngine);
+    }
+
+    @Test
+    void testDereferencerNullFlow() {
+        // Create mocks of the dependencies
+        final ClientEntityResolver entityResolver = mock(ClientEntityResolver.class);
+        final DereferenceClient dereferenceClient = mock(DereferenceClient.class);
+
+        final EntityMergeEngine entityMergeEngine = mock(EntityMergeEngine.class);
+
+        // Create dereferencer.
+        final Dereferencer dereferencer = spy(
+                new DereferencerImpl(entityMergeEngine, entityResolver, dereferenceClient));
+        doReturn(Collections.emptyMap()).when(dereferencer).extractReferencesForDereferencing(any());
+
+        final RDF inputRdf = new RDF();
+        dereferencer.dereference(inputRdf);
+
+        verifyDereferenceNullFlow(dereferenceClient, dereferencer, inputRdf);
+        verifyMergeNullFlow(entityMergeEngine);
+    }
+
+    @Test
+    void testDereferenceInvalidUrl() throws MalformedURLException {
+        // Create mocks of the dependencies
+        final ClientEntityResolver clientEntityResolver = mock(ClientEntityResolver.class);
+        doReturn(ENRICHMENT_RESULT).when(clientEntityResolver).resolveByText(anySet());
+        final DereferenceClient dereferenceClient = mock(DereferenceClient.class);
+        doReturn(DEREFERENCE_RESULT.get(0),
+                DEREFERENCE_RESULT.subList(1, DEREFERENCE_RESULT.size()).toArray()).when(dereferenceClient)
+                .dereference(any());
+        final EntityMergeEngine entityMergeEngine = mock(EntityMergeEngine.class);
+
+        final Dereferencer dereferencer = spy(
+                new DereferencerImpl(entityMergeEngine, clientEntityResolver, dereferenceClient));
+        doReturn(DEREFERENCE_EXTRACT_RESULT_INVALID).when(dereferencer).extractReferencesForDereferencing(any());
+
+        final RDF inputRdf = new RDF();
+        Set<Report> reports = dereferencer.dereference(inputRdf);
+
+        verifyDereferenceInvalidUrlFlow(dereferenceClient, dereferencer, inputRdf, reports);
+        verifyMergeExceptionFlow(entityMergeEngine);
     }
-    Set<String> setOfValues = DEREFERENCE_EXTRACT_RESULT_VALID.values().stream().flatMap(Collection::stream)
-                                                              .collect(Collectors.toSet());
-    for (String dereferenceUrl : setOfValues) {
-      verify(dereferenceClient, times(1)).dereference(dereferenceUrl);
+
+    @Disabled("TODO: MET-4255 Improve execution time, think feasibility of @Value(\"${max-retries}\")")
+    @ParameterizedTest
+    @MethodSource("providedExceptions")
+    void testDereferenceNetworkException(Exception ex, Type expectedMessageType, String expectedMessage) throws MalformedURLException {
+        // Create mocks of the dependencies
+        final ClientEntityResolver clientEntityResolver = mock(ClientEntityResolver.class);
+        doReturn(ENRICHMENT_RESULT).when(clientEntityResolver).resolveByText(anySet());
+        final DereferenceClient dereferenceClient = mock(DereferenceClient.class);
+        doThrow(ex).when(dereferenceClient).dereference(any());
+        final EntityMergeEngine entityMergeEngine = mock(EntityMergeEngine.class);
+
+        final Dereferencer dereferencer = spy(
+                new DereferencerImpl(entityMergeEngine, clientEntityResolver, dereferenceClient));
+        doReturn(DEREFERENCE_EXTRACT_RESULT_VALID).when(dereferencer).extractReferencesForDereferencing(any());
+
+        final RDF inputRdf = new RDF();
+        Set<Report> reports = dereferencer.dereference(inputRdf);
+
+        verifyDereferenceExceptionFlow(dereferenceClient, dereferencer, inputRdf, reports, expectedMessageType, expectedMessage);
+        verifyMergeExceptionFlow(entityMergeEngine);
     }
-  }
 
-  private void verifyDereferenceInvalidUrlFlow(DereferenceClient dereferenceClient,
-      Dereferencer dereferencer, RDF inputRdf, Set<Report> reports) {
+    private void verifyDereferenceHappyFlow(DereferenceClient dereferenceClient,
+                                            Dereferencer dereferencer, RDF inputRdf, Set<Report> reports) {
+
+        verifyDerefencer(dereferencer, inputRdf);
+
+        // Actually dereferencing.
+        verify(dereferenceClient, times(DEREFERENCE_EXTRACT_RESULT_VALID.size())).dereference(anyString());
+
+        assertEquals(2, reports.size());
+
+        Set<Report> expectedReports = Set.of(Report.buildDereferenceError()
+                        .withValue("http://data.europeana.eu.host/concept")
+                        .withMessage("Dereference or Coreferencing failed."),
+                Report.buildDereferenceWarn()
+                        .withStatus(HttpStatus.OK)
+                        .withValue("http://data.europeana.eu.host/concept")
+                        .withMessage("Dereferencing or Coreferencing: the europeana entity does not exist."));
 
-    // Extracting values for dereferencing
-    verifyDerefencer(dereferencer, inputRdf);
+        assertTrue(CollectionUtils.isEqualCollection(expectedReports, reports));
 
-    // Checking the report.
-    assertEquals(3, reports.size());
-    for (Report report : reports) {
-      assertEquals(Type.IGNORE, report.getMessageType());
-      assertEquals(Mode.DEREFERENCE, report.getMode());
+        Set<String> setOfValues = DEREFERENCE_EXTRACT_RESULT_VALID.values().stream().flatMap(Collection::stream)
+                .collect(Collectors.toSet());
+        for (String dereferenceUrl : setOfValues) {
+            verify(dereferenceClient, times(1)).dereference(dereferenceUrl);
+        }
     }
-    Set<String> setOfValues = DEREFERENCE_EXTRACT_RESULT_VALID.values().stream().flatMap(Collection::stream)
-                                                              .collect(Collectors.toSet());
-    for (String dereferenceUrl : setOfValues) {
-      verify(dereferenceClient, times(0)).dereference(dereferenceUrl);
+
+    private void verifyDereferenceInvalidUrlFlow(DereferenceClient dereferenceClient,
+                                                 Dereferencer dereferencer, RDF inputRdf, Set<Report> reports) {
+
+        // Extracting values for dereferencing
+        verifyDerefencer(dereferencer, inputRdf);
+
+        // Checking the report.
+        assertEquals(3, reports.size());
+        for (Report report : reports) {
+            assertEquals(Type.IGNORE, report.getMessageType());
+            assertEquals(Mode.DEREFERENCE, report.getMode());
+        }
+        Set<String> setOfValues = DEREFERENCE_EXTRACT_RESULT_VALID.values().stream().flatMap(Collection::stream)
+                .collect(Collectors.toSet());
+        for (String dereferenceUrl : setOfValues) {
+            verify(dereferenceClient, times(0)).dereference(dereferenceUrl);
+        }
     }
-  }
 
-  private void verifyDereferenceExceptionFlow(DereferenceClient dereferenceClient,
-      Dereferencer dereferencer, RDF inputRdf, Set<Report> reports) {
+    private void verifyDereferenceExceptionFlow(DereferenceClient dereferenceClient,
+                                                Dereferencer dereferencer, RDF inputRdf,
+                                                Set<Report> reports, Type expectedType,
+                                                String expectedMessage) {
 
-    // Extracting values for dereferencing
-    verifyDerefencer(dereferencer, inputRdf);
+        // Extracting values for dereferencing
+        verifyDerefencer(dereferencer, inputRdf);
 
-    // Actually dereferencing.
-    verify(dereferenceClient, times(DEREFERENCE_EXTRACT_RESULT_VALID.size())).dereference(anyString());
+        // Actually dereferencing.
+        verify(dereferenceClient, atLeast(DEREFERENCE_EXTRACT_RESULT_VALID.size())).dereference(anyString());
 
-    // Checking the report.
-    assertEquals(3, reports.size());
-    for (Report report : reports) {
-      assertTrue(report.getMessage().contains("400 Bad Request"));
-      assertEquals(Type.WARN, report.getMessageType());
+        // Checking the report.
+        assertEquals(3, reports.size());
+        for (Report report : reports) {
+            assertTrue(report.getMessage().contains(expectedMessage));
+            assertEquals(expectedType, report.getMessageType());
+        }
     }
-  }
-
-  // Verify merge calls
-  private void verifyMergeHappyFlow(EntityMergeEngine entityMergeEngine) throws MalformedURLException {
-    ArgumentCaptor<List<DereferencedEntities>> argumentCaptor = ArgumentCaptor.forClass(List.class);
-    List<DereferencedEntities> expectedList = prepareExpectedList();
-    verify(entityMergeEngine, times(1))
-        .mergeReferenceEntitiesFromDereferencedEntities(any(), argumentCaptor.capture());
-    assertEquals(expectedList.size(), argumentCaptor.getValue().size());
-    for (int i = 0; i < expectedList.size(); i++) {
-      DereferencedEntities expectedElement = expectedList.get(i);
-      DereferencedEntities capturedElement = argumentCaptor.getValue().get(i);
-      assertEquals(expectedElement.getClassType(), capturedElement.getClassType());
-      assertEquals(expectedElement.getReportMessages().size(), capturedElement.getReportMessages().size());
-      assertTrue(CollectionUtils.isEqualCollection(expectedElement.getReportMessages(), capturedElement.getReportMessages()));
-      assertTrue(CollectionUtils.isEqualCollection(expectedElement.getReferenceTermListMap().keySet(),
-          capturedElement.getReferenceTermListMap().keySet()));
-      assertTrue(CollectionUtils.isEqualCollection(expectedElement.getReferenceTermListMap().values(),
-          capturedElement.getReferenceTermListMap().values()));
+
+    // Verify merge calls
+    private void verifyMergeHappyFlow(EntityMergeEngine entityMergeEngine) throws MalformedURLException {
+        ArgumentCaptor<List<DereferencedEntities>> argumentCaptor = ArgumentCaptor.forClass(List.class);
+        List<DereferencedEntities> expectedList = prepareExpectedList();
+        verify(entityMergeEngine, times(1))
+                .mergeReferenceEntitiesFromDereferencedEntities(any(), argumentCaptor.capture());
+        assertEquals(expectedList.size(), argumentCaptor.getValue().size());
+        for (int i = 0; i < expectedList.size(); i++) {
+            DereferencedEntities expectedElement = expectedList.get(i);
+            DereferencedEntities capturedElement = argumentCaptor.getValue().get(i);
+            assertEquals(expectedElement.getClassType(), capturedElement.getClassType());
+            assertEquals(expectedElement.getReportMessages().size(), capturedElement.getReportMessages().size());
+            assertTrue(CollectionUtils.isEqualCollection(expectedElement.getReportMessages(), capturedElement.getReportMessages()));
+            assertTrue(CollectionUtils.isEqualCollection(expectedElement.getReferenceTermListMap().keySet(),
+                    capturedElement.getReferenceTermListMap().keySet()));
+            assertTrue(CollectionUtils.isEqualCollection(expectedElement.getReferenceTermListMap().values(),
+                    capturedElement.getReferenceTermListMap().values()));
+        }
     }
-  }
 
-  private void verifyDereferenceNullFlow(DereferenceClient dereferenceClient,
-      Dereferencer dereferencer, RDF inputRdf) {
+    private void verifyDereferenceNullFlow(DereferenceClient dereferenceClient,
+                                           Dereferencer dereferencer, RDF inputRdf) {
 
-    // Extracting values for dereferencing
-    verifyDerefencer(dereferencer, inputRdf);
+        // Extracting values for dereferencing
+        verifyDerefencer(dereferencer, inputRdf);
 
-    // Actually dereferencing: don't use the null values.
-    final Set<String> dereferenceUrls = Arrays.stream(new String[0]).filter(Objects::nonNull)
-                                              .collect(Collectors.toSet());
-    verify(dereferenceClient, times(dereferenceUrls.size())).dereference(anyString());
-    for (String dereferenceUrl : dereferenceUrls) {
-      verify(dereferenceClient, times(1)).dereference(dereferenceUrl);
+        // Actually dereferencing: don't use the null values.
+        final Set<String> dereferenceUrls = Arrays.stream(new String[0]).filter(Objects::nonNull)
+                .collect(Collectors.toSet());
+        verify(dereferenceClient, times(dereferenceUrls.size())).dereference(anyString());
+        for (String dereferenceUrl : dereferenceUrls) {
+            verify(dereferenceClient, times(1)).dereference(dereferenceUrl);
+        }
     }
-  }
-
-  private void verifyDerefencer(Dereferencer dereferencer, RDF inputRdf) {
-    // Extracting values for dereferencing
-    verify(dereferencer, times(1)).extractReferencesForDereferencing(any());
-    verify(dereferencer, times(1)).extractReferencesForDereferencing(inputRdf);
-  }
-
-  private void verifyMergeExceptionFlow(EntityMergeEngine entityMergeEngine) throws MalformedURLException {
-    ArgumentCaptor<List<DereferencedEntities>> argumentCaptor = ArgumentCaptor.forClass((Class) List.class);
-    List<DereferencedEntities> expectedList = prepareExpectedListMergeNull();
-    verify(entityMergeEngine, times(1))
-        .mergeReferenceEntitiesFromDereferencedEntities(any(), argumentCaptor.capture());
-    assertEquals(expectedList.size(), argumentCaptor.getValue().size());
-    for (int i = 0; i < expectedList.size(); i++) {
-      DereferencedEntities expectedElement = expectedList.get(i);
-      DereferencedEntities capturedElement = argumentCaptor.getValue().get(i);
-      assertEquals(expectedElement.getClassType(), capturedElement.getClassType());
-      assertEquals(expectedElement.getReportMessages().size(), capturedElement.getReportMessages().size());
 
+    private void verifyDerefencer(Dereferencer dereferencer, RDF inputRdf) {
+        // Extracting values for dereferencing
+        verify(dereferencer, times(1)).extractReferencesForDereferencing(any());
+        verify(dereferencer, times(1)).extractReferencesForDereferencing(inputRdf);
     }
 
-  }
-
-  private void verifyMergeNullFlow(EntityMergeEngine entityMergeEngine) {
-    ArgumentCaptor<List<DereferencedEntities>> argumentCaptor = ArgumentCaptor.forClass((Class) List.class);
-    verify(entityMergeEngine, times(1))
-        .mergeReferenceEntitiesFromDereferencedEntities(any(), argumentCaptor.capture());
-    assertEquals(1, argumentCaptor.getValue().size());
-    assertNull(argumentCaptor.getValue().get(0).getClassType());
-    assertTrue(argumentCaptor.getValue().get(0).getReferenceTermListMap().isEmpty());
-    assertTrue(argumentCaptor.getValue().get(0).getReportMessages().isEmpty());
-  }
-
-  private List<DereferencedEntities> prepareExpectedList() throws MalformedURLException {
-    ReferenceTermImpl expectedReferenceTerm1 = new ReferenceTermImpl(new URL("http://valid-example.host/concept"));
-    Set<Report> expectedReports1 = Set.of(Report.buildDereferenceWarn().withStatus(HttpStatus.OK)
-                                                .withValue("http://valid-example.host/concept")
-                                                .withMessage(
-                                                    "Dereferencing or Coreferencing: the europeana entity does not exist."));
-    DereferencedEntities expectedDereferencedEntities1 = new DereferencedEntities(
-        Map.of(expectedReferenceTerm1, new ArrayList<>()),
-        expectedReports1, Concept.class);
-
-    ReferenceTermImpl expectedReferenceTerm2 = new ReferenceTermImpl(new URL("http://valid-example.host/place"));
-    List<EnrichmentBase> expectedEnrichmentBaseList2 = new ArrayList<>();
-    expectedEnrichmentBaseList2.add(
-        DEREFERENCE_RESULT.get(2).getEnrichmentBaseResultWrapperList().get(0).getEnrichmentBaseList().get(0));
-    expectedEnrichmentBaseList2.add(
-        DEREFERENCE_RESULT.get(2).getEnrichmentBaseResultWrapperList().get(0).getEnrichmentBaseList().get(1));
-    expectedEnrichmentBaseList2.add(null);
-    DereferencedEntities expectedDereferencedEntities2 = new DereferencedEntities(
-        Map.of(expectedReferenceTerm2, expectedEnrichmentBaseList2),
-        Collections.emptySet(), PlaceType.class);
-
-    ReferenceTermImpl expectedReferenceTerm3 = new ReferenceTermImpl(new URL("http://valid-example.host/about"));
-    List<EnrichmentBase> expectedEnrichmentBaseList3 = new ArrayList<>();
-    expectedEnrichmentBaseList3.add(
-        DEREFERENCE_RESULT.get(0).getEnrichmentBaseResultWrapperList().get(0).getEnrichmentBaseList().get(0));
-    expectedEnrichmentBaseList3.add(null);
-    expectedEnrichmentBaseList3.add(
-        DEREFERENCE_RESULT.get(0).getEnrichmentBaseResultWrapperList().get(0).getEnrichmentBaseList().get(2));
-    DereferencedEntities expectedDereferencedEntities3 = new DereferencedEntities(
-        Map.of(expectedReferenceTerm3, expectedEnrichmentBaseList3),
-        Collections.emptySet(), AboutType.class);
-
-    return List.of(expectedDereferencedEntities3, expectedDereferencedEntities1, expectedDereferencedEntities2);
-  }
-
-  private List<DereferencedEntities> prepareExpectedListMergeNull() throws MalformedURLException {
-    Report expectedReportConcept = Report.buildDereferenceWarn()
-                                         .withStatus(HttpStatus.BAD_REQUEST)
-                                         .withValue("http://valid-example.host/concept")
-                                         .withMessage("HttpClientErrorException.BadRequest: 400 Bad Request");
-    Report expectedReportPlace = Report.buildDereferenceWarn()
-                                       .withStatus(HttpStatus.BAD_REQUEST)
-                                       .withValue("http://valid-example.host/place")
-                                       .withMessage("HttpClientErrorException.BadRequest: 400 Bad Request");
-    Report expectedReportAbout = Report.buildDereferenceWarn()
-                                       .withStatus(HttpStatus.BAD_REQUEST)
-                                       .withValue("http://valid-example.host/about")
-                                       .withMessage("HttpClientErrorException.BadRequest: 400 Bad Request");
-
-    ReferenceTermImpl referenceTerm1 = new ReferenceTermImpl(new URL("http://valid-example.host/about"));
-    ReferenceTermImpl referenceTerm2 = new ReferenceTermImpl(new URL("http://valid-example.host/concept"));
-    ReferenceTermImpl referenceTerm3 = new ReferenceTermImpl(new URL("http://valid-example.host/place"));
-
-    DereferencedEntities dereferencedEntities1 = new DereferencedEntities(Map.of(referenceTerm1, Collections.emptyList()),
-        Set.of(expectedReportAbout), AboutType.class);
-    DereferencedEntities dereferencedEntities2 = new DereferencedEntities(Map.of(referenceTerm2, Collections.emptyList()),
-        Set.of(expectedReportConcept), Concept.class);
-    DereferencedEntities dereferencedEntities3 = new DereferencedEntities(Map.of(referenceTerm3, Collections.emptyList()),
-        Set.of(expectedReportPlace), PlaceType.class);
-
-    return List.of(dereferencedEntities1, dereferencedEntities2, dereferencedEntities3);
-  }
+    private void verifyMergeExceptionFlow(EntityMergeEngine entityMergeEngine) throws MalformedURLException {
+        ArgumentCaptor<List<DereferencedEntities>> argumentCaptor = ArgumentCaptor.forClass((Class) List.class);
+        List<DereferencedEntities> expectedList = prepareExpectedListMergeNull();
+        verify(entityMergeEngine, times(1))
+                .mergeReferenceEntitiesFromDereferencedEntities(any(), argumentCaptor.capture());
+        assertEquals(expectedList.size(), argumentCaptor.getValue().size());
+        for (int i = 0; i < expectedList.size(); i++) {
+            DereferencedEntities expectedElement = expectedList.get(i);
+            DereferencedEntities capturedElement = argumentCaptor.getValue().get(i);
+            assertEquals(expectedElement.getClassType(), capturedElement.getClassType());
+            assertEquals(expectedElement.getReportMessages().size(), capturedElement.getReportMessages().size());
+
+        }
+    }
+
+    private void verifyMergeNullFlow(EntityMergeEngine entityMergeEngine) {
+        ArgumentCaptor<List<DereferencedEntities>> argumentCaptor = ArgumentCaptor.forClass((Class) List.class);
+        verify(entityMergeEngine, times(1))
+                .mergeReferenceEntitiesFromDereferencedEntities(any(), argumentCaptor.capture());
+        assertEquals(1, argumentCaptor.getValue().size());
+        assertNull(argumentCaptor.getValue().get(0).getClassType());
+        assertTrue(argumentCaptor.getValue().get(0).getReferenceTermListMap().isEmpty());
+        assertTrue(argumentCaptor.getValue().get(0).getReportMessages().isEmpty());
+    }
+
+    private List<DereferencedEntities> prepareExpectedList() throws MalformedURLException {
+        ReferenceTermImpl expectedReferenceTerm1 = new ReferenceTermImpl(new URL("http://data.europeana.eu.host/concept"));
+        Set<Report> expectedReports1 = Set.of(Report.buildDereferenceError()
+                        .withValue("http://data.europeana.eu.host/concept")
+                        .withMessage("Dereference or Coreferencing failed."),
+                Report.buildDereferenceWarn()
+                        .withStatus(HttpStatus.OK)
+                        .withValue("http://data.europeana.eu.host/concept")
+                        .withMessage("Dereferencing or Coreferencing: the europeana entity does not exist."));
+        DereferencedEntities expectedDereferencedEntities1 = new DereferencedEntities(
+                Map.of(expectedReferenceTerm1, new ArrayList<>()),
+                expectedReports1, Concept.class);
+
+        ReferenceTermImpl expectedReferenceTerm2 = new ReferenceTermImpl(new URL("http://valid-example.host/place"));
+        List<EnrichmentBase> expectedEnrichmentBaseList2 = new ArrayList<>();
+        expectedEnrichmentBaseList2.add(
+                DEREFERENCE_RESULT.get(2).getEnrichmentBaseResultWrapperList().get(0).getEnrichmentBaseList().get(0));
+        expectedEnrichmentBaseList2.add(
+                DEREFERENCE_RESULT.get(2).getEnrichmentBaseResultWrapperList().get(0).getEnrichmentBaseList().get(1));
+        expectedEnrichmentBaseList2.add(null);
+        DereferencedEntities expectedDereferencedEntities2 = new DereferencedEntities(
+                Map.of(expectedReferenceTerm2, expectedEnrichmentBaseList2),
+                Collections.emptySet(), PlaceType.class);
+
+        ReferenceTermImpl expectedReferenceTerm3 = new ReferenceTermImpl(new URL("http://valid-example.host/about"));
+        List<EnrichmentBase> expectedEnrichmentBaseList3 = new ArrayList<>();
+        expectedEnrichmentBaseList3.add(
+                DEREFERENCE_RESULT.get(0).getEnrichmentBaseResultWrapperList().get(0).getEnrichmentBaseList().get(0));
+        expectedEnrichmentBaseList3.add(null);
+        expectedEnrichmentBaseList3.add(
+                DEREFERENCE_RESULT.get(0).getEnrichmentBaseResultWrapperList().get(0).getEnrichmentBaseList().get(2));
+        DereferencedEntities expectedDereferencedEntities3 = new DereferencedEntities(
+                Map.of(expectedReferenceTerm3, expectedEnrichmentBaseList3),
+                Collections.emptySet(), AboutType.class);
+
+        return List.of(expectedDereferencedEntities3, expectedDereferencedEntities1, expectedDereferencedEntities2);
+    }
+
+    private List<DereferencedEntities> prepareExpectedListMergeNull() throws MalformedURLException {
+        Report expectedReportConcept = Report.buildDereferenceWarn()
+                .withStatus(HttpStatus.BAD_REQUEST)
+                .withValue("http://valid-example.host/concept")
+                .withMessage("HttpClientErrorException.BadRequest: 400 Bad Request");
+        Report expectedReportPlace = Report.buildDereferenceWarn()
+                .withStatus(HttpStatus.BAD_REQUEST)
+                .withValue("http://valid-example.host/place")
+                .withMessage("HttpClientErrorException.BadRequest: 400 Bad Request");
+        Report expectedReportAbout = Report.buildDereferenceWarn()
+                .withStatus(HttpStatus.BAD_REQUEST)
+                .withValue("http://valid-example.host/about")
+                .withMessage("HttpClientErrorException.BadRequest: 400 Bad Request");
+
+        ReferenceTermImpl referenceTerm1 = new ReferenceTermImpl(new URL("http://valid-example.host/about"));
+        ReferenceTermImpl referenceTerm2 = new ReferenceTermImpl(new URL("http://valid-example.host/concept"));
+        ReferenceTermImpl referenceTerm3 = new ReferenceTermImpl(new URL("http://valid-example.host/place"));
+
+        DereferencedEntities dereferencedEntities1 = new DereferencedEntities(Map.of(referenceTerm1, Collections.emptyList()),
+                Set.of(expectedReportAbout), AboutType.class);
+        DereferencedEntities dereferencedEntities2 = new DereferencedEntities(Map.of(referenceTerm2, Collections.emptyList()),
+                Set.of(expectedReportConcept), Concept.class);
+        DereferencedEntities dereferencedEntities3 = new DereferencedEntities(Map.of(referenceTerm3, Collections.emptyList()),
+                Set.of(expectedReportPlace), PlaceType.class);
+
+        return List.of(dereferencedEntities1, dereferencedEntities2, dereferencedEntities3);
+    }
 }
diff --git a/metis-enrichment/metis-enrichment-client/src/test/resources/dereference/dereference-no-entity.xml b/metis-enrichment/metis-enrichment-client/src/test/resources/dereference/dereference-failure.xml
similarity index 91%
rename from metis-enrichment/metis-enrichment-client/src/test/resources/dereference/dereference-no-entity.xml
rename to metis-enrichment/metis-enrichment-client/src/test/resources/dereference/dereference-failure.xml
index 927a79c294..116a2715da 100644
--- a/metis-enrichment/metis-enrichment-client/src/test/resources/dereference/dereference-no-entity.xml
+++ b/metis-enrichment/metis-enrichment-client/src/test/resources/dereference/dereference-failure.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <metis:results xmlns:dcterms="http://purl.org/dc/terms/" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:edm="http://www.europeana.eu/schemas/edm/" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema" xmlns:cc="http://creativecommons.org/ns" xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:rdaGr2="http://rdvocab.info/ElementsGr2/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:wgs84_pos="http://www.w3.org/2003/01/geo/wgs84_pos#" xmlns:skos="http://www.w3.org/2004/02/skos/core#" xmlns:metis="http://www.europeana.eu/schemas/metis" xmlns:ns13="http://www.w3.org/2006/vcard/ns#">
   <metis:result>
-    <metis:dereferenceStatus>UNKNOWN_ENTITY</metis:dereferenceStatus>
+    <metis:dereferenceStatus>FAILURE</metis:dereferenceStatus>
   </metis:result>
 </metis:results>
diff --git a/metis-enrichment/metis-enrichment-client/src/test/resources/dereference/dereference-no-vocabulary.xml b/metis-enrichment/metis-enrichment-client/src/test/resources/dereference/dereference-no-vocabulary.xml
new file mode 100644
index 0000000000..3ebf33d493
--- /dev/null
+++ b/metis-enrichment/metis-enrichment-client/src/test/resources/dereference/dereference-no-vocabulary.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<metis:results xmlns:dcterms="http://purl.org/dc/terms/" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:edm="http://www.europeana.eu/schemas/edm/" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema" xmlns:cc="http://creativecommons.org/ns" xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:rdaGr2="http://rdvocab.info/ElementsGr2/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:wgs84_pos="http://www.w3.org/2003/01/geo/wgs84_pos#" xmlns:skos="http://www.w3.org/2004/02/skos/core#" xmlns:metis="http://www.europeana.eu/schemas/metis" xmlns:ns13="http://www.w3.org/2006/vcard/ns#">
+    <metis:result>
+        <metis:dereferenceStatus>NO_VOCABULARY_MATCHING</metis:dereferenceStatus>
+    </metis:result>
+</metis:results>
diff --git a/metis-enrichment/metis-enrichment-client/src/test/resources/dereference/dereference-normal-ii.xml b/metis-enrichment/metis-enrichment-client/src/test/resources/dereference/dereference-normal-ii.xml
new file mode 100644
index 0000000000..6917a69138
--- /dev/null
+++ b/metis-enrichment/metis-enrichment-client/src/test/resources/dereference/dereference-normal-ii.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<metis:results xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:skos="http://www.w3.org/2004/02/skos/core#"
+               xmlns:metis="http://www.europeana.eu/schemas/metis">
+    <metis:result>
+        <skos:Concept rdf:about="http://data.europeana.eu/concept/3401">
+            <skos:exactMatch rdf:resource="http://www.wikidata.org/entity/Q9465"/>
+            <skos:exactMatch rdf:resource="https://d-nb.info/gnd/4015602-3"/>
+            <skos:exactMatch rdf:resource="http://id.loc.gov/authorities/names/sh85045096"/>
+            <skos:exactMatch rdf:resource="http://data.bnf.fr/ark:/12148/cb119756872"/>
+            <skos:exactMatch rdf:resource="http://id.ndl.go.jp/auth/ndlna/00569521"/>
+            <skos:exactMatch rdf:resource="http://id.nlm.nih.gov/mesh/D004989"/>
+            <skos:exactMatch rdf:resource="http://purl.org/bncf/tid/761"/>
+            <skos:exactMatch rdf:resource="https://www.freebase.com/m/02jhc"/>
+            <skos:exactMatch rdf:resource="https://g.co/kg/m/02jhc"/>
+            <skos:exactMatch rdf:resource="http://id.nlm.nih.gov/mesh/K01.752.566.479"/>
+            <skos:exactMatch rdf:resource="http://id.nlm.nih.gov/mesh/N05.350"/>
+            <skos:exactMatch rdf:resource="http://datos.bne.es/resource/XX4583626"/>
+            <skos:exactMatch rdf:resource="http://vocab.getty.edu/aat/300054290"/>
+            <skos:exactMatch rdf:resource="http://vocab.getty.edu/aat/300055939"/>
+            <skos:exactMatch rdf:resource="http://iconclass.org/11L52"/>
+            <skos:exactMatch rdf:resource="http://www.yso.fi/onto/yso/p3166"/>
+            <skos:exactMatch rdf:resource="http://babelnet.org/rdf/s00031712n"/>
+            <skos:exactMatch rdf:resource="http://vocabularies.unesco.org/thesaurus/concept283"/>
+            <skos:exactMatch rdf:resource="http://cv.iptc.org/newscodes/mediatopic/20000814"/>
+            <skos:exactMatch rdf:resource="http://uri.gbv.de/terminology/bk/08.38"/>
+            <skos:note xml:lang="de">
+                Disziplin der praktischen Philosophie, die sich mit der Entscheidungsfindung befasst
+            </skos:note>
+            <skos:note xml:lang="fi">
+                Moraaliin, hyvyyteen ja hyvään elämään keskittyvä filosofian osa-alue
+            </skos:note>
+            <skos:note xml:lang="ru">Высокая нравственность</skos:note>
+            <skos:note xml:lang="sv">Läran om moraliskt gott och ont</skos:note>
+            <skos:note xml:lang="pt">Campo de estudo da moral</skos:note>
+            <skos:note xml:lang="bg">
+                От Древност до днешни разделения като Мета-етика; Нормативна етика и Приложна етища
+            </skos:note>
+            <skos:note xml:lang="en">
+                Branch of philosophy that systematizes, defends, and recommends concepts of right and wrong conduct
+            </skos:note>
+            <skos:note xml:lang="it">Ramo della filosofia</skos:note>
+            <skos:note xml:lang="fr">
+                Discipline philosophique pratique (action) et normative (règles) dans un milieu naturel et humain
+            </skos:note>
+            <skos:note xml:lang="es">Rama de la filosofía</skos:note>
+            <skos:note xml:lang="pl">Filozofia moralności</skos:note>
+            <skos:note xml:lang="da">
+                Filosoffisk disciplin - systematisering, forsvare og anbefaling af begreber om ret og forkert adfærd
+            </skos:note>
+            <skos:note xml:lang="ca">Branca de la filosofia</skos:note>
+            <skos:note xml:lang="nl">
+                Tak van de filosofie die zich bezighoudt met bezinning over het juiste handelen
+            </skos:note>
+            <skos:prefLabel xml:lang="de">Ethik</skos:prefLabel>
+            <skos:prefLabel xml:lang="fi">Etiikka</skos:prefLabel>
+            <skos:prefLabel xml:lang="ru">Этика</skos:prefLabel>
+            <skos:prefLabel xml:lang="pt">Ética</skos:prefLabel>
+            <skos:prefLabel xml:lang="bg">Етика</skos:prefLabel>
+            <skos:prefLabel xml:lang="lt">Etika</skos:prefLabel>
+            <skos:prefLabel xml:lang="hr">Etika</skos:prefLabel>
+            <skos:prefLabel xml:lang="lv">Ētika</skos:prefLabel>
+            <skos:prefLabel xml:lang="fr">Éthique</skos:prefLabel>
+            <skos:prefLabel xml:lang="hu">Etika</skos:prefLabel>
+            <skos:prefLabel xml:lang="sk">Etika</skos:prefLabel>
+            <skos:prefLabel xml:lang="sl">Etika</skos:prefLabel>
+            <skos:prefLabel xml:lang="ga">Eitic</skos:prefLabel>
+            <skos:prefLabel xml:lang="ca">Ètica</skos:prefLabel>
+            <skos:prefLabel xml:lang="sv">Etik</skos:prefLabel>
+            <skos:prefLabel xml:lang="el">Ηθική</skos:prefLabel>
+            <skos:prefLabel xml:lang="en">Ethics</skos:prefLabel>
+            <skos:prefLabel xml:lang="it">Etica</skos:prefLabel>
+            <skos:prefLabel xml:lang="es">Ética</skos:prefLabel>
+            <skos:prefLabel xml:lang="et">Eetika</skos:prefLabel>
+            <skos:prefLabel xml:lang="cs">Etika</skos:prefLabel>
+            <skos:prefLabel xml:lang="eu">Etika</skos:prefLabel>
+            <skos:prefLabel xml:lang="pl">Etyka</skos:prefLabel>
+            <skos:prefLabel xml:lang="da">Etik</skos:prefLabel>
+            <skos:prefLabel xml:lang="ro">Etică</skos:prefLabel>
+            <skos:prefLabel xml:lang="nl">Ethiek</skos:prefLabel>
+        </skos:Concept>
+        <metis:dereferenceStatus>SUCCESS</metis:dereferenceStatus>
+    </metis:result>
+</metis:results>
diff --git a/metis-enrichment/metis-enrichment-client/src/test/resources/dereference/dereference-null.xml b/metis-enrichment/metis-enrichment-client/src/test/resources/dereference/dereference-null.xml
new file mode 100644
index 0000000000..0c2865eae7
--- /dev/null
+++ b/metis-enrichment/metis-enrichment-client/src/test/resources/dereference/dereference-null.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<metis:results xmlns:dcterms="http://purl.org/dc/terms/" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:edm="http://www.europeana.eu/schemas/edm/" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema" xmlns:cc="http://creativecommons.org/ns" xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:rdaGr2="http://rdvocab.info/ElementsGr2/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:wgs84_pos="http://www.w3.org/2003/01/geo/wgs84_pos#" xmlns:skos="http://www.w3.org/2004/02/skos/core#" xmlns:metis="http://www.europeana.eu/schemas/metis" xmlns:ns13="http://www.w3.org/2006/vcard/ns#">
+    <metis:result/>
+</metis:results>
diff --git a/metis-enrichment/metis-enrichment-client/src/test/resources/dereference/dereference-unknown-europeana-entity.xml b/metis-enrichment/metis-enrichment-client/src/test/resources/dereference/dereference-unknown-europeana-entity.xml
new file mode 100644
index 0000000000..627e458423
--- /dev/null
+++ b/metis-enrichment/metis-enrichment-client/src/test/resources/dereference/dereference-unknown-europeana-entity.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<metis:results xmlns:dcterms="http://purl.org/dc/terms/" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:edm="http://www.europeana.eu/schemas/edm/" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema" xmlns:cc="http://creativecommons.org/ns" xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:rdaGr2="http://rdvocab.info/ElementsGr2/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:wgs84_pos="http://www.w3.org/2003/01/geo/wgs84_pos#" xmlns:skos="http://www.w3.org/2004/02/skos/core#" xmlns:metis="http://www.europeana.eu/schemas/metis" xmlns:ns13="http://www.w3.org/2006/vcard/ns#">
+  <metis:result>
+    <metis:dereferenceStatus>UNKNOWN_EUROPEANA_ENTITY</metis:dereferenceStatus>
+  </metis:result>
+</metis:results>
diff --git a/metis-enrichment/metis-enrichment-client/src/test/resources/enrichment/sample_dereference_not_found.rdf b/metis-enrichment/metis-enrichment-client/src/test/resources/enrichment/sample_dereference_not_found.rdf
index 5581ec0fbe..cab6b8f1e2 100644
--- a/metis-enrichment/metis-enrichment-client/src/test/resources/enrichment/sample_dereference_not_found.rdf
+++ b/metis-enrichment/metis-enrichment-client/src/test/resources/enrichment/sample_dereference_not_found.rdf
@@ -38,8 +38,12 @@
     <dc:subject xml:lang="en">Religion</dc:subject>
     <dc:subject xml:lang="en">Paranguaricutirimicuaro</dc:subject>
     <dc:title>Klaipėdos bažnyčios pamatų įšventinimas</dc:title>
-    <dc:type rdf:resource="http://vocab.getty.edu/aat/300136900"/>
-    <dc:type rdf:resource="htp://vocab.getty.edu/aat/300136900"/>
+    <dc:subject rdf:resource="http://vocab.getty.edu/aat/300136900"/>
+    <dc:subject rdf:resource="htp://vocab.getty.edu/aat/300136900"/>
+    <dc:subject rdf:resource="http://data.europeana.eu/concept/3401"/>
+    <dc:subject rdf:resource="http://data.europeana.eu/concept/XXXXXXXXX"/>
+    <dc:subject rdf:resource="http://vocab.getty.edu/aat/300008372"/>
+    <dc:subject rdf:resource="http://vocab.getty.edu/aat/300000810"/>
     <dcterms:alternative xml:lang="en">Consecration of the Church Foundation in Klaipėda</dcterms:alternative>
     <dcterms:created xml:lang="en">1957</dcterms:created>
     <dcterms:spatial rdf:resource="https://sws.geonames.org/597427/"/>
diff --git a/metis-enrichment/metis-enrichment-client/src/test/resources/enrichment/sample_enrichment_failure.rdf b/metis-enrichment/metis-enrichment-client/src/test/resources/enrichment/sample_enrichment_failure.rdf
new file mode 100644
index 0000000000..50c6478946
--- /dev/null
+++ b/metis-enrichment/metis-enrichment-client/src/test/resources/enrichment/sample_enrichment_failure.rdf
@@ -0,0 +1,66 @@
+<rdf:RDF
+  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:adms="http://www.w3.org/ns/adms#"
+  xmlns:cc="http://creativecommons.org/ns#" xmlns:crm="http://www.cidoc-crm.org/rdfs/cidoc_crm_v5.0.2_english_label.rdfs#"
+  xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcat="http://www.w3.org/ns/dcat#" xmlns:dcterms="http://purl.org/dc/terms/"
+  xmlns:doap="http://usefulinc.com/ns/doap#" xmlns:ebucore="http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#"
+  xmlns:edm="http://www.europeana.eu/schemas/edm/" xmlns:foaf="http://xmlns.com/foaf/0.1/"
+  xmlns:odrl="http://www.w3.org/ns/odrl/2/" xmlns:ore="http://www.openarchives.org/ore/terms/"
+  xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:rdaGr2="http://rdvocab.info/ElementsGr2/"
+  xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:skos="http://www.w3.org/2004/02/skos/core#"
+  xmlns:svcs="http://rdfs.org/sioc/services#" xmlns:wgs84_pos="http://www.w3.org/2003/01/geo/wgs84_pos#"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <edm:ProvidedCHO rdf:about="/08635/8b528e8504s24895b42c56a7fhaf5502"/>
+  <ore:Aggregation rdf:about="/aggregation/provider/08635/8b528e8504s24895b42c56a7fhaf5502">
+    <edm:aggregatedCHO rdf:resource="/08635/8b528e8504s24895b42c56a7fhaf5502"/>
+    <edm:dataProvider>Lietuvos Centrinis Valstybés Archyvas</edm:dataProvider>
+    <edm:isShownAt rdf:resource="http://www.e-kinas.lt/objektas/kinas/1382/consecration-of-the-church-foundation-in-klaipeda"/>
+    <edm:object rdf:resource="http://www.e-kinas.lt/search-results-order/ioresource/534?type=image"/>
+    <edm:provider xml:lang="en">EFG - The European Film Gateway</edm:provider>
+    <dc:rights>Lietuvos Centrinis Valstybes Archyvas</dc:rights>
+    <edm:rights rdf:resource="http://rightsstatements.org/vocab/InC/1.0/"/>
+  </ore:Aggregation>
+  <ore:Proxy rdf:about="/proxy/provider/08635/8b528e8504s24895b42c56a7fhaf5502">
+    <dc:contributor>Piotras Kalabuchovas</dc:contributor>
+    <dc:description>1957-06-30. Būsimos bažnyčios statybos aikštė, išpuošta berželiais, pilna tikinčiųjų. Lauko altorių puošia
+      didelis kryžius ir Dievo motinos Marijos skulptūra. Mišioms vadovauja Telšių vyskupas Petras Maželis. Eina procesija. Vyskupas
+      laimina tikinčiuosius. Jis laimina pasipuošusius vaikus, kurie priima pirmąją Komuniją. Vyskupas pašventina plytą, kuri įmūrijama į
+      būsimos bažnyčios pamatą. Aikštės vaizdas iš viršaus. Mišios baigėsi. Tikintieji skirstosi pagrindine Klaipėdos miesto
+      gatve. 2 dalis. Klebonas Liudvikas Povilionis skaito pamokslą iš sakyklos. Mišios. Gieda choristai .
+    </dc:description>
+    <dc:description
+      xml:lang="en">The Klaipėda church construction square decorated with birch trees. Outdoor altar decorated with a large cross
+      and a statue of Mary, Mother of God. Mass led by Bishop Petras Maželis. The bishop blesses the faithful. He blesses children
+      who receive First Communion. Bishop consecrates the first brick of the church foundation. Mass is over. Believers go the
+      main street of the city of Klaipėda. Part 2. The pastor Liudvikas Povilionis reads a sermon from the pulpit. Sings the
+      choir.
+    </dc:description>
+    <dc:identifier>8b528e8504s24895b42c56a7fhaf5502</dc:identifier>
+    <dc:subject xml:lang="es" rdf:resource="http://www.mimo-db.eu/InstrumentsKeywords/3052">Güiro</dc:subject>
+    <dc:subject xml:lang="nl" rdf:resource="http://www.mimo-db.eu/InstrumentsKeywords/0">Muziek</dc:subject>
+    <dc:subject xml:lang="en">Paranguaricutirimicuaro</dc:subject>
+    <dc:title>Klaipėdos bažnyčios pamatų įšventinimas</dc:title>
+    <dc:type rdf:resource="http://vocab.getty.edu/aat/400136800"/>
+    <dcterms:alternative xml:lang="en">Consecration of the Church Foundation in Klaipėda</dcterms:alternative>
+    <dcterms:created xml:lang="en">1957</dcterms:created>
+    <dcterms:provenance>Lietuvos Centrinis Valstybés Archyvas</dcterms:provenance>
+    <edm:europeanaProxy>false</edm:europeanaProxy>
+    <ore:proxyFor rdf:resource="/08635/8b528e8504s24895b42c56a7fhaf5502"/>
+    <ore:proxyIn rdf:resource="/aggregation/provider/08635/8b528e8504s24895b42c56a7fhaf5502"/>
+    <edm:type>VIDEO</edm:type>
+  </ore:Proxy>
+  <ore:Proxy rdf:about="/proxy/europeana/08635/8b528e8504s24895b42c56a7fhaf5502">
+    <dc:identifier>8b528e8504s24895b42c56a7fhaf5502</dc:identifier>
+    <edm:europeanaProxy>true</edm:europeanaProxy>
+    <ore:proxyFor rdf:resource="/08635/8b528e8504s24895b42c56a7fhaf5502"/>
+    <ore:proxyIn rdf:resource="/aggregation/europeana/08635/8b528e8504s24895b42c56a7fhaf5502"/>
+    <ore:lineage rdf:resource="/proxy/provider/08635/8b528e8504s24895b42c56a7fhaf5502"/>
+  </ore:Proxy>
+  <edm:EuropeanaAggregation rdf:about="/aggregation/europeana/08635/8b528e8504s24895b42c56a7fhaf5502">
+    <edm:aggregatedCHO rdf:resource="/08635/8b528e8504s24895b42c56a7fhaf5502"/>
+    <edm:dataProvider xml:lang="en">Europeana Foundation</edm:dataProvider>
+    <edm:provider xml:lang="en">Europeana Foundation</edm:provider>
+    <edm:datasetName>08635_EFG_LCVA</edm:datasetName>
+    <edm:country>Lithuania</edm:country>
+    <edm:language>mul</edm:language>
+  </edm:EuropeanaAggregation>
+</rdf:RDF>
diff --git a/metis-enrichment/metis-enrichment-client/src/test/resources/entity-api/entity-api-response-concept-iv.json b/metis-enrichment/metis-enrichment-client/src/test/resources/entity-api/entity-api-response-concept-iv.json
new file mode 100644
index 0000000000..67f9f12434
--- /dev/null
+++ b/metis-enrichment/metis-enrichment-client/src/test/resources/entity-api/entity-api-response-concept-iv.json
@@ -0,0 +1,53 @@
+{
+  "@context": "http://www.europeana.eu/schemas/context/entity.jsonld",
+  "id": "https://api.europeana.eu/entity/search?wskey=api2demo&text=ethics&lang=nl&type=concept&query=ethics&page=0&pageSize=10",
+  "type": "ResultPage",
+  "total": 1,
+  "partOf": {
+    "id": "https://api.europeana.eu/entity/search?wskey=api2demo&text=ethics&lang=nl&type=concept&query=ethics",
+    "type": "ResultList",
+    "total": 1
+  },
+  "items": [
+    {
+      "id": "http://data.europeana.eu/concept/3401",
+      "type": "Concept",
+      "isShownBy": {
+        "id": "https://glam.uni.wroc.pl/iiif/image-api/RKP_IV_F_48_3103_0001/full/full/0/default.jpg",
+        "type": "WebResource",
+        "source": "http://data.europeana.eu/item/0940429/_nn8W1sR",
+        "thumbnail": "https://api.europeana.eu/thumbnail/v2/url.json?uri=https%3A%2F%2Fglam.uni.wroc.pl%2Fiiif%2Fimage-api%2FRKP_IV_F_48_3103_0001%2Ffull%2Ffull%2F0%2Fdefault.jpg&type=TEXT"
+      },
+      "prefLabel": {
+        "nl": "Ethiek"
+      },
+      "note": {
+        "nl": [
+          "Tak van de filosofie die zich bezighoudt met bezinning over het juiste handelen"
+        ]
+      },
+      "exactMatch": [
+        "http://www.wikidata.org/entity/Q9465",
+        "https://d-nb.info/gnd/4015602-3",
+        "http://id.loc.gov/authorities/names/sh85045096",
+        "http://data.bnf.fr/ark:/12148/cb119756872",
+        "http://id.ndl.go.jp/auth/ndlna/00569521",
+        "http://id.nlm.nih.gov/mesh/D004989",
+        "http://purl.org/bncf/tid/761",
+        "https://www.freebase.com/m/02jhc",
+        "https://g.co/kg/m/02jhc",
+        "http://id.nlm.nih.gov/mesh/K01.752.566.479",
+        "http://id.nlm.nih.gov/mesh/N05.350",
+        "http://datos.bne.es/resource/XX4583626",
+        "http://vocab.getty.edu/aat/300054290",
+        "http://vocab.getty.edu/aat/300055939",
+        "http://iconclass.org/11L52",
+        "http://www.yso.fi/onto/yso/p3166",
+        "http://babelnet.org/rdf/s00031712n",
+        "http://vocabularies.unesco.org/thesaurus/concept283",
+        "http://cv.iptc.org/newscodes/mediatopic/20000814",
+        "http://uri.gbv.de/terminology/bk/08.38"
+      ]
+    }
+  ]
+}
diff --git a/metis-enrichment/metis-enrichment-client/src/test/resources/entity-api/entity-api-response-concept-notfound.json b/metis-enrichment/metis-enrichment-client/src/test/resources/entity-api/entity-api-response-concept-notfound.json
new file mode 100644
index 0000000000..2294b36e97
--- /dev/null
+++ b/metis-enrichment/metis-enrichment-client/src/test/resources/entity-api/entity-api-response-concept-notfound.json
@@ -0,0 +1,11 @@
+{
+  "@context": "http://www.europeana.eu/schemas/context/entity.jsonld",
+  "id": "https://api.europeana.eu/entity/search?wskey=api2demo&text=XXXXXXXXX&lang=nl&type=concept&query=XXXXXXXXX&page=0&pageSize=10",
+  "type": "ResultPage",
+  "total": 0,
+  "partOf": {
+    "id": "https://api.europeana.eu/entity/search?wskey=api2demo&text=XXXXXXXXX&lang=nl&type=concept&query=XXXXXXXXX",
+    "type": "ResultList",
+    "total": 0
+  }
+}
diff --git a/metis-enrichment/metis-enrichment-client/src/test/resources/entity-api/entity-api-response-mgmt-concept-base-ii.json b/metis-enrichment/metis-enrichment-client/src/test/resources/entity-api/entity-api-response-mgmt-concept-base-ii.json
new file mode 100644
index 0000000000..82d48bc5e9
--- /dev/null
+++ b/metis-enrichment/metis-enrichment-client/src/test/resources/entity-api/entity-api-response-mgmt-concept-base-ii.json
@@ -0,0 +1,105 @@
+{
+  "@context": "http://www.europeana.eu/schemas/context/entity.jsonld",
+  "id": "http://data.europeana.eu/concept/3401",
+  "type": "Concept",
+  "isShownBy": {
+    "id": "https://glam.uni.wroc.pl/iiif/image-api/RKP_IV_F_48_3103_0001/full/full/0/default.jpg",
+    "type": "WebResource",
+    "source": "http://data.europeana.eu/item/0940429/_nn8W1sR",
+    "thumbnail": "https://api.europeana.eu/thumbnail/v2/url.json?uri=https%3A%2F%2Fglam.uni.wroc.pl%2Fiiif%2Fimage-api%2FRKP_IV_F_48_3103_0001%2Ffull%2Ffull%2F0%2Fdefault.jpg&type=TEXT"
+  },
+  "prefLabel": {
+    "bg": "Етика",
+    "ca": "Ètica",
+    "cs": "Etika",
+    "da": "Etik",
+    "de": "Ethik",
+    "el": "Ηθική",
+    "en": "Ethics",
+    "es": "Ética",
+    "et": "Eetika",
+    "eu": "Etika",
+    "fi": "Etiikka",
+    "fr": "Éthique",
+    "ga": "Eitic",
+    "hr": "Etika",
+    "hu": "Etika",
+    "it": "Etica",
+    "lt": "Etika",
+    "lv": "Ētika",
+    "nl": "Ethiek",
+    "pl": "Etyka",
+    "pt": "Ética",
+    "ro": "Etică",
+    "ru": "Этика",
+    "sk": "Etika",
+    "sl": "Etika",
+    "sv": "Etik"
+  },
+  "note": {
+    "bg": [
+      "От Древност до днешни разделения като Мета-етика; Нормативна етика и Приложна етища"
+    ],
+    "ca": [
+      "Branca de la filosofia"
+    ],
+    "da": [
+      "Filosoffisk disciplin - systematisering, forsvare og anbefaling af begreber om ret og forkert adfærd"
+    ],
+    "de": [
+      "Disziplin der praktischen Philosophie, die sich mit der Entscheidungsfindung befasst"
+    ],
+    "en": [
+      "Branch of philosophy that systematizes, defends, and recommends concepts of right and wrong conduct"
+    ],
+    "es": [
+      "Rama de la filosofía"
+    ],
+    "fi": [
+      "Moraaliin, hyvyyteen ja hyvään elämään keskittyvä filosofian osa-alue"
+    ],
+    "fr": [
+      "Discipline philosophique pratique (action) et normative (règles) dans un milieu naturel et humain"
+    ],
+    "it": [
+      "Ramo della filosofia"
+    ],
+    "nl": [
+      "Tak van de filosofie die zich bezighoudt met bezinning over het juiste handelen"
+    ],
+    "pl": [
+      "Filozofia moralności"
+    ],
+    "pt": [
+      "Campo de estudo da moral"
+    ],
+    "ru": [
+      "Высокая нравственность"
+    ],
+    "sv": [
+      "Läran om moraliskt gott och ont"
+    ]
+  },
+  "exactMatch": [
+    "http://www.wikidata.org/entity/Q9465",
+    "https://d-nb.info/gnd/4015602-3",
+    "http://id.loc.gov/authorities/names/sh85045096",
+    "http://data.bnf.fr/ark:/12148/cb119756872",
+    "http://id.ndl.go.jp/auth/ndlna/00569521",
+    "http://id.nlm.nih.gov/mesh/D004989",
+    "http://purl.org/bncf/tid/761",
+    "https://www.freebase.com/m/02jhc",
+    "https://g.co/kg/m/02jhc",
+    "http://id.nlm.nih.gov/mesh/K01.752.566.479",
+    "http://id.nlm.nih.gov/mesh/N05.350",
+    "http://datos.bne.es/resource/XX4583626",
+    "http://vocab.getty.edu/aat/300054290",
+    "http://vocab.getty.edu/aat/300055939",
+    "http://iconclass.org/11L52",
+    "http://www.yso.fi/onto/yso/p3166",
+    "http://babelnet.org/rdf/s00031712n",
+    "http://vocabularies.unesco.org/thesaurus/concept283",
+    "http://cv.iptc.org/newscodes/mediatopic/20000814",
+    "http://uri.gbv.de/terminology/bk/08.38"
+  ]
+}
diff --git a/metis-enrichment/metis-enrichment-client/src/test/resources/entity-api/entity-api-response-concept-base.json b/metis-enrichment/metis-enrichment-client/src/test/resources/entity-api/entity-api-response-mgmt-concept-base.json
similarity index 100%
rename from metis-enrichment/metis-enrichment-client/src/test/resources/entity-api/entity-api-response-concept-base.json
rename to metis-enrichment/metis-enrichment-client/src/test/resources/entity-api/entity-api-response-mgmt-concept-base.json
diff --git a/metis-enrichment/metis-enrichment-client/src/test/resources/entity-api/entity-api-response-concept-ii-base.json b/metis-enrichment/metis-enrichment-client/src/test/resources/entity-api/entity-api-response-mgmt-concept-ii-base.json
similarity index 100%
rename from metis-enrichment/metis-enrichment-client/src/test/resources/entity-api/entity-api-response-concept-ii-base.json
rename to metis-enrichment/metis-enrichment-client/src/test/resources/entity-api/entity-api-response-mgmt-concept-ii-base.json
diff --git a/metis-enrichment/metis-enrichment-client/src/test/resources/entity-api/entity-api-response-organization-base.json b/metis-enrichment/metis-enrichment-client/src/test/resources/entity-api/entity-api-response-mgmt-organization-base.json
similarity index 100%
rename from metis-enrichment/metis-enrichment-client/src/test/resources/entity-api/entity-api-response-organization-base.json
rename to metis-enrichment/metis-enrichment-client/src/test/resources/entity-api/entity-api-response-mgmt-organization-base.json
diff --git a/metis-enrichment/metis-enrichment-common/pom.xml b/metis-enrichment/metis-enrichment-common/pom.xml
index c79139c7aa..13f9d49710 100644
--- a/metis-enrichment/metis-enrichment-common/pom.xml
+++ b/metis-enrichment/metis-enrichment-common/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-enrichment</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-enrichment-common</artifactId>
 
diff --git a/metis-enrichment/metis-enrichment-common/src/main/java/eu/europeana/enrichment/api/external/DereferenceResultStatus.java b/metis-enrichment/metis-enrichment-common/src/main/java/eu/europeana/enrichment/api/external/DereferenceResultStatus.java
index 462ec9cdaa..96066db0f3 100644
--- a/metis-enrichment/metis-enrichment-common/src/main/java/eu/europeana/enrichment/api/external/DereferenceResultStatus.java
+++ b/metis-enrichment/metis-enrichment-common/src/main/java/eu/europeana/enrichment/api/external/DereferenceResultStatus.java
@@ -10,5 +10,6 @@ public enum DereferenceResultStatus {
   NO_ENTITY_FOR_VOCABULARY,
   ENTITY_FOUND_XML_XSLT_ERROR,
   ENTITY_FOUND_XML_XSLT_PRODUCE_NO_CONTEXTUAL_CLASS,
-  UNKNOWN_ENTITY
+  UNKNOWN_EUROPEANA_ENTITY,
+  FAILURE
 }
diff --git a/metis-enrichment/pom.xml b/metis-enrichment/pom.xml
index fdb31513c5..b1f4624119 100644
--- a/metis-enrichment/pom.xml
+++ b/metis-enrichment/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-framework</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-enrichment</artifactId>
   <packaging>pom</packaging>
diff --git a/metis-harvesting/pom.xml b/metis-harvesting/pom.xml
index 9ba969263b..2473d053a4 100644
--- a/metis-harvesting/pom.xml
+++ b/metis-harvesting/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>metis-framework</artifactId>
         <groupId>eu.europeana.metis</groupId>
-        <version>10</version>
+        <version>11</version>
     </parent>
     <artifactId>metis-harvesting</artifactId>
 
diff --git a/metis-indexing/pom.xml b/metis-indexing/pom.xml
index a535bd5ef1..bd690ae30a 100644
--- a/metis-indexing/pom.xml
+++ b/metis-indexing/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-framework</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-indexing</artifactId>
   <properties>
diff --git a/metis-indexing/src/main/java/eu/europeana/indexing/IndexedRecordAccess.java b/metis-indexing/src/main/java/eu/europeana/indexing/IndexedRecordAccess.java
index 537f2cde9d..870461f0f8 100644
--- a/metis-indexing/src/main/java/eu/europeana/indexing/IndexedRecordAccess.java
+++ b/metis-indexing/src/main/java/eu/europeana/indexing/IndexedRecordAccess.java
@@ -4,7 +4,7 @@
 import dev.morphia.DeleteOptions;
 import dev.morphia.query.FindOptions;
 import dev.morphia.query.Query;
-import dev.morphia.query.experimental.filters.Filters;
+import dev.morphia.query.filters.Filters;
 import eu.europeana.metis.mongo.dao.RecordDao;
 import eu.europeana.corelib.solr.bean.impl.FullBeanImpl;
 import eu.europeana.indexing.exception.IndexerRelatedIndexingException;
diff --git a/metis-indexing/src/main/java/eu/europeana/indexing/IndexerImpl.java b/metis-indexing/src/main/java/eu/europeana/indexing/IndexerImpl.java
index 80566f5f46..0479d84c17 100644
--- a/metis-indexing/src/main/java/eu/europeana/indexing/IndexerImpl.java
+++ b/metis-indexing/src/main/java/eu/europeana/indexing/IndexerImpl.java
@@ -145,11 +145,11 @@ private TierResults preprocessRecord(RDF rdf, IndexingProperties properties)
 
     // Perform the tier classification
     final RdfWrapper rdfWrapper = new RdfWrapper(rdf);
-    TierResults tierCalculationsResult = new TierResults(null, null);
+    TierResults tierCalculationsResult = new TierResults();
     if (properties.isPerformTierCalculation() && properties.getTypesEnabledForTierCalculation()
                                                            .contains(rdfWrapper.getEdmType())) {
-      tierCalculationsResult = new TierResults(mediaClassifier.classify(rdfWrapper).getTier(),
-              metadataClassifier.classify(rdfWrapper).getTier());
+      tierCalculationsResult = new TierResults(mediaClassifier.classify(rdfWrapper),
+              metadataClassifier.classify(rdfWrapper));
       RdfTierUtils.setTier(rdf, tierCalculationsResult.getMediaTier());
       RdfTierUtils.setTier(rdf, tierCalculationsResult.getMetadataTier());
     }
diff --git a/metis-indexing/src/main/java/eu/europeana/indexing/mongo/WebResourceMetaInfoUpdater.java b/metis-indexing/src/main/java/eu/europeana/indexing/mongo/WebResourceMetaInfoUpdater.java
index 5863ad42fb..5c96f279d0 100644
--- a/metis-indexing/src/main/java/eu/europeana/indexing/mongo/WebResourceMetaInfoUpdater.java
+++ b/metis-indexing/src/main/java/eu/europeana/indexing/mongo/WebResourceMetaInfoUpdater.java
@@ -1,7 +1,7 @@
 package eu.europeana.indexing.mongo;
 
 import dev.morphia.query.Query;
-import dev.morphia.query.experimental.filters.Filters;
+import dev.morphia.query.filters.Filters;
 import eu.europeana.corelib.definitions.edm.model.metainfo.AudioMetaInfo;
 import eu.europeana.corelib.definitions.edm.model.metainfo.ImageMetaInfo;
 import eu.europeana.corelib.definitions.edm.model.metainfo.TextMetaInfo;
diff --git a/metis-indexing/src/main/java/eu/europeana/indexing/mongo/property/MongoPropertyUpdaterFactory.java b/metis-indexing/src/main/java/eu/europeana/indexing/mongo/property/MongoPropertyUpdaterFactory.java
index 4071247fb2..26b2f7d33a 100644
--- a/metis-indexing/src/main/java/eu/europeana/indexing/mongo/property/MongoPropertyUpdaterFactory.java
+++ b/metis-indexing/src/main/java/eu/europeana/indexing/mongo/property/MongoPropertyUpdaterFactory.java
@@ -1,9 +1,9 @@
 package eu.europeana.indexing.mongo.property;
 
 import dev.morphia.query.Query;
-import dev.morphia.query.experimental.filters.Filters;
-import dev.morphia.query.experimental.updates.UpdateOperator;
-import dev.morphia.query.experimental.updates.UpdateOperators;
+import dev.morphia.query.filters.Filters;
+import dev.morphia.query.updates.UpdateOperator;
+import dev.morphia.query.updates.UpdateOperators;
 import eu.europeana.indexing.utils.TriConsumer;
 import eu.europeana.metis.mongo.dao.RecordDao;
 import java.util.Date;
diff --git a/metis-indexing/src/main/java/eu/europeana/indexing/mongo/property/MongoPropertyUpdaterImpl.java b/metis-indexing/src/main/java/eu/europeana/indexing/mongo/property/MongoPropertyUpdaterImpl.java
index 6ebfb5f922..ffadd794ba 100644
--- a/metis-indexing/src/main/java/eu/europeana/indexing/mongo/property/MongoPropertyUpdaterImpl.java
+++ b/metis-indexing/src/main/java/eu/europeana/indexing/mongo/property/MongoPropertyUpdaterImpl.java
@@ -5,9 +5,8 @@
 import com.mongodb.DuplicateKeyException;
 import dev.morphia.UpdateOptions;
 import dev.morphia.query.Query;
-import dev.morphia.query.Update;
-import dev.morphia.query.experimental.updates.UpdateOperator;
-import dev.morphia.query.experimental.updates.UpdateOperators;
+import dev.morphia.query.updates.UpdateOperator;
+import dev.morphia.query.updates.UpdateOperators;
 import eu.europeana.corelib.definitions.edm.entity.AbstractEdmEntity;
 import eu.europeana.corelib.definitions.edm.entity.WebResource;
 import eu.europeana.corelib.definitions.edm.model.metainfo.WebResourceMetaInfo;
@@ -61,7 +60,7 @@ class MongoPropertyUpdaterImpl<T> implements MongoPropertyUpdater<T> {
     this.updated = updated;
     this.mongoServer = mongoServer;
     this.updateOperators = Optional.ofNullable(updateOperators).stream().flatMap(Collection::stream)
-        .collect(Collectors.toList());
+                                   .collect(Collectors.toList());
     this.queryCreator = queryCreator;
   }
 
@@ -86,9 +85,8 @@ private static <I> boolean listEquals(List<I> listA, List<I> listB,
   }
 
   /**
-   * Checks whether two maps contain exactly the same key value combinations. The value lists are
-   * said to be the same if they contain the same elements, regardless of the order but counting
-   * multiplicity.
+   * Checks whether two maps contain exactly the same key value combinations. The value lists are said to be the same if they
+   * contain the same elements, regardless of the order but counting multiplicity.
    *
    * @param mapA The first map.
    * @param mapB The second map.
@@ -106,8 +104,7 @@ static boolean mapEquals(Map<String, List<String>> mapA, Map<String, List<String
   }
 
   /**
-   * Check if two arrays contain the same values, regardless of the order, but counting
-   * multiplicity.
+   * Check if two arrays contain the same values, regardless of the order, but counting multiplicity.
    *
    * @param arrA The first array.
    * @param arrB The second array.
@@ -173,8 +170,8 @@ public void updateWebResources(String updateField,
   }
 
   private static List<WebResourceImpl> castWebResourceList(List<? extends WebResource> input) {
-    return input == null ? null : input.stream().map(webResource -> ((WebResourceImpl) webResource))
-        .collect(Collectors.toList());
+    return input == null ? null : input.stream().map(WebResourceImpl.class::cast)
+                                       .collect(Collectors.toList());
   }
 
   @Override
@@ -200,24 +197,27 @@ public <P extends AbstractEdmEntity, A> void updateReferencedEntities(String upd
       MongoObjectUpdater<P, A> objectUpdater) {
     final A ancestorInformation = ancestorInfoGetter.apply(updated);
     final UnaryOperator<List<P>> preprocessing = entities -> new ArrayList<>(entities.stream()
-        .map(entity -> objectUpdater.update(entity, ancestorInformation, null, null, mongoServer))
-        .collect(Collectors.toMap(AbstractEdmEntity::getAbout, Function.identity(), (o1, o2) -> o2))
-        .values());
+                                                                                     .map(entity -> objectUpdater.update(entity,
+                                                                                         ancestorInformation, null, null,
+                                                                                         mongoServer))
+                                                                                     .collect(Collectors.toMap(
+                                                                                         AbstractEdmEntity::getAbout,
+                                                                                         Function.identity(), (o1, o2) -> o2))
+                                                                                     .values());
     final BiPredicate<List<P>, List<P>> equality = (w1, w2) -> listEquals(w1, w2,
         ENTITY_COMPARATOR);
     updateProperty(updateField, getter, equality, preprocessing);
   }
 
   /**
-   * This method updates a given object property. This method tests if there is anything to update.
-   * If there is, after this method is called, {@link #applyOperations()} will include the update.
+   * This method updates a given object property. This method tests if there is anything to update. If there is, after this method
+   * is called, {@link #applyOperations()} will include the update.
    *
-   * @param updateField The name of the field to update. This is the name under which they will be
-   * stored in the operations list (see {@link #applyOperations()}).
+   * @param updateField The name of the field to update. This is the name under which they will be stored in the operations list
+   * (see {@link #applyOperations()}).
    * @param getter The getter that obtains the property value from the object.
    * @param equality Predicate that checks for equality between two property values.
-   * @param preprocessing The pre-processing to be applied to the update property value before
-   * comparing and storing.
+   * @param preprocessing The pre-processing to be applied to the update property value before comparing and storing.
    */
   private <P> void updateProperty(String updateField, Function<T, P> getter,
       BiPredicate<P, P> equality, UnaryOperator<P> preprocessing) {
@@ -273,22 +273,20 @@ public void updateWebResourceMetaInfo(Function<T, WebResourceMetaInfo> getter,
       updaterSupplier.get().delete(ancestorInformation, mongoServer);
     } else {
       updaterSupplier.get().update((WebResourceMetaInfoImpl) entity, ancestorInformation,
-              null, null, mongoServer);
+          null, null, mongoServer);
     }
   }
 
   @Override
   public T applyOperations() {
-    final UpdateOperator firstUpdateOperator = updateOperators.get(0);
-    final UpdateOperator[] extraUpdateOperators = this.updateOperators
-        .subList(1, this.updateOperators.size()).toArray(UpdateOperator[]::new);
-    final Update<T> update = queryCreator.get().update(firstUpdateOperator, extraUpdateOperators);
+    final UpdateOperator[] extraUpdateOperators = this.updateOperators.toArray(UpdateOperator[]::new);
     final UpdateOptions updateOptions = new UpdateOptions().upsert(true).multi(true);
+    final Query<T> update = queryCreator.get();
     try {
-      retryableExternalRequestForNetworkExceptions(() -> update.execute(updateOptions));
+      retryableExternalRequestForNetworkExceptions(() -> update.update(updateOptions, extraUpdateOperators));
     } catch (DuplicateKeyException e) {
       LOGGER.debug("Received duplicate key exception, trying again once more.", e);
-      update.execute(updateOptions);
+      update.update(updateOptions, extraUpdateOperators);
     }
     return queryCreator.get().first();
   }
diff --git a/metis-indexing/src/main/java/eu/europeana/indexing/tiers/media/AbstractMediaClassifier.java b/metis-indexing/src/main/java/eu/europeana/indexing/tiers/media/AbstractMediaClassifier.java
index c9192cd81f..047778ac6d 100644
--- a/metis-indexing/src/main/java/eu/europeana/indexing/tiers/media/AbstractMediaClassifier.java
+++ b/metis-indexing/src/main/java/eu/europeana/indexing/tiers/media/AbstractMediaClassifier.java
@@ -49,9 +49,11 @@ public final TierClassification<MediaTier, ContentTierBreakdown> classify(RdfWra
 
     // Compute the media tier based on whether it has suitable web resources.
     final MediaTier mediaTier;
+    final MediaTier mediaTierBeforeLicenseCorrection;
     List<MediaResourceTechnicalMetadata> mediaResourceTechnicalMetadataList = new LinkedList<>();
     if (webResources.isEmpty()) {
       mediaTier = classifyEntityWithoutWebResources(entity, hasLandingPage);
+      mediaTierBeforeLicenseCorrection = mediaTier;
     } else {
       final List<MediaResourceTechnicalMetadata> descendingMediaResourceTechnicalMetadata =
           webResources.stream().map(
@@ -61,6 +63,11 @@ public final TierClassification<MediaTier, ContentTierBreakdown> classify(RdfWra
       //Get the highest value or else default
       mediaTier = descendingMediaResourceTechnicalMetadata.stream().map(MediaResourceTechnicalMetadata::getMediaTier).findFirst()
                                                           .orElse(MediaTier.T0);
+      //Get the highest value of content tier before license correction or else default
+      mediaTierBeforeLicenseCorrection = descendingMediaResourceTechnicalMetadata.stream()
+          .map(MediaResourceTechnicalMetadata::getMediaTierBeforeLicenseCorrection)
+          .findFirst()
+          .orElse(MediaTier.T0);
       mediaResourceTechnicalMetadataList = descendingMediaResourceTechnicalMetadata;
     }
     MediaType mediaTypeResult = getMediaType();
@@ -68,6 +75,7 @@ public final TierClassification<MediaTier, ContentTierBreakdown> classify(RdfWra
 
     final ContentTierBreakdown contentTierBreakdown = new ContentTierBreakdown.Builder()
             .setRecordType(mediaTypeResult)
+            .setMediaTierBeforeLicenseCorrection(mediaTierBeforeLicenseCorrection)
             .setLicenseType(entityLicenseType)
             .setThumbnailAvailable(hasThumbnails)
             .setLandingPageAvailable(hasLandingPage)
@@ -113,7 +121,8 @@ MediaResourceTechnicalMetadata classifyWebResourceAndLicense(WebResourceWrapper
                                          .setMimeType(webResource.getMimeType())
                                          .setElementLinkTypes(webResource.getLinkTypes())
                                          .setLicenseType(webResourceLicense)
-                                         .setMediaTier(mediaTier);
+                                         .setMediaTier(mediaTier)
+                                         .setMediaTierBeforeLicenseCorrection(resourceTier);
 
     return mediaResourceTechnicalMetadataBuilder.build();
   }
diff --git a/metis-indexing/src/main/java/eu/europeana/indexing/tiers/model/MediaTier.java b/metis-indexing/src/main/java/eu/europeana/indexing/tiers/model/MediaTier.java
index 3e33d2f8d5..c858ab971f 100644
--- a/metis-indexing/src/main/java/eu/europeana/indexing/tiers/model/MediaTier.java
+++ b/metis-indexing/src/main/java/eu/europeana/indexing/tiers/model/MediaTier.java
@@ -27,4 +27,20 @@ public int getLevel() {
   public String toString() {
     return stringRepresentation;
   }
+
+  public static MediaTier getEnum(String value){
+    MediaTier result = null;
+    for(MediaTier tier: MediaTier.values()) {
+      if(tier.stringRepresentation.equals(value)) {
+        result = tier;
+        break;
+      }
+    }
+
+    if(result == null){
+      throw new IllegalArgumentException("Nu such value " + value + " exists");
+    } else {
+      return result;
+    }
+  }
 }
diff --git a/metis-indexing/src/main/java/eu/europeana/indexing/tiers/model/MetadataTier.java b/metis-indexing/src/main/java/eu/europeana/indexing/tiers/model/MetadataTier.java
index ed06c4f8b1..921cdc8198 100644
--- a/metis-indexing/src/main/java/eu/europeana/indexing/tiers/model/MetadataTier.java
+++ b/metis-indexing/src/main/java/eu/europeana/indexing/tiers/model/MetadataTier.java
@@ -27,4 +27,20 @@ public int getLevel() {
   public String toString() {
     return stringRepresentation;
   }
+
+  public static MetadataTier getEnum(String value){
+    MetadataTier result = null;
+    for(MetadataTier tier: MetadataTier.values()) {
+      if(tier.stringRepresentation.equals(value)) {
+        result = tier;
+        break;
+      }
+    }
+
+    if(result == null){
+      throw new IllegalArgumentException("Nu such value " + value + " exists");
+    } else {
+      return result;
+    }
+  }
 }
diff --git a/metis-indexing/src/main/java/eu/europeana/indexing/tiers/model/TierResults.java b/metis-indexing/src/main/java/eu/europeana/indexing/tiers/model/TierResults.java
index 29b5b8c155..20e48ca802 100644
--- a/metis-indexing/src/main/java/eu/europeana/indexing/tiers/model/TierResults.java
+++ b/metis-indexing/src/main/java/eu/europeana/indexing/tiers/model/TierResults.java
@@ -1,5 +1,10 @@
 package eu.europeana.indexing.tiers.model;
 
+import eu.europeana.indexing.tiers.model.TierClassifier.TierClassification;
+import eu.europeana.indexing.tiers.view.ContentTierBreakdown;
+import eu.europeana.indexing.tiers.view.MetadataTierBreakdown;
+import eu.europeana.indexing.utils.LicenseType;
+
 /**
  * Object that encapsulates the content and metadata tiers values.
  * It can not change set new values.
@@ -8,17 +13,41 @@
 public class TierResults {
 
     private final MediaTier mediaTier;
+    private final MediaTier contentTierBeforeLicenseCorrection;
+    private final LicenseType licenseType;
     private final MetadataTier metadataTier;
+    private final MetadataTier metadataTierLanguage;
+    private final MetadataTier metadataTierEnablingElements;
+    private final MetadataTier metadataTierContextualClasses;
 
     /**
      * Constructor
      *
-     * @param mediaTier The value for content tier
-     * @param metadataTier The value for metadata tier
+     * @param mediaTierClassification The object containing the media classification of the record
+     * @param metadataTierClassification The object containing the metadata classification of the record
      */
-    public TierResults(MediaTier mediaTier, MetadataTier metadataTier) {
-        this.mediaTier = mediaTier;
-        this.metadataTier = metadataTier;
+    public TierResults(TierClassification<MediaTier, ContentTierBreakdown> mediaTierClassification,
+        TierClassification<MetadataTier, MetadataTierBreakdown> metadataTierClassification) {
+        this.mediaTier = mediaTierClassification.getTier();
+        this.metadataTier = metadataTierClassification.getTier();
+        contentTierBeforeLicenseCorrection = mediaTierClassification.getClassification().getMediaTierBeforeLicenseCorrection();
+        licenseType = mediaTierClassification.getClassification().getLicenseType();
+        metadataTierLanguage = metadataTierClassification.getClassification().getLanguageBreakdown().getMetadataTier();
+        metadataTierEnablingElements = metadataTierClassification.getClassification().getEnablingElements().getMetadataTier();
+        metadataTierContextualClasses = metadataTierClassification.getClassification().getContextualClasses().getMetadataTier();
+    }
+
+    /**
+     * Constructor that initializes with null values
+     */
+    public TierResults() {
+        mediaTier = null;
+        metadataTier = null;
+        contentTierBeforeLicenseCorrection = null;
+        licenseType = null;
+        metadataTierLanguage = null;
+        metadataTierEnablingElements = null;
+        metadataTierContextualClasses = null;
     }
 
     /**
@@ -29,6 +58,22 @@ public MediaTier getMediaTier() {
         return mediaTier;
     }
 
+    /**
+     * Returns the value of content tier after license correction
+     * @return the value of content tier after license correction
+     */
+    public MediaTier getContentTierBeforeLicenseCorrection(){
+        return contentTierBeforeLicenseCorrection;
+    }
+
+    /**
+     * Returns the license type of the record
+     * @return the license type of the record
+     */
+    public LicenseType getLicenseType(){
+        return licenseType;
+    }
+
     /**
      * Returns the value for metadata tier
      * @return the value of metadata tier
@@ -37,4 +82,28 @@ public MetadataTier getMetadataTier() {
         return metadataTier;
     }
 
+    /**
+     * Returns the value for the metadata tier for language dimension
+     * @return the value for the metadata tier for language dimension
+     */
+    public MetadataTier getMetadataTierLanguage(){
+        return metadataTierLanguage;
+    }
+
+    /**
+     * Returns the value for the metadata tier for enabling elements dimension
+     * @return the value for the metadata tier for enabling elements dimension
+     */
+    public MetadataTier getMetadataTierEnablingElements(){
+        return metadataTierEnablingElements;
+    }
+
+    /**
+     * Returns the value for the metadata tier for contextual classes dimension
+     * @return the value for the metadata tier for contextual classes dimension
+     */
+    public MetadataTier getMetadataTierContextualClasses(){
+        return metadataTierContextualClasses;
+    }
+
 }
diff --git a/metis-indexing/src/main/java/eu/europeana/indexing/tiers/view/ContentTierBreakdown.java b/metis-indexing/src/main/java/eu/europeana/indexing/tiers/view/ContentTierBreakdown.java
index 3e780a265b..5e721156ed 100644
--- a/metis-indexing/src/main/java/eu/europeana/indexing/tiers/view/ContentTierBreakdown.java
+++ b/metis-indexing/src/main/java/eu/europeana/indexing/tiers/view/ContentTierBreakdown.java
@@ -1,5 +1,6 @@
 package eu.europeana.indexing.tiers.view;
 
+import eu.europeana.indexing.tiers.model.MediaTier;
 import eu.europeana.indexing.utils.LicenseType;
 import eu.europeana.metis.schema.model.MediaType;
 
@@ -12,6 +13,7 @@
 public class ContentTierBreakdown {
 
     private final MediaType recordType;
+    private final MediaTier mediaTierBeforeLicenseCorrection;
     private final LicenseType licenseType;
     private final boolean thumbnailAvailable;
     private final boolean landingPageAvailable;
@@ -30,6 +32,7 @@ public class ContentTierBreakdown {
     public ContentTierBreakdown(ContentTierBreakdown contentTierBreakdown, List<ProcessingError> processingErrorsList) {
         this(new Builder()
                 .setRecordType(contentTierBreakdown.getRecordType())
+                .setMediaTierBeforeLicenseCorrection(contentTierBreakdown.getMediaTierBeforeLicenseCorrection())
                 .setLicenseType(contentTierBreakdown.getLicenseType())
                 .setThumbnailAvailable(contentTierBreakdown.isThumbnailAvailable())
                 .setLandingPageAvailable(contentTierBreakdown.isLandingPageAvailable())
@@ -41,6 +44,7 @@ public ContentTierBreakdown(ContentTierBreakdown contentTierBreakdown, List<Proc
 
     private ContentTierBreakdown(Builder builder) {
         this.recordType = builder.recordType;
+        this.mediaTierBeforeLicenseCorrection = builder.mediaTierBeforeLicenseCorrection;
         this.licenseType = builder.licenseType;
         this.thumbnailAvailable = builder.thumbnailAvailable;
         this.landingPageAvailable = builder.landingPageAvailable;
@@ -55,6 +59,10 @@ public MediaType getRecordType() {
         return recordType;
     }
 
+    public MediaTier getMediaTierBeforeLicenseCorrection(){
+      return mediaTierBeforeLicenseCorrection;
+    }
+
     public LicenseType getLicenseType() {
         return licenseType;
     }
@@ -88,6 +96,7 @@ public List<ProcessingError> getProcessingErrorsList() {
    */
   public static class Builder {
         private MediaType recordType;
+        private MediaTier mediaTierBeforeLicenseCorrection;
         private LicenseType licenseType;
         private boolean thumbnailAvailable;
         private boolean landingPageAvailable;
@@ -108,6 +117,11 @@ public Builder setRecordType(MediaType recordType) {
             return this;
         }
 
+        public Builder setMediaTierBeforeLicenseCorrection(MediaTier mediaTierBeforeLicenseCorrection){
+          this.mediaTierBeforeLicenseCorrection = mediaTierBeforeLicenseCorrection;
+          return this;
+        }
+
         public Builder setLicenseType(LicenseType licenseType) {
             this.licenseType = licenseType;
             return this;
diff --git a/metis-indexing/src/main/java/eu/europeana/indexing/tiers/view/MediaResourceTechnicalMetadata.java b/metis-indexing/src/main/java/eu/europeana/indexing/tiers/view/MediaResourceTechnicalMetadata.java
index f43e32db32..a50815d9e9 100644
--- a/metis-indexing/src/main/java/eu/europeana/indexing/tiers/view/MediaResourceTechnicalMetadata.java
+++ b/metis-indexing/src/main/java/eu/europeana/indexing/tiers/view/MediaResourceTechnicalMetadata.java
@@ -25,20 +25,23 @@ public final class MediaResourceTechnicalMetadata {
   private final Set<WebResourceLinkType> elementLinkTypes;
   private final LicenseType licenseType;
   private final MediaTier mediaTier;
+  private final MediaTier mediaTierBeforeLicenseCorrection;
   private final Long imageResolution;
   private final MediaTier imageResolutionTier;
   private final Long verticalResolution;
   private final MediaTier verticalResolutionTier;
 
-  private MediaResourceTechnicalMetadata(String resourceUrl, MediaType mediaType, String mimeType,
-      Set<WebResourceLinkType> elementLinkTypes, LicenseType licenseType,
-      MediaTier mediaTier, ResolutionTierMetadata resolutionTierMetadata) {
+  private MediaResourceTechnicalMetadata(String resourceUrl, MediaType mediaType,
+      String mimeType, Set<WebResourceLinkType> elementLinkTypes, LicenseType licenseType,
+      MediaTier mediaTier, MediaTier mediaTierBeforeLicenseCorrection,
+      ResolutionTierMetadata resolutionTierMetadata) {
     this.resourceUrl = resourceUrl;
     this.mediaType = mediaType;
     this.mimeType = mimeType;
     this.elementLinkTypes = elementLinkTypes == null ? new HashSet<>() : new HashSet<>(elementLinkTypes);
     this.licenseType = licenseType;
     this.mediaTier = mediaTier;
+    this.mediaTierBeforeLicenseCorrection = mediaTierBeforeLicenseCorrection;
     this.imageResolution = resolutionTierMetadata.getImageResolution();
     this.imageResolutionTier = resolutionTierMetadata.getImageResolutionTier();
     this.verticalResolution = resolutionTierMetadata.getVerticalResolution();
@@ -69,6 +72,10 @@ public MediaTier getMediaTier() {
     return mediaTier;
   }
 
+  public MediaTier getMediaTierBeforeLicenseCorrection(){
+    return mediaTierBeforeLicenseCorrection;
+  }
+
   public Long getImageResolution() {
     return imageResolution;
   }
@@ -96,6 +103,7 @@ public static class MediaResourceTechnicalMetadataBuilder {
     private Set<WebResourceLinkType> elementLinkTypes = Collections.emptySet();
     private LicenseType licenseType;
     private MediaTier mediaTier;
+    private MediaTier mediaTierBeforeLicenseCorrection;
     private final ResolutionTierMetadata resolutionTierMetadata;
 
     /**
@@ -137,6 +145,11 @@ public MediaResourceTechnicalMetadataBuilder setMediaTier(MediaTier mediaTier) {
       return this;
     }
 
+    public MediaResourceTechnicalMetadataBuilder setMediaTierBeforeLicenseCorrection(MediaTier mediaTierBeforeLicenseCorrection) {
+      this.mediaTierBeforeLicenseCorrection = mediaTierBeforeLicenseCorrection;
+      return this;
+    }
+
     /**
      * Creates an instance of {@link MediaResourceTechnicalMetadata} by verifying collected parameters.
      *
@@ -146,12 +159,13 @@ public MediaResourceTechnicalMetadata build() {
       //Verify fields that should not be blank/empty
       notBlank(resourceUrl);
       notNull(mediaType);
+      notNull(mediaTierBeforeLicenseCorrection);
       notNull(elementLinkTypes); //Can be empty but shouldn't be null
       notNull(licenseType);
       notNull(mediaTier);
 
       return new MediaResourceTechnicalMetadata(resourceUrl, mediaType, mimeType, elementLinkTypes, licenseType, mediaTier,
-          resolutionTierMetadata);
+          mediaTierBeforeLicenseCorrection, resolutionTierMetadata);
     }
   }
 }
diff --git a/metis-indexing/src/main/java/eu/europeana/indexing/utils/WebResourceWrapper.java b/metis-indexing/src/main/java/eu/europeana/indexing/utils/WebResourceWrapper.java
index 1d3d80f7b1..dea4086b07 100644
--- a/metis-indexing/src/main/java/eu/europeana/indexing/utils/WebResourceWrapper.java
+++ b/metis-indexing/src/main/java/eu/europeana/indexing/utils/WebResourceWrapper.java
@@ -209,6 +209,13 @@ public Set<String> getColorHexCodes() {
         .map(HexBinaryType::getString).collect(Collectors.toSet());
   }
 
+  /**
+   * @return The 'ebucore:fileByteSize' value of the web resource as long, or 0 if none is set.
+   */
+  public long getFileByteSize() {
+    return webResource.getFileByteSize() == null ? 0L : webResource.getFileByteSize().getLong();
+  }
+
   /**
    * @return The 'ebucore:sampleSize' value of the web resource as long, or 0 if none is set.
    */
@@ -251,4 +258,22 @@ public long getDuration() {
   public Optional<LicenseType> getLicenseType() {
     return Optional.of(webResource).map(WebResourceType::getRights).map(LicenseType::getLicenseType);
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+
+    WebResourceWrapper that = (WebResourceWrapper) o;
+    return webResource.getAbout().equals(that.getAbout()) && linkTypes.containsAll(that.getLinkTypes());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(webResource.getAbout(), linkTypes);
+  }
 }
diff --git a/metis-indexing/src/test/java/eu/europeana/indexing/fullbean/AgentFieldInputTest.java b/metis-indexing/src/test/java/eu/europeana/indexing/fullbean/AgentFieldInputTest.java
index aa4dd81520..9158698923 100644
--- a/metis-indexing/src/test/java/eu/europeana/indexing/fullbean/AgentFieldInputTest.java
+++ b/metis-indexing/src/test/java/eu/europeana/indexing/fullbean/AgentFieldInputTest.java
@@ -8,7 +8,7 @@
 
 import dev.morphia.Datastore;
 import dev.morphia.query.Query;
-import dev.morphia.query.experimental.filters.Filters;
+import dev.morphia.query.filters.Filters;
 import eu.europeana.metis.schema.jibx.AgentType;
 import eu.europeana.metis.schema.jibx.AltLabel;
 import eu.europeana.metis.schema.jibx.Begin;
diff --git a/metis-indexing/src/test/java/eu/europeana/indexing/fullbean/ConceptFieldInputTest.java b/metis-indexing/src/test/java/eu/europeana/indexing/fullbean/ConceptFieldInputTest.java
index cdac80d517..5fa6542739 100644
--- a/metis-indexing/src/test/java/eu/europeana/indexing/fullbean/ConceptFieldInputTest.java
+++ b/metis-indexing/src/test/java/eu/europeana/indexing/fullbean/ConceptFieldInputTest.java
@@ -8,7 +8,7 @@
 
 import dev.morphia.Datastore;
 import dev.morphia.query.Query;
-import dev.morphia.query.experimental.filters.Filters;
+import dev.morphia.query.filters.Filters;
 import eu.europeana.metis.schema.jibx.AltLabel;
 import eu.europeana.metis.schema.jibx.Concept;
 import eu.europeana.metis.schema.jibx.LiteralType.Lang;
diff --git a/metis-indexing/src/test/java/eu/europeana/indexing/fullbean/PlaceFieldInputTest.java b/metis-indexing/src/test/java/eu/europeana/indexing/fullbean/PlaceFieldInputTest.java
index 3ffffe52b0..65ea7e4f8a 100644
--- a/metis-indexing/src/test/java/eu/europeana/indexing/fullbean/PlaceFieldInputTest.java
+++ b/metis-indexing/src/test/java/eu/europeana/indexing/fullbean/PlaceFieldInputTest.java
@@ -8,7 +8,7 @@
 
 import dev.morphia.Datastore;
 import dev.morphia.query.Query;
-import dev.morphia.query.experimental.filters.Filters;
+import dev.morphia.query.filters.Filters;
 import eu.europeana.metis.schema.jibx.AltLabel;
 import eu.europeana.metis.schema.jibx.IsPartOf;
 import eu.europeana.metis.schema.jibx.Lat;
diff --git a/metis-indexing/src/test/java/eu/europeana/indexing/fullbean/ProxyFieldInputTest.java b/metis-indexing/src/test/java/eu/europeana/indexing/fullbean/ProxyFieldInputTest.java
index c6abb14836..e0a4a80b88 100644
--- a/metis-indexing/src/test/java/eu/europeana/indexing/fullbean/ProxyFieldInputTest.java
+++ b/metis-indexing/src/test/java/eu/europeana/indexing/fullbean/ProxyFieldInputTest.java
@@ -6,7 +6,7 @@
 
 import dev.morphia.Datastore;
 import dev.morphia.query.Query;
-import dev.morphia.query.experimental.filters.Filters;
+import dev.morphia.query.filters.Filters;
 import eu.europeana.corelib.solr.entity.ProxyImpl;
 import eu.europeana.metis.mongo.dao.RecordDao;
 import eu.europeana.metis.schema.jibx.Alternative;
diff --git a/metis-indexing/src/test/java/eu/europeana/indexing/fullbean/TimespanFieldInputTest.java b/metis-indexing/src/test/java/eu/europeana/indexing/fullbean/TimespanFieldInputTest.java
index 0b849bd94d..079993b9cd 100644
--- a/metis-indexing/src/test/java/eu/europeana/indexing/fullbean/TimespanFieldInputTest.java
+++ b/metis-indexing/src/test/java/eu/europeana/indexing/fullbean/TimespanFieldInputTest.java
@@ -8,7 +8,7 @@
 
 import dev.morphia.Datastore;
 import dev.morphia.query.Query;
-import dev.morphia.query.experimental.filters.Filters;
+import dev.morphia.query.filters.Filters;
 import eu.europeana.corelib.solr.entity.TimespanImpl;
 import eu.europeana.metis.mongo.dao.RecordDao;
 import eu.europeana.metis.schema.jibx.AltLabel;
diff --git a/metis-indexing/src/test/java/eu/europeana/indexing/tiers/media/AbstractMediaClassifierTest.java b/metis-indexing/src/test/java/eu/europeana/indexing/tiers/media/AbstractMediaClassifierTest.java
index 6e9fdfbd4f..4f6ca0ea57 100644
--- a/metis-indexing/src/test/java/eu/europeana/indexing/tiers/media/AbstractMediaClassifierTest.java
+++ b/metis-indexing/src/test/java/eu/europeana/indexing/tiers/media/AbstractMediaClassifierTest.java
@@ -109,6 +109,7 @@ void testClassify_WithWebResources() {
         .setElementLinkTypes(Collections.emptySet())
         .setLicenseType(LicenseType.OPEN)
         .setMediaTier(MediaTier.T3)
+        .setMediaTierBeforeLicenseCorrection(MediaTier.T4)
         .build();
     final MediaResourceTechnicalMetadata mediaResourceTechnicalMetadata2 = new MediaResourceTechnicalMetadataBuilder(
         new ResolutionTierMetadataBuilder().build())
@@ -117,6 +118,7 @@ void testClassify_WithWebResources() {
         .setElementLinkTypes(Collections.emptySet())
         .setLicenseType(LicenseType.OPEN)
         .setMediaTier(MediaTier.T4)
+        .setMediaTierBeforeLicenseCorrection(MediaTier.T2)
         .build();
 
     doReturn(Arrays.asList(resource1, resource2)).when(entity).getWebResourceWrappers(
diff --git a/metis-indexing/src/test/java/eu/europeana/indexing/tiers/view/ContentTierBreakdownTest.java b/metis-indexing/src/test/java/eu/europeana/indexing/tiers/view/ContentTierBreakdownTest.java
index 3fedd9a06f..fa68b47e67 100644
--- a/metis-indexing/src/test/java/eu/europeana/indexing/tiers/view/ContentTierBreakdownTest.java
+++ b/metis-indexing/src/test/java/eu/europeana/indexing/tiers/view/ContentTierBreakdownTest.java
@@ -28,12 +28,14 @@ void objectCreationTest_Without_Processing_Errors_Parameter() {
         new ResolutionTierMetadataBuilder().build()).setResourceUrl("resourceUrl").setMediaType(MediaType.IMAGE)
                                                     .setElementLinkTypes(
                                                         Collections.emptySet()).setLicenseType(LicenseType.OPEN)
-                                                    .setMediaTier(MediaTier.T4).build();
+                                                    .setMediaTier(MediaTier.T4)
+                                                    .setMediaTierBeforeLicenseCorrection(MediaTier.T3).build();
     final MediaResourceTechnicalMetadata mediaResourceTechnicalMetadata2 = new MediaResourceTechnicalMetadataBuilder(
         new ResolutionTierMetadataBuilder().build()).setResourceUrl("resourceUrl").setMediaType(MediaType.IMAGE)
                                                     .setElementLinkTypes(
                                                         Collections.emptySet()).setLicenseType(LicenseType.OPEN)
-                                                    .setMediaTier(MediaTier.T4).build();
+                                                    .setMediaTier(MediaTier.T4)
+                                                    .setMediaTierBeforeLicenseCorrection(MediaTier.T3).build();
     final List<MediaResourceTechnicalMetadata> mediaResourceTechnicalMetadataList = List.of(
         mediaResourceTechnicalMetadata1, mediaResourceTechnicalMetadata2);
 
@@ -45,6 +47,7 @@ void objectCreationTest_Without_Processing_Errors_Parameter() {
             .setMediaResource3DAvailable(mediaResource3DAvailable)
             .setEmbeddableMediaAvailable(embeddableMediaAvailable)
             .setMediaResourceTechnicalMetadataList(mediaResourceTechnicalMetadataList)
+            .setMediaTierBeforeLicenseCorrection(MediaTier.T3)
             .build();
 
     assertEquals(recordType, contentTierBreakdown.getRecordType());
@@ -53,6 +56,7 @@ void objectCreationTest_Without_Processing_Errors_Parameter() {
     assertEquals(landingPageAvailable, contentTierBreakdown.isLandingPageAvailable());
     assertEquals(mediaResource3DAvailable, contentTierBreakdown.isMediaResource3DAvailable());
     assertEquals(embeddableMediaAvailable, contentTierBreakdown.isEmbeddableMediaAvailable());
+    assertEquals(MediaTier.T3, contentTierBreakdown.getMediaTierBeforeLicenseCorrection());
     assertNotSame(mediaResourceTechnicalMetadataList, contentTierBreakdown.getMediaResourceTechnicalMetadataList());
     assertTrue(CollectionUtils.isEqualCollection(mediaResourceTechnicalMetadataList,
         contentTierBreakdown.getMediaResourceTechnicalMetadataList()));
diff --git a/metis-indexing/src/test/java/eu/europeana/indexing/tiers/view/MediaResourceTechnicalMetadataBuilderTest.java b/metis-indexing/src/test/java/eu/europeana/indexing/tiers/view/MediaResourceTechnicalMetadataBuilderTest.java
index 650f28d92f..ed0a4c6f10 100644
--- a/metis-indexing/src/test/java/eu/europeana/indexing/tiers/view/MediaResourceTechnicalMetadataBuilderTest.java
+++ b/metis-indexing/src/test/java/eu/europeana/indexing/tiers/view/MediaResourceTechnicalMetadataBuilderTest.java
@@ -44,6 +44,8 @@ void objectCreationTest() {
     assertThrows(NullPointerException.class, mediaResourceTechnicalMetadataBuilder::build);
     final MediaTier mediaTier = MediaTier.T0;
     mediaResourceTechnicalMetadataBuilder.setMediaTier(mediaTier);
+    final MediaTier mediaTierBeforeLicense = MediaTier.T1;
+    mediaResourceTechnicalMetadataBuilder.setMediaTierBeforeLicenseCorrection(mediaTierBeforeLicense);
 
     //Object should be valid now
     assertDoesNotThrow(mediaResourceTechnicalMetadataBuilder::build);
@@ -59,6 +61,7 @@ void objectCreationTest() {
     mediaResourceTechnicalMetadata = mediaResourceTechnicalMetadataBuilder.build();
     assertEquals(resourceUrl, mediaResourceTechnicalMetadata.getResourceUrl());
     assertEquals(mediaType, mediaResourceTechnicalMetadata.getMediaType());
+    assertEquals(mediaTierBeforeLicense, mediaResourceTechnicalMetadata.getMediaTierBeforeLicenseCorrection());
     assertEquals(mimeType, mediaResourceTechnicalMetadata.getMimeType());
     assertNotSame(elementLinkTypes, mediaResourceTechnicalMetadata.getElementLinkTypes());
     assertTrue(CollectionUtils.isEqualCollection(elementLinkTypes, mediaResourceTechnicalMetadata.getElementLinkTypes()));
@@ -69,4 +72,4 @@ void objectCreationTest() {
     assertNull(mediaResourceTechnicalMetadata.getVerticalResolution());
     assertNull(mediaResourceTechnicalMetadata.getVerticalResolutionTier());
   }
-}
\ No newline at end of file
+}
diff --git a/metis-indexing/src/test/java/eu/europeana/indexing/tiers/view/RecordTierCalculationViewTest.java b/metis-indexing/src/test/java/eu/europeana/indexing/tiers/view/RecordTierCalculationViewTest.java
index 4df07b540b..1e234597f1 100644
--- a/metis-indexing/src/test/java/eu/europeana/indexing/tiers/view/RecordTierCalculationViewTest.java
+++ b/metis-indexing/src/test/java/eu/europeana/indexing/tiers/view/RecordTierCalculationViewTest.java
@@ -41,6 +41,7 @@ void objectCreationTest() {
             .setElementLinkTypes(Set.of(WebResourceLinkType.IS_SHOWN_AT))
             .setLicenseType(LicenseType.RESTRICTED)
             .setMediaTier(MediaTier.T1)
+            .setMediaTierBeforeLicenseCorrection(MediaTier.T3)
             .build();
 
     final RecordTierCalculationView recordTierCalculationView = new RecordTierCalculationView(new RecordTierCalculationSummary(),
@@ -52,6 +53,7 @@ void objectCreationTest() {
                 .setMediaResource3DAvailable(true)
                 .setEmbeddableMediaAvailable(true)
                 .setMediaResourceTechnicalMetadataList(Collections.singletonList(mediaResourceTechnicalMetadata))
+                .setMediaTierBeforeLicenseCorrection(MediaTier.T3)
                 .build(),
         new MetadataTierBreakdown(languageBreakdown, enablingElementsBreakdown,
             contextualClassesBreakdown));
diff --git a/metis-media-service/pom.xml b/metis-media-service/pom.xml
index 79dfeab5dd..17dd3f6d52 100644
--- a/metis-media-service/pom.xml
+++ b/metis-media-service/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-framework</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-media-service</artifactId>
 
@@ -132,5 +132,11 @@
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.github.tomakehurst</groupId>
+      <artifactId>wiremock-jre8</artifactId>
+      <version>${version.wiremock-jre}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/extraction/CommandExecutor.java b/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/extraction/CommandExecutor.java
index 934df0cdd8..66d64da4ea 100644
--- a/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/extraction/CommandExecutor.java
+++ b/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/extraction/CommandExecutor.java
@@ -18,7 +18,7 @@
  * <p>The command provided is sanitized before executed based on a predefined regex, for safety. In
  * case of an invalid command an exception will be thrown.</p>
  */
-class CommandExecutor {
+public class CommandExecutor {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(CommandExecutor.class);
   private static final int PROCESS_TERMINATION_TIMEOUT_SECONDS = 30;
@@ -33,7 +33,7 @@ class CommandExecutor {
    * @param commandTimeout The maximum amount of time, in seconds, a command is allowed to take before it is forcibly destroyed
    * (i.e. cancelled).
    */
-  CommandExecutor(int commandTimeout) {
+  public CommandExecutor(int commandTimeout) {
     this(commandTimeout, CommandExecutor::createProcess);
   }
 
diff --git a/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/extraction/ImageMetadata.java b/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/extraction/ImageMetadata.java
index e09278d860..df26f5e97d 100644
--- a/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/extraction/ImageMetadata.java
+++ b/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/extraction/ImageMetadata.java
@@ -9,7 +9,7 @@
  * 
  * @author jochen
  */
-class ImageMetadata {
+public class ImageMetadata {
 
   private final int width;
   private final int height;
diff --git a/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/extraction/ThumbnailGenerator.java b/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/extraction/ThumbnailGenerator.java
index 4a1be04be4..aa66957b8b 100644
--- a/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/extraction/ThumbnailGenerator.java
+++ b/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/extraction/ThumbnailGenerator.java
@@ -44,7 +44,7 @@
 /**
  * This class performs thumbnail generation for images and PDF files using ImageMagick.
  */
-class ThumbnailGenerator {
+public class ThumbnailGenerator {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(ThumbnailGenerator.class);
 
@@ -75,7 +75,7 @@ class ThumbnailGenerator {
    * @param commandExecutor A command executor. The calling class is responsible for closing this object.
    * @throws MediaProcessorException In case the properties could not be initialized.
    */
-  ThumbnailGenerator(CommandExecutor commandExecutor) throws MediaProcessorException {
+  public ThumbnailGenerator(CommandExecutor commandExecutor) throws MediaProcessorException {
     this(commandExecutor, getGlobalImageMagickCommand(commandExecutor), initColorMap().toString());
   }
 
@@ -196,7 +196,7 @@ private static List<String> splitByNewLine(String input) {
    * but does not contain null values or thumbnails without content.
    * @throws MediaExtractionException In case a problem occurred.
    */
-  Pair<ImageMetadata, List<Thumbnail>> generateThumbnails(String url, String detectedMimeType,
+  public Pair<ImageMetadata, List<Thumbnail>> generateThumbnails(String url, String detectedMimeType,
       File content, boolean removeAlpha) throws MediaExtractionException {
 
     // Sanity checking
@@ -401,7 +401,7 @@ List<ThumbnailWithSize> prepareThumbnailFiles(String url, String detectedMimeTyp
     return result;
   }
 
-  private static String md5Hex(String s) throws MediaExtractionException {
+  public static String md5Hex(String s) throws MediaExtractionException {
     try {
       byte[] bytes = s.getBytes(StandardCharsets.UTF_8.name());
       // Note: we have no choice but to use MD5, this is agreed upon with the API implementation.
diff --git a/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/http/LinkCheckClient.java b/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/http/LinkCheckClient.java
index 92ca89fbd6..84215225cd 100644
--- a/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/http/LinkCheckClient.java
+++ b/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/http/LinkCheckClient.java
@@ -1,6 +1,8 @@
 package eu.europeana.metis.mediaprocessing.http;
 
 import eu.europeana.metis.network.AbstractHttpClient;
+import org.springframework.http.ContentDisposition;
+
 import java.net.URI;
 
 /**
@@ -29,8 +31,8 @@ protected String getResourceUrl(String resourceEntry) {
   }
 
   @Override
-  protected Void createResult(String providedLink, URI actualUri, String mimeType, Long fileSize,
-      ContentRetriever contentRetriever) {
+  protected Void createResult(String providedLink, URI actualUri, ContentDisposition contentDisposition,
+                              String mimeType, Long fileSize, ContentRetriever contentRetriever) {
     return null;
   }
 }
diff --git a/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/http/MimeTypeDetectHttpClient.java b/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/http/MimeTypeDetectHttpClient.java
index c1efed0b55..ddb007cce6 100644
--- a/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/http/MimeTypeDetectHttpClient.java
+++ b/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/http/MimeTypeDetectHttpClient.java
@@ -1,73 +1,96 @@
 package eu.europeana.metis.mediaprocessing.http;
 
 import eu.europeana.metis.network.AbstractHttpClient;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.tika.Tika;
+import org.apache.tika.metadata.Metadata;
+import org.springframework.http.ContentDisposition;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URL;
-import org.apache.tika.Tika;
-import org.apache.tika.metadata.Metadata;
 
 /**
  * An {@link AbstractHttpClient} that tries to determine the mime type of a link. It does so based
  * on content only: so not using the URI or file name. It does not support redirects: it looks at
  * the content of the link it is given only. For specific information on how this type detection
  * functions, see {@link Tika#detect(URL)}.
- *
+ * <p>
  * The advantage of using this class over the {@link Tika} methods directly is that this provides
  * all the customary timeout options for connections within the media service.
- *
+ * <p>
  * the URL itself as resource entry input.
  */
 public class MimeTypeDetectHttpClient extends AbstractHttpClient<URL, String> {
 
-  private final Tika tika = new Tika();
+    private final Tika tika = new Tika();
+
+    /**
+     * Constructor.
+     *
+     * @param connectTimeout  The connection timeout in milliseconds.
+     * @param responseTimeout The response timeout in milliseconds.
+     * @param requestTimeout  The time after which the request will be aborted (if it hasn't finished
+     */
+    public MimeTypeDetectHttpClient(int connectTimeout, int responseTimeout, int requestTimeout) {
+        super(0, connectTimeout, responseTimeout, requestTimeout);
+    }
 
-  /**
-   * Constructor.
-   *
-   * @param connectTimeout The connection timeout in milliseconds.
-   * @param responseTimeout The response timeout in milliseconds.
-   * @param requestTimeout The time after which the request will be aborted (if it hasn't finished
-   */
-  public MimeTypeDetectHttpClient(int connectTimeout, int responseTimeout, int requestTimeout) {
-    super(0, connectTimeout, responseTimeout, requestTimeout);
-  }
+    private static String getResourceNameFromUrl(URI url) {
+        final String resourcePath = url.getPath().trim();
+        if (resourcePath.isEmpty() || resourcePath.endsWith("/")) {
+            return null;
+        }
+        final int slashIndex = resourcePath.lastIndexOf('/');
+        return slashIndex < 0 ? resourcePath : resourcePath.substring(slashIndex + 1);
+    }
 
-  @Override
-  protected String getResourceUrl(URL resourceEntry) {
-    return resourceEntry.toString();
-  }
+    /**
+     * This method returns the resource name giving precedence to the information
+     * that is contained in Content-Disposition header if exists.
+     * If Content-Disposition resource name is empty then it gets it from the URI provided.
+     *
+     * @param contentDisposition content-disposition header information that can contain a resource name
+     * @param actualUri          actual URI that can contain a resource name
+     * @return String with the resource name
+     */
+    private static String getResourceNameFromContentDispositionOrFromActualURI(ContentDisposition contentDisposition, URI actualUri) {
+        String extractedResourceName = contentDisposition != null &&
+                (contentDisposition.isInline() || contentDisposition.isAttachment()) ? contentDisposition.getFilename() : "";
+        if (StringUtils.isEmpty(extractedResourceName))
+            extractedResourceName = getResourceNameFromUrl(actualUri);
 
-  @Override
-  protected String createResult(URL providedLink, URI actualUri, String mimeType, Long fileSize,
-          ContentRetriever contentRetriever) throws IOException {
-    try (final InputStream inputStream = contentRetriever.getContent()) {
-      final Metadata metadata = new Metadata();
-      final String resourceName = getResourceNameFromUrl(actualUri);
-      if (resourceName != null) {
-        metadata.set(Metadata.RESOURCE_NAME_KEY, resourceName);
-      }
-      if (mimeType != null) {
-        final int separatorIndex = mimeType.indexOf(';');
-        final String adjustedMimeType =
-                separatorIndex < 0 ? mimeType : mimeType.substring(0, separatorIndex);
-        metadata.set(Metadata.CONTENT_TYPE, adjustedMimeType);
-      }
-      if (fileSize != null) {
-        metadata.set(Metadata.CONTENT_LENGTH, fileSize.toString());
-      }
+        return extractedResourceName;
+    }
 
-      return tika.detect(inputStream, metadata);
+    @Override
+    protected String getResourceUrl(URL resourceEntry) {
+        return resourceEntry.toString();
     }
-  }
 
-  private static String getResourceNameFromUrl(URI url) {
-    final String resourcePath = url.getPath().trim();
-    if (resourcePath.isEmpty() || resourcePath.endsWith("/")) {
-      return null;
+    @Override
+    protected String createResult(URL providedLink, URI actualUri, ContentDisposition contentDisposition,
+                                  String mimeType, Long fileSize, ContentRetriever contentRetriever) throws IOException {
+        try (final InputStream inputStream = contentRetriever.getContent()) {
+            final Metadata metadata = new Metadata();
+            final String resourceName = getResourceNameFromContentDispositionOrFromActualURI(contentDisposition, actualUri);
+            if (resourceName != null) {
+                metadata.set(Metadata.RESOURCE_NAME_KEY, resourceName);
+            }
+            if (mimeType != null) {
+                final int separatorIndex = mimeType.indexOf(';');
+                final String adjustedMimeType =
+                        separatorIndex < 0 ? mimeType : mimeType.substring(0, separatorIndex);
+                metadata.set(Metadata.CONTENT_TYPE, adjustedMimeType);
+            }
+            if (fileSize != null) {
+                metadata.set(Metadata.CONTENT_LENGTH, fileSize.toString());
+            }
+
+            return tika.detect(inputStream, metadata);
+        }
     }
-    final int slashIndex = resourcePath.lastIndexOf('/');
-    return slashIndex < 0 ? resourcePath : resourcePath.substring(slashIndex + 1);
-  }
+
+
 }
diff --git a/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/http/ResourceDownloadClient.java b/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/http/ResourceDownloadClient.java
index 99a3996ab4..7e96d89e5d 100644
--- a/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/http/ResourceDownloadClient.java
+++ b/metis-media-service/src/main/java/eu/europeana/metis/mediaprocessing/http/ResourceDownloadClient.java
@@ -12,6 +12,7 @@
 import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.ContentDisposition;
 
 /**
  * An {@link AbstractHttpClient} that obtains the actual content of a resource link.
@@ -107,7 +108,7 @@ protected String getResourceUrl(Pair<RdfResourceEntry, DownloadMode> resourceEnt
 
   @Override
   protected Resource createResult(Pair<RdfResourceEntry, DownloadMode> providedLink, URI actualUri,
-      String mimeType, Long fileSize, ContentRetriever contentRetriever) throws IOException {
+  ContentDisposition contentDisposition, String mimeType, Long fileSize, ContentRetriever contentRetriever) throws IOException {
 
     // Create resource
     final RdfResourceEntry resourceEntry = providedLink.getLeft();
diff --git a/metis-media-service/src/test/java/eu/europeana/metis/mediaprocessing/http/MimeTypeDetectHttpClientTest.java b/metis-media-service/src/test/java/eu/europeana/metis/mediaprocessing/http/MimeTypeDetectHttpClientTest.java
new file mode 100644
index 0000000000..b8db006776
--- /dev/null
+++ b/metis-media-service/src/test/java/eu/europeana/metis/mediaprocessing/http/MimeTypeDetectHttpClientTest.java
@@ -0,0 +1,57 @@
+package eu.europeana.metis.mediaprocessing.http;
+
+import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.springframework.http.ContentDisposition;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class MimeTypeDetectHttpClientTest {
+    private static final String EXPECTED_MIME_TYPE = "audio/mpeg";
+    @RegisterExtension
+    static WireMockExtension wireMockExtension = WireMockExtension.newInstance()
+            .options(wireMockConfig().dynamicPort().dynamicHttpsPort())
+            .build();
+
+    private MimeTypeDetectHttpClient mimeTypeDetectHttpClient
+            = new MimeTypeDetectHttpClient(5000, 5000, 5000);
+
+    @Test
+    void getResourceUrl() throws MalformedURLException {
+        // when
+        String resultUrl = mimeTypeDetectHttpClient.getResourceUrl(new URL("http://localhost"));
+
+        // then
+        assertEquals("http://localhost", resultUrl);
+    }
+
+    @Test
+    void download_withContentDisposition_expectSuccess() throws IOException {
+        // given
+        try (InputStream inputStream = getClass().getClassLoader().getResourceAsStream("__files/audio_test.mp3")) {
+            byte[] audioBytes = inputStream.readAllBytes();
+            wireMockExtension.stubFor(get("/imagen_id.do?idImagen=10610909").willReturn(aResponse()
+                    .withStatus(200)
+                    .withBody(audioBytes)
+                    .withHeader("Content-Disposition", "inline; filename=\"F34-0003_0001.mp3\"")
+                    .withHeader("Content-Type", "audio/mpeg")));
+        }
+        final String url = String.format("http://localhost:%d/imagen_id.do?idImagen=10610909", wireMockExtension.getPort());
+        // when
+        String detectedMimeType = mimeTypeDetectHttpClient.download(new URL(url));
+
+        // then
+        assertEquals(EXPECTED_MIME_TYPE, detectedMimeType);
+    }
+
+}
diff --git a/metis-media-service/src/test/resources/__files/audio_test.mp3 b/metis-media-service/src/test/resources/__files/audio_test.mp3
new file mode 100644
index 0000000000..e175d0f52a
Binary files /dev/null and b/metis-media-service/src/test/resources/__files/audio_test.mp3 differ
diff --git a/metis-normalization/pom.xml b/metis-normalization/pom.xml
index 14d215386b..9ed4e2c136 100644
--- a/metis-normalization/pom.xml
+++ b/metis-normalization/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-framework</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-normalization</artifactId>
 
diff --git a/metis-normalization/src/main/java/eu/europeana/normalization/normalizers/ChainedNormalizer.java b/metis-normalization/src/main/java/eu/europeana/normalization/normalizers/ChainedNormalizer.java
index d396409379..1d2a13cdfb 100644
--- a/metis-normalization/src/main/java/eu/europeana/normalization/normalizers/ChainedNormalizer.java
+++ b/metis-normalization/src/main/java/eu/europeana/normalization/normalizers/ChainedNormalizer.java
@@ -1,11 +1,11 @@
 package eu.europeana.normalization.normalizers;
 
+import eu.europeana.normalization.model.NormalizationReport;
+import eu.europeana.normalization.util.NormalizationException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.w3c.dom.Document;
-import eu.europeana.normalization.model.NormalizationReport;
-import eu.europeana.normalization.util.NormalizationException;
 
 /**
  * This class represents a normalizer with concatenated normalizer subtasks. This normalizer accepts
diff --git a/metis-normalization/src/main/java/eu/europeana/normalization/normalizers/CleanIRIViolationsNormalizer.java b/metis-normalization/src/main/java/eu/europeana/normalization/normalizers/CleanIRIViolationsNormalizer.java
index 77dfe491c8..5516460706 100644
--- a/metis-normalization/src/main/java/eu/europeana/normalization/normalizers/CleanIRIViolationsNormalizer.java
+++ b/metis-normalization/src/main/java/eu/europeana/normalization/normalizers/CleanIRIViolationsNormalizer.java
@@ -2,7 +2,12 @@
 
 import eu.europeana.normalization.util.Namespace;
 import eu.europeana.normalization.util.XpathQuery;
+import java.lang.invoke.MethodHandles;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jena.iri.IRI;
 import org.apache.jena.iri.IRIFactory;
@@ -10,11 +15,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.net.URISyntaxException;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
 
 /**
  * This normalizer cleans, or 'escapes', media link values, replacing all IRI Violation characters
@@ -25,7 +25,7 @@
 
 public class CleanIRIViolationsNormalizer implements ValueNormalizeAction {
 
-  private static final Logger LOG = LoggerFactory.getLogger(CleanIRIViolationsNormalizer.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private static final Namespace.Element RDF_RESOURCE = Namespace.RDF.getElement("resource");
   private static final Namespace.Element RDF_ABOUT = Namespace.RDF.getElement("about");
@@ -62,15 +62,15 @@ public RecordNormalizeAction getAsRecordNormalizer() {
   public List<NormalizedValueWithConfidence> normalizeValue(String value) {
     List<NormalizedValueWithConfidence> result = new ArrayList<>();
 
-    if (!StringUtils.isBlank(value)) {
-      iri = iriFactory.create(value);
+    if (StringUtils.isNotBlank(value)) {
+      iri = iriFactory.create(value.trim());
       final String normalizedValue;
 
       try {
         normalizedValue = iri.toURI().toString();
         result = Collections.singletonList(new NormalizedValueWithConfidence(normalizedValue, 1));
       } catch (URISyntaxException e) {
-        LOG.debug("There was some trouble normalizing the value for IRI Violation");
+        LOGGER.debug("There was some trouble normalizing the value for IRI Violation", e);
       }
     }
     return result;
diff --git a/metis-normalization/src/main/java/eu/europeana/normalization/normalizers/DatesNormalizer.java b/metis-normalization/src/main/java/eu/europeana/normalization/normalizers/DatesNormalizer.java
index 6737e357b6..0848263726 100644
--- a/metis-normalization/src/main/java/eu/europeana/normalization/normalizers/DatesNormalizer.java
+++ b/metis-normalization/src/main/java/eu/europeana/normalization/normalizers/DatesNormalizer.java
@@ -338,6 +338,17 @@ private static String sanitizeCharacters(String input) {
 
   private void appendTimespanEntity(Document document, AbstractEdtfDate edtfDate, String timespanId) {
 
+    //Check if element with the same id already exists, if so we need to remove it first.
+    List<Element> elements = XmlUtil.getAsElementList(document.getDocumentElement()
+                                                              .getElementsByTagNameNS(EDM_TIMESPAN.getNamespace().getUri(),
+                                                                  EDM_TIMESPAN.getElementName()));
+    for (Element element : elements) {
+      String aboutValue = element.getAttributeNS(RDF_ABOUT.getNamespace().getUri(), RDF_ABOUT.getElementName());
+      if (timespanId.equals(aboutValue)) {
+        document.getDocumentElement().removeChild(element);
+      }
+    }
+
     // TODO: 09/08/2022 All the element prefixes below are searched first and if not found then the suggested prefix is added.
     //  When it does not exist in the root the namespace is added in the element itself.
     //  Should we be adding it in the root element of the document instead?
diff --git a/metis-pattern-analysis/pom.xml b/metis-pattern-analysis/pom.xml
index da1296e9af..c03e0fd7b4 100644
--- a/metis-pattern-analysis/pom.xml
+++ b/metis-pattern-analysis/pom.xml
@@ -3,7 +3,7 @@
     <parent>
       <artifactId>metis-framework</artifactId>
       <groupId>eu.europeana.metis</groupId>
-      <version>10</version>
+      <version>11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>metis-pattern-analysis</artifactId>
diff --git a/metis-pattern-analysis/src/main/java/eu/europeana/patternanalysis/view/ProblemPatternDescription.java b/metis-pattern-analysis/src/main/java/eu/europeana/patternanalysis/view/ProblemPatternDescription.java
index 2e44ec3a38..fd2fdecdd3 100644
--- a/metis-pattern-analysis/src/main/java/eu/europeana/patternanalysis/view/ProblemPatternDescription.java
+++ b/metis-pattern-analysis/src/main/java/eu/europeana/patternanalysis/view/ProblemPatternDescription.java
@@ -13,14 +13,14 @@ public enum ProblemPatternDescription {
       ProblemPatternQualityDimension.CONCISENESS),
   P2(ProblemPatternId.P2, "Equal title and description fields", ProblemPatternSeverity.WARNING,
       ProblemPatternQualityDimension.CONCISENESS),
-  P3(ProblemPatternId.P3, "Near-Identical title and description fields", ProblemPatternSeverity.NOTICE,
+  P3(ProblemPatternId.P3, "Near-Identical title and description fields", ProblemPatternSeverity.WARNING,
       ProblemPatternQualityDimension.CONCISENESS),
-  P5(ProblemPatternId.P5, "Unrecognizable title", ProblemPatternSeverity.NOTICE, ProblemPatternQualityDimension.ACCURACY),
-  P6(ProblemPatternId.P6, "Non-meaningful title", ProblemPatternSeverity.NOTICE, ProblemPatternQualityDimension.ACCURACY),
-  P7(ProblemPatternId.P7, "Missing description fields", ProblemPatternSeverity.NOTICE,
+  P5(ProblemPatternId.P5, "Unrecognizable title", ProblemPatternSeverity.WARNING, ProblemPatternQualityDimension.ACCURACY),
+  P6(ProblemPatternId.P6, "Non-meaningful title", ProblemPatternSeverity.WARNING, ProblemPatternQualityDimension.ACCURACY),
+  P7(ProblemPatternId.P7, "Missing description fields", ProblemPatternSeverity.WARNING,
       ProblemPatternQualityDimension.COMPLETENESS),
   P9(ProblemPatternId.P9, "Very short description", ProblemPatternSeverity.WARNING, ProblemPatternQualityDimension.ACCURACY),
-  P12(ProblemPatternId.P12, "Extremely long values", ProblemPatternSeverity.NOTICE, ProblemPatternQualityDimension.ACCURACY);
+  P12(ProblemPatternId.P12, "Extremely long values", ProblemPatternSeverity.WARNING, ProblemPatternQualityDimension.ACCURACY);
 
   private final ProblemPatternId problemPatternId;
   private final String problemPatternTitle;
diff --git a/metis-pattern-analysis/src/test/java/eu/europeana/patternanalysis/view/ProblemPatternDescriptionTest.java b/metis-pattern-analysis/src/test/java/eu/europeana/patternanalysis/view/ProblemPatternDescriptionTest.java
index fd47bf1ac3..ef67f48202 100644
--- a/metis-pattern-analysis/src/test/java/eu/europeana/patternanalysis/view/ProblemPatternDescriptionTest.java
+++ b/metis-pattern-analysis/src/test/java/eu/europeana/patternanalysis/view/ProblemPatternDescriptionTest.java
@@ -23,13 +23,13 @@ void checkValuesTest() {
         "CONCISENESS");
     assertProblemPatternDescription(ProblemPatternDescription.P2, "P2", "Equal title and description fields", "WARNING",
         "CONCISENESS");
-    assertProblemPatternDescription(ProblemPatternDescription.P3, "P3", "Near-Identical title and description fields", "NOTICE",
+    assertProblemPatternDescription(ProblemPatternDescription.P3, "P3", "Near-Identical title and description fields", "WARNING",
         "CONCISENESS");
-    assertProblemPatternDescription(ProblemPatternDescription.P5, "P5", "Unrecognizable title", "NOTICE", "ACCURACY");
-    assertProblemPatternDescription(ProblemPatternDescription.P6, "P6", "Non-meaningful title", "NOTICE", "ACCURACY");
-    assertProblemPatternDescription(ProblemPatternDescription.P7, "P7", "Missing description fields", "NOTICE", "COMPLETENESS");
+    assertProblemPatternDescription(ProblemPatternDescription.P5, "P5", "Unrecognizable title", "WARNING", "ACCURACY");
+    assertProblemPatternDescription(ProblemPatternDescription.P6, "P6", "Non-meaningful title", "WARNING", "ACCURACY");
+    assertProblemPatternDescription(ProblemPatternDescription.P7, "P7", "Missing description fields", "WARNING", "COMPLETENESS");
     assertProblemPatternDescription(ProblemPatternDescription.P9, "P9", "Very short description", "WARNING", "ACCURACY");
-    assertProblemPatternDescription(ProblemPatternDescription.P12, "P12", "Extremely long values", "NOTICE", "ACCURACY");
+    assertProblemPatternDescription(ProblemPatternDescription.P12, "P12", "Extremely long values", "WARNING", "ACCURACY");
   }
 
   @Test
@@ -46,4 +46,4 @@ void fromNameTest() {
     assertThrows(NoSuchElementException.class, () -> ProblemPatternDescription.fromName("invalid"));
   }
 
-}
\ No newline at end of file
+}
diff --git a/metis-repository/metis-repository-rest/pom.xml b/metis-repository/metis-repository-rest/pom.xml
index 5fd8f1ef4c..2c95f78fe0 100644
--- a/metis-repository/metis-repository-rest/pom.xml
+++ b/metis-repository/metis-repository-rest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-repository</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>metis-repository-rest</artifactId>
@@ -49,6 +49,11 @@
       <artifactId>jackson-datatype-jsr310</artifactId>
       <version>${version.jackson}</version>
     </dependency>
+    <dependency>
+      <groupId>eu.europeana.metis</groupId>
+      <artifactId>metis-common-spring-properties</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>eu.europeana.metis</groupId>
       <artifactId>metis-common-utils</artifactId>
diff --git a/metis-repository/metis-repository-rest/src/main/java/eu/europeana/metis/repository/rest/config/ApplicationConfiguration.java b/metis-repository/metis-repository-rest/src/main/java/eu/europeana/metis/repository/rest/config/ApplicationConfiguration.java
index 423169264a..36067e9c5e 100644
--- a/metis-repository/metis-repository-rest/src/main/java/eu/europeana/metis/repository/rest/config/ApplicationConfiguration.java
+++ b/metis-repository/metis-repository-rest/src/main/java/eu/europeana/metis/repository/rest/config/ApplicationConfiguration.java
@@ -3,19 +3,24 @@
 import com.mongodb.client.MongoClient;
 import eu.europeana.corelib.web.socks.SocksProxy;
 import eu.europeana.metis.mongo.connection.MongoClientProvider;
+import eu.europeana.metis.mongo.connection.MongoProperties;
+import eu.europeana.metis.mongo.connection.MongoProperties.ReadPreferenceValue;
 import eu.europeana.metis.repository.rest.dao.RecordDao;
 import eu.europeana.metis.utils.CustomTruststoreAppender;
 import eu.europeana.metis.utils.CustomTruststoreAppender.TrustStoreConfigurationException;
 import eu.europeana.metis.utils.apm.ElasticAPMConfiguration;
 import javax.annotation.PreDestroy;
+import metis.common.config.properties.SocksProxyConfigurationProperties;
+import metis.common.config.properties.TruststoreConfigurationProperties;
+import metis.common.config.properties.mongo.MongoConfigurationProperties;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.web.multipart.support.StandardServletMultipartResolver;
 import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@@ -24,62 +29,84 @@
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**
- * The web application making available the repository functionality. This provides all the
- * configuration and is the starting point for all injections and beans. It also performs the
- * required setup.
+ * The web application making available the repository functionality. This provides all the configuration and is the starting
+ * point for all injections and beans. It also performs the required setup.
  */
 @Configuration
 @EnableWebMvc
-@Import({ElasticAPMConfiguration.class})
-@ComponentScan(basePackages = {"eu.europeana.metis.repository.rest.controller",
-        "eu.europeana.metis.repository.rest.view"})
+@EnableConfigurationProperties({
+    ElasticAPMConfiguration.class, TruststoreConfigurationProperties.class,
+    SocksProxyConfigurationProperties.class, MongoConfigurationProperties.class})
+@ComponentScan(basePackages = {
+    "eu.europeana.metis.repository.rest.controller",
+    "eu.europeana.metis.repository.rest.view"})
 public class ApplicationConfiguration implements WebMvcConfigurer {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationConfiguration.class);
-
-  private final ConfigurationPropertiesHolder propertiesHolder;
-
   private final MongoClient mongoClient;
 
   /**
    * Constructor.
    *
-   * @param propertiesHolder The properties.
+   * @param truststoreConfigurationProperties the truststore configuration properties
+   * @param socksProxyConfigurationProperties the socks proxy configuration properties
    * @throws TrustStoreConfigurationException If something goes wrong initializing the application
    */
   @Autowired
-  public ApplicationConfiguration(ConfigurationPropertiesHolder propertiesHolder) throws TrustStoreConfigurationException {
-    this.mongoClient = ApplicationConfiguration.initializeApplication(propertiesHolder);
-    this.propertiesHolder = propertiesHolder;
+  public ApplicationConfiguration(TruststoreConfigurationProperties truststoreConfigurationProperties,
+      SocksProxyConfigurationProperties socksProxyConfigurationProperties,
+      MongoConfigurationProperties mongoConfigurationProperties)
+      throws CustomTruststoreAppender.TrustStoreConfigurationException {
+    ApplicationConfiguration.initializeTruststore(truststoreConfigurationProperties);
+    ApplicationConfiguration.initializeSocksProxy(socksProxyConfigurationProperties);
+    this.mongoClient = ApplicationConfiguration.getMongoClient(mongoConfigurationProperties);
   }
 
   /**
    * This method performs the initializing tasks for the application.
    *
-   * @param propertiesHolder The properties.
-   * @return The Mongo client that can be used to access the mongo database.
-   * @throws TrustStoreConfigurationException In case a problem occurred with the truststore.
+   * @param truststoreConfigurationProperties The properties.
+   * @throws CustomTruststoreAppender.TrustStoreConfigurationException In case a problem occurred with the truststore.
    */
-  static MongoClient initializeApplication(ConfigurationPropertiesHolder propertiesHolder)
-      throws TrustStoreConfigurationException {
-
-    // Set the SOCKS proxy
-    if (propertiesHolder.isSocksProxyEnabled()) {
-      new SocksProxy(propertiesHolder.getSocksProxyHost(), propertiesHolder.getSocksProxyPort(),
-              propertiesHolder.getSocksProxyUsername(), propertiesHolder.getSocksProxyPassword()).init();
+  static void initializeTruststore(TruststoreConfigurationProperties truststoreConfigurationProperties)
+      throws CustomTruststoreAppender.TrustStoreConfigurationException {
+    if (StringUtils.isNotEmpty(truststoreConfigurationProperties.getPath()) && StringUtils
+        .isNotEmpty(truststoreConfigurationProperties.getPassword())) {
+      CustomTruststoreAppender
+          .appendCustomTruststoreToDefault(truststoreConfigurationProperties.getPath(),
+              truststoreConfigurationProperties.getPassword());
+      LOGGER.info("Custom truststore appended to default truststore");
     }
+  }
 
-    // Set the truststore.
-    LOGGER.info("Append default truststore with custom truststore");
-    if (StringUtils.isNotEmpty(propertiesHolder.getTruststorePath())
-            && StringUtils.isNotEmpty(propertiesHolder.getTruststorePassword())) {
-      CustomTruststoreAppender.appendCustomTrustoreToDefault(propertiesHolder.getTruststorePath(),
-              propertiesHolder.getTruststorePassword());
+  /**
+   * Socks proxy initializer.
+   *
+   * @param socksProxyConfigurationProperties the socks proxy configuration properties
+   */
+  static void initializeSocksProxy(SocksProxyConfigurationProperties socksProxyConfigurationProperties) {
+    if (socksProxyConfigurationProperties.isEnabled()) {
+      new SocksProxy(socksProxyConfigurationProperties.getHost(), socksProxyConfigurationProperties.getPort(),
+          socksProxyConfigurationProperties.getUsername(),
+          socksProxyConfigurationProperties.getPassword()).init();
+      LOGGER.info("Socks proxy enabled");
     }
+  }
+
+  public static MongoClient getMongoClient(MongoConfigurationProperties mongoConfigurationProperties) {
+    final MongoProperties<IllegalArgumentException> mongoProperties = new MongoProperties<>(
+        IllegalArgumentException::new);
+    mongoProperties.setAllProperties(
+        mongoConfigurationProperties.getHosts(),
+        mongoConfigurationProperties.getPorts(),
+        mongoConfigurationProperties.getAuthenticationDatabase(),
+        mongoConfigurationProperties.getUsername(),
+        mongoConfigurationProperties.getPassword(),
+        mongoConfigurationProperties.isEnableSsl(),
+        ReadPreferenceValue.PRIMARY_PREFERRED,
+        mongoConfigurationProperties.getApplicationName());
 
-    // Initialize the Mongo connection
-    LOGGER.info("Creating Mongo connection");
-    return new MongoClientProvider<>(propertiesHolder.getMongoProperties()).createMongoClient();
+    return new MongoClientProvider<>(mongoProperties).createMongoClient();
   }
 
   @Bean(name = DispatcherServlet.MULTIPART_RESOLVER_BEAN_NAME)
@@ -100,8 +127,8 @@ public void addViewControllers(ViewControllerRegistry registry) {
   }
 
   @Bean
-  public RecordDao getRecordDao() {
-    return new RecordDao(mongoClient, propertiesHolder.getMongoRecordDb());
+  public RecordDao getRecordDao(MongoConfigurationProperties mongoConfigurationProperties) {
+    return new RecordDao(mongoClient, mongoConfigurationProperties.getDatabase());
   }
 
   /**
diff --git a/metis-repository/metis-repository-rest/src/main/java/eu/europeana/metis/repository/rest/config/ConfigurationPropertiesHolder.java b/metis-repository/metis-repository-rest/src/main/java/eu/europeana/metis/repository/rest/config/ConfigurationPropertiesHolder.java
deleted file mode 100644
index 4ff3b06249..0000000000
--- a/metis-repository/metis-repository-rest/src/main/java/eu/europeana/metis/repository/rest/config/ConfigurationPropertiesHolder.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package eu.europeana.metis.repository.rest.config;
-
-import eu.europeana.metis.mongo.connection.MongoProperties;
-import eu.europeana.metis.mongo.connection.MongoProperties.ReadPreferenceValue;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-/**
- * Holder for the property values from Spring injection/property loading.
- */
-@Component
-public class ConfigurationPropertiesHolder {
-
-  // Socks proxy
-  @Value("${socks.proxy.enabled}")
-  private boolean socksProxyEnabled;
-  @Value("${socks.proxy.host}")
-  private String socksProxyHost;
-  @Value("${socks.proxy.port}")
-  private String socksProxyPort;
-  @Value("${socks.proxy.username}")
-  private String socksProxyUsername;
-  @Value("${socks.proxy.password}")
-  private String socksProxyPassword;
-
-  // Mongo
-  @Value("${mongo.hosts}")
-  private String[] mongoHosts;
-  @Value("${mongo.port}")
-  private int[] mongoPorts;
-  @Value("${mongo.authentication.db}")
-  private String mongoAuthenticationDb;
-  @Value("${mongo.username}")
-  private String mongoUsername;
-  @Value("${mongo.password}")
-  private String mongoPassword;
-  @Value("${mongo.enable.ssl}")
-  private boolean mongoEnableSSL;
-  @Value("${mongo.application.name}")
-  private String mongoApplicationName;
-  @Value("${mongo.record.db}")
-  private String mongoRecordDb;
-
-  // Truststore
-  @Value("${truststore.path}")
-  private String truststorePath;
-  @Value("${truststore.password}")
-  private String truststorePassword;
-
-  public boolean isSocksProxyEnabled() {
-    return socksProxyEnabled;
-  }
-
-  public String getSocksProxyHost() {
-    return socksProxyHost;
-  }
-
-  public String getSocksProxyPort() {
-    return socksProxyPort;
-  }
-
-  public String getSocksProxyUsername() {
-    return socksProxyUsername;
-  }
-
-  public String getSocksProxyPassword() {
-    return socksProxyPassword;
-  }
-
-  public String getMongoRecordDb() {
-    return mongoRecordDb;
-  }
-
-  public String getTruststorePath() {
-    return truststorePath;
-  }
-
-  public String getTruststorePassword() {
-    return truststorePassword;
-  }
-
-  public MongoProperties<IllegalArgumentException> getMongoProperties() {
-    final MongoProperties<IllegalArgumentException> mongoProperties = new MongoProperties<>(
-        IllegalArgumentException::new);
-    mongoProperties.setAllProperties(mongoHosts, mongoPorts, mongoAuthenticationDb, mongoUsername,
-        mongoPassword, mongoEnableSSL, ReadPreferenceValue.PRIMARY_PREFERRED, mongoApplicationName);
-    return mongoProperties;
-  }
-}
diff --git a/metis-repository/metis-repository-rest/src/main/java/eu/europeana/metis/repository/rest/dao/RecordDao.java b/metis-repository/metis-repository-rest/src/main/java/eu/europeana/metis/repository/rest/dao/RecordDao.java
index 572970600a..80dc024503 100644
--- a/metis-repository/metis-repository-rest/src/main/java/eu/europeana/metis/repository/rest/dao/RecordDao.java
+++ b/metis-repository/metis-repository-rest/src/main/java/eu/europeana/metis/repository/rest/dao/RecordDao.java
@@ -8,7 +8,7 @@
 import dev.morphia.mapping.DiscriminatorFunction;
 import dev.morphia.mapping.MapperOptions;
 import dev.morphia.mapping.NamingStrategy;
-import dev.morphia.query.experimental.filters.Filters;
+import dev.morphia.query.filters.Filters;
 import eu.europeana.metis.network.ExternalRequestUtil;
 import java.util.Optional;
 import java.util.stream.Stream;
diff --git a/metis-repository/metis-repository-rest/src/main/resources/application.properties.example b/metis-repository/metis-repository-rest/src/main/resources/application.properties.example
index 208481f3ca..dc47f52748 100644
--- a/metis-repository/metis-repository-rest/src/main/resources/application.properties.example
+++ b/metis-repository/metis-repository-rest/src/main/resources/application.properties.example
@@ -1,4 +1,5 @@
 #Spring
+logging.config=
 spring.servlet.multipart.max-file-size=5MB
 spring.servlet.multipart.max-request-size=5MB
 spring.autoconfigure.exclude=\
@@ -12,22 +13,42 @@ springdoc.paths-to-match=/**
 server.error.whitelabel.enabled=false
 
 #Socks Proxy
-socks.proxy.enabled=false
-socks.proxy.host=
-socks.proxy.port=
-socks.proxy.username=
-socks.proxy.password=
+socks-proxy.enabled=
+socks-proxy.host=
+socks-proxy.port=
+socks-proxy.username=
+socks-proxy.password=
+
+##Truststore
+truststore.path=
+truststore.password=
 
 #Mongo
 mongo.hosts=
-mongo.port=
-mongo.authentication.db=
+mongo.ports=
+mongo.authenticationDatabase=
 mongo.username=
 mongo.password=
-mongo.enable.ssl=
-mongo.application.name=
-mongo.record.db=
+mongo.enableSsl=
+mongo.database=
+mongo.applicationName=
+
+#Actuator
+management.endpoint.health.probes.enabled=true
+management.health.livenessState.enabled=true
+management.health.readinessState.enabled=true
+
+# Elastic APM
+elastic.apm.enabled=false
+elastic.apm.recording=true
+elastic.apm.instrument=true
+elastic.apm.service_name=metis-repository
+elastic.apm.server_url=
+elastic.apm.environment=local
+elastic.apm.application_packages=eu.europeana
+elastic.apm.log_level=ERROR
+elastic.apm.capture_body=all
+elastic.apm.capture_headers=true
+elastic.apm.metrics_interval=5s
+
 
-#Truststore
-truststore.path=
-truststore.password=
diff --git a/metis-repository/pom.xml b/metis-repository/pom.xml
index 6753ddf8cd..94e1827fd9 100644
--- a/metis-repository/pom.xml
+++ b/metis-repository/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
     <artifactId>metis-framework</artifactId>
   </parent>
 
diff --git a/metis-transformation/metis-transformation-service/pom.xml b/metis-transformation/metis-transformation-service/pom.xml
index ec62e3dc4c..e333c9388c 100644
--- a/metis-transformation/metis-transformation-service/pom.xml
+++ b/metis-transformation/metis-transformation-service/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-transformation</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-transformation-service</artifactId>
   <dependencies>
diff --git a/metis-transformation/metis-transformation-service/src/test/java/eu/europeana/metis/transformation/service/XsltTransformerTest.java b/metis-transformation/metis-transformation-service/src/test/java/eu/europeana/metis/transformation/service/XsltTransformerTest.java
index 49d0de0bda..ed8ea6e440 100644
--- a/metis-transformation/metis-transformation-service/src/test/java/eu/europeana/metis/transformation/service/XsltTransformerTest.java
+++ b/metis-transformation/metis-transformation-service/src/test/java/eu/europeana/metis/transformation/service/XsltTransformerTest.java
@@ -1,16 +1,18 @@
 package eu.europeana.metis.transformation.service;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.util.Objects;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -26,14 +28,17 @@ class XsltTransformerTest {
   @Test
   void shouldTransformGivenFile()
       throws TransformationException, IOException, ParserConfigurationException, SAXException {
-    URL xsltFile = getClass().getClassLoader().getResource("sample_xslt.xslt");
-    byte[] fileToTransform = readFile("xmlForTesting.xml");
-    StringWriter wr = new XsltTransformer(xsltFile.toString(), xsltFile.openStream()).transform(
+    final URL xsltFile = getClass().getClassLoader().getResource("sample_xslt.xslt");
+    assertNotNull(xsltFile);
+    assertDoesNotThrow(xsltFile::toURI);
+    final byte[] fileToTransform = readFile("xmlForTesting.xml");
+    final StringWriter stringWriter = new XsltTransformer(xsltFile.toString(), xsltFile.openStream()).transform(
         fileToTransform, null);
+    final String transformed = stringWriter.toString();
 
-    DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
-    DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
-    Document doc = dBuilder.parse(new InputSource(new StringReader(wr.toString())));
+    final DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+    final DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
+    final Document doc = dBuilder.parse(new InputSource(new StringReader(transformed)));
     assertEquals("html", doc.getDocumentElement().getNodeName());
     assertEquals(1, doc.getElementsByTagName("h2").getLength());
     assertEquals(1, doc.getElementsByTagName("table").getLength());
@@ -64,10 +69,9 @@ void shouldFailForMalformedFile() throws Exception {
   }
 
   private byte[] readFile(String fileName) throws IOException {
-    String myXml = IOUtils
-        .toString(getClass().getClassLoader().getResource(fileName), StandardCharsets.UTF_8.name());
-    byte[] bytes = myXml.getBytes(StandardCharsets.UTF_8);
-    InputStream contentStream = new ByteArrayInputStream(bytes);
-    return IOUtils.toByteArray(contentStream);
+    final String xml = IOUtils.toString(Objects.requireNonNull(this.getClass().getClassLoader().getResourceAsStream(fileName)),
+        StandardCharsets.UTF_8);
+    final byte[] bytes = xml.getBytes(StandardCharsets.UTF_8);
+    return IOUtils.toByteArray(new ByteArrayInputStream(bytes));
   }
 }
diff --git a/metis-transformation/pom.xml b/metis-transformation/pom.xml
index a591292303..3a026862ea 100644
--- a/metis-transformation/pom.xml
+++ b/metis-transformation/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-framework</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-transformation</artifactId>
   <packaging>pom</packaging>
diff --git a/metis-validation/metis-validation-common/pom.xml b/metis-validation/metis-validation-common/pom.xml
index 3a8c3eff89..49ee829ecc 100644
--- a/metis-validation/metis-validation-common/pom.xml
+++ b/metis-validation/metis-validation-common/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-validation</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-validation-common</artifactId>
 
diff --git a/metis-validation/metis-validation-service/pom.xml b/metis-validation/metis-validation-service/pom.xml
index 18fe932ce1..a4ea295896 100644
--- a/metis-validation/metis-validation-service/pom.xml
+++ b/metis-validation/metis-validation-service/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-validation</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-validation-service</artifactId>
   <dependencies>
diff --git a/metis-validation/pom.xml b/metis-validation/pom.xml
index 8080c0c875..f6a86357eb 100644
--- a/metis-validation/pom.xml
+++ b/metis-validation/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-framework</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <artifactId>metis-validation</artifactId>
   <packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index 6cfe70b20c..3f91826938 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.europeana.metis</groupId>
   <artifactId>metis-framework</artifactId>
-  <version>10</version>
+  <version>11</version>
   <packaging>pom</packaging>
 
   <modules>
@@ -170,7 +170,7 @@
     <version.maven.release>2.5.3</version.maven.release>
     <version.maven.resources.plugin>3.2.0</version.maven.resources.plugin>
     <version.mockito.core>4.3.1</version.mockito.core>
-    <version.morphia.core>2.2.1</version.morphia.core>
+    <version.morphia.core>2.3.0</version.morphia.core>
     <version.mpd.parser>0.9</version.mpd.parser>
     <version.postgresql>42.5.1</version.postgresql>
     <version.powermock>2.0.9</version.powermock>
@@ -232,6 +232,14 @@
         <version>${project.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>${version.spring.boot}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
       <dependency>
         <groupId>javax.xml.bind</groupId>
         <artifactId>jaxb-api</artifactId>