diff --git a/apps/dhp-mdstore-manager/pom.xml b/apps/dhp-mdstore-manager/pom.xml
index 6d8aa3bf..f201fb2c 100644
--- a/apps/dhp-mdstore-manager/pom.xml
+++ b/apps/dhp-mdstore-manager/pom.xml
@@ -68,20 +68,10 @@
 			<artifactId>parquet-avro</artifactId>
 			<version>1.5.0-cdh5.13.3</version>
 		</dependency>
-		<!-- DHP Common -->
+		<!-- DHP Schemas -->
 		<dependency>
 			<groupId>eu.dnetlib.dhp</groupId>
-			<artifactId>dhp-common</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>eu.dnetlib</groupId>
-					<artifactId>dnet-pace-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>eu.dnetlib.dhp</groupId>
-					<artifactId>dhp-schemas</artifactId>
-				</exclusion>
-			</exclusions>
+            <artifactId>dhp-schemas</artifactId>
 		</dependency>
 
 		<!-- JUnit -->
diff --git a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/controller/MDInspectorController.java b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/controller/MDInspectorController.java
index e094c685..970f3a80 100644
--- a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/controller/MDInspectorController.java
+++ b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/controller/MDInspectorController.java
@@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.servlet.ModelAndView;
 
-import eu.dnetlib.data.mdstore.manager.common.model.MDStoreVersion;
-import eu.dnetlib.data.mdstore.manager.common.model.MDStoreWithInfo;
+import eu.dnetlib.dhp.schema.mdstore.MDStoreVersion;
+import eu.dnetlib.dhp.schema.mdstore.MDStoreWithInfo;
 import eu.dnetlib.data.mdstore.manager.exceptions.MDStoreManagerException;
 import eu.dnetlib.data.mdstore.manager.utils.ControllerUtils;
 import eu.dnetlib.data.mdstore.manager.utils.DatabaseUtils;
diff --git a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/controller/MDStoreController.java b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/controller/MDStoreController.java
index 6b9b6f90..1803542d 100644
--- a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/controller/MDStoreController.java
+++ b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/controller/MDStoreController.java
@@ -18,8 +18,8 @@ import org.springframework.web.bind.annotation.RestController;
 import com.google.common.collect.Sets;
 
 import eu.dnetlib.common.controller.AbstractDnetController;
-import eu.dnetlib.data.mdstore.manager.common.model.MDStoreVersion;
-import eu.dnetlib.data.mdstore.manager.common.model.MDStoreWithInfo;
+import eu.dnetlib.dhp.schema.mdstore.MDStoreVersion;
+import eu.dnetlib.dhp.schema.mdstore.MDStoreWithInfo;
 import eu.dnetlib.data.mdstore.manager.exceptions.MDStoreManagerException;
 import eu.dnetlib.data.mdstore.manager.utils.DatabaseUtils;
 import eu.dnetlib.data.mdstore.manager.utils.HdfsClient;
