diff --git a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/MainApplication.java b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/MainApplication.java
index 6a102e3e..d5e4d504 100644
--- a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/MainApplication.java
+++ b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/MainApplication.java
@@ -3,6 +3,7 @@ package eu.dnetlib.data.mdstore.manager;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.cache.annotation.EnableCaching;
 
 import eu.dnetlib.common.app.AbstractDnetApp;
@@ -15,6 +16,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @SpringBootApplication
 @EnableSwagger2
 @EnableCaching
+@EntityScan("eu.dnetlib.dhp.schema.mdstore")
 public class MainApplication extends AbstractDnetApp {
 
 	@Value("${dhp.swagger.api.host}")
diff --git a/pom.xml b/pom.xml
index 4b46556d..1771059f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,6 +141,12 @@
 				<groupId>eu.dnetlib.dhp</groupId>
 				<artifactId>dhp-schemas</artifactId>
 				<version>${dhp-schemas-version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>com.google.guava</groupId>
+						<artifactId>guava</artifactId>
+					</exclusion>
+				</exclusions> 
 			</dependency>
 
 			<dependency>