diff --git a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreCurrentVersionRepository.java b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreCurrentVersionRepository.java
index e78a4dc1..3dc323e8 100644
--- a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreCurrentVersionRepository.java
+++ b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreCurrentVersionRepository.java
@@ -3,7 +3,7 @@ package eu.dnetlib.data.mdstore.manager.repository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import eu.dnetlib.data.mdstore.manager.common.model.MDStoreCurrentVersion;
+import eu.dnetlib.dhp.schema.mdstore.MDStoreCurrentVersion;
 
 @Repository
 public interface MDStoreCurrentVersionRepository extends JpaRepository<MDStoreCurrentVersion, String> {
diff --git a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreRepository.java b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreRepository.java
index 14c50020..0495a6fb 100644
--- a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreRepository.java
+++ b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreRepository.java
@@ -3,7 +3,7 @@ package eu.dnetlib.data.mdstore.manager.repository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import eu.dnetlib.data.mdstore.manager.common.model.MDStore;
+import eu.dnetlib.dhp.schema.mdstore.MDStore;
 
 @Repository
 public interface MDStoreRepository extends JpaRepository<MDStore, String> {
diff --git a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreVersionRepository.java b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreVersionRepository.java
index bfd868cf..cd14f347 100644
--- a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreVersionRepository.java
+++ b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreVersionRepository.java
@@ -3,7 +3,7 @@ package eu.dnetlib.data.mdstore.manager.repository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import eu.dnetlib.data.mdstore.manager.common.model.MDStoreVersion;
+import eu.dnetlib.dhp.schema.mdstore.MDStoreVersion;
 
 @Repository
 public interface MDStoreVersionRepository extends JpaRepository<MDStoreVersion, String> {
diff --git a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreWithInfoRepository.java b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreWithInfoRepository.java
index a13e0fd1..edc2b077 100644
--- a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreWithInfoRepository.java
+++ b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreWithInfoRepository.java
@@ -2,7 +2,7 @@ package eu.dnetlib.data.mdstore.manager.repository;
 
 import org.springframework.stereotype.Repository;
 
-import eu.dnetlib.data.mdstore.manager.common.model.MDStoreWithInfo;
+import eu.dnetlib.dhp.schema.mdstore.MDStoreWithInfo;
 
 @Repository
 public interface MDStoreWithInfoRepository extends ReadOnlyRepository<MDStoreWithInfo, String> {
diff --git a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/utils/DatabaseUtils.java b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/utils/DatabaseUtils.java
index fbce756a..c5f1551d 100644
--- a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/utils/DatabaseUtils.java
+++ b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/utils/DatabaseUtils.java
@@ -16,10 +16,10 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
-import eu.dnetlib.data.mdstore.manager.common.model.MDStore;
-import eu.dnetlib.data.mdstore.manager.common.model.MDStoreCurrentVersion;
-import eu.dnetlib.data.mdstore.manager.common.model.MDStoreVersion;
-import eu.dnetlib.data.mdstore.manager.common.model.MDStoreWithInfo;
+import eu.dnetlib.dhp.schema.mdstore.MDStore;
+import eu.dnetlib.dhp.schema.mdstore.MDStoreCurrentVersion;
+import eu.dnetlib.dhp.schema.mdstore.MDStoreVersion;
+import eu.dnetlib.dhp.schema.mdstore.MDStoreWithInfo;
 import eu.dnetlib.data.mdstore.manager.exceptions.MDStoreManagerException;
 import eu.dnetlib.data.mdstore.manager.repository.MDStoreCurrentVersionRepository;
 import eu.dnetlib.data.mdstore.manager.repository.MDStoreRepository;
diff --git a/apps/dhp-mdstore-manager/src/test/java/eu/dnetlib/data/mdstore/manager/controller/MDStoreControllerTest.java b/apps/dhp-mdstore-manager/src/test/java/eu/dnetlib/data/mdstore/manager/controller/MDStoreControllerTest.java
index 8134e6e0..1ab9b3a5 100644
--- a/apps/dhp-mdstore-manager/src/test/java/eu/dnetlib/data/mdstore/manager/controller/MDStoreControllerTest.java
+++ b/apps/dhp-mdstore-manager/src/test/java/eu/dnetlib/data/mdstore/manager/controller/MDStoreControllerTest.java
@@ -11,8 +11,8 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import eu.dnetlib.data.mdstore.manager.common.model.MDStoreVersion;
-import eu.dnetlib.data.mdstore.manager.common.model.MDStoreWithInfo;
+import eu.dnetlib.dhp.schema.mdstore.MDStoreVersion;
+import eu.dnetlib.dhp.schema.mdstore.MDStoreWithInfo;
 import eu.dnetlib.data.mdstore.manager.exceptions.MDStoreManagerException;
 import eu.dnetlib.data.mdstore.manager.utils.DatabaseUtils;
 
diff --git a/pom.xml b/pom.xml
index a73d0d79..4b46556d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,8 +139,8 @@
 
 			<dependency>
 				<groupId>eu.dnetlib.dhp</groupId>
-				<artifactId>dhp-common</artifactId>
-				<version>${dnet-hadoop-version}</version>
+				<artifactId>dhp-schemas</artifactId>
+				<version>${dhp-schemas-version}</version>
 			</dependency>
 
 			<dependency>
@@ -355,7 +355,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.compiler.plugin.version>3.6.0</maven.compiler.plugin.version>
 		<java.version>1.8</java.version>
-		<dnet-hadoop-version>1.2.4-branch_hadoop_aggregator</dnet-hadoop-version>
+		<dhp-schemas-version>2.3.6</dhp-schemas-version>
 		<apache.solr.version>7.1.0</apache.solr.version>
 		<mongodb.driver.version>3.4.2</mongodb.driver.version>
 		<springfox-version>2.8.0</springfox-version>