diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Funder.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Funder.java
new file mode 100644
index 0000000000..a49ca7aa49
--- /dev/null
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Funder.java
@@ -0,0 +1,35 @@
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import java.io.Serializable;
+
+public class Funder implements Serializable {
+    private String shortName;
+
+    private String name;
+
+    private String jurisdiction;
+
+    public String getJurisdiction() {
+        return jurisdiction;
+    }
+
+    public void setJurisdiction(String jurisdiction) {
+        this.jurisdiction = jurisdiction;
+    }
+
+    public String getShortName() {
+        return shortName;
+    }
+
+    public void setShortName(String shortName) {
+        this.shortName = shortName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Project.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Project.java
new file mode 100644
index 0000000000..70a3fbfbd1
--- /dev/null
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Project.java
@@ -0,0 +1,44 @@
+package eu.dnetlib.dhp.schema.dump.oaf;
+
+import java.io.Serializable;
+
+public class Project implements Serializable {
+    protected String id;// OpenAIRE id
+    protected String code;
+
+    protected String acronym;
+
+    protected String title;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getAcronym() {
+        return acronym;
+    }
+
+    public void setAcronym(String acronym) {
+        this.acronym = acronym;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+}
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Levels.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Levels.java
deleted file mode 100644
index 18c82140b6..0000000000
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Levels.java
+++ /dev/null
@@ -1,43 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf.graph;
-
-import java.io.Serializable;
-
-public class Levels implements Serializable {
-	private String level;
-	private String id;
-	private String description;
-	private String name;
-
-	public String getLevel() {
-		return level;
-	}
-
-	public void setLevel(String level) {
-		this.level = level;
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String il) {
-		this.id = il;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-}
diff --git a/dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/bulktag/community/QueryInformationSystem.java b/dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/bulktag/community/QueryInformationSystem.java
index 993a7ef775..e411aafd79 100644
--- a/dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/bulktag/community/QueryInformationSystem.java
+++ b/dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/bulktag/community/QueryInformationSystem.java
@@ -12,63 +12,63 @@ import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpException;
 import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService;
 
 public class QueryInformationSystem {
-	private static final String XQUERY = "for $x in collection('/db/DRIVER/ContextDSResources/ContextDSResourceType') "
-		+ "  let $subj := $x//CONFIGURATION/context/param[./@name='subject']/text() "
-		+ "  let $datasources := $x//CONFIGURATION/context/category[./@id=concat($x//CONFIGURATION/context/@id,'::contentproviders')]/concept  "
-		+ "  let $organizations := $x//CONFIGURATION/context/category[./@id=concat($x//CONFIGURATION/context/@id,'::resultorganizations')]/concept  "
-		+ "  let $communities := $x//CONFIGURATION/context/category[./@id=concat($x//CONFIGURATION/context/@id,'::zenodocommunities')]/concept  "
-		+
-		"let $zenodo := $x//param[./@name='zenodoCommunity']/text() "
-		+ "  where $x//CONFIGURATION/context[./@type='community' or ./@type='ri'] and $x//context/param[./@name = 'status']/text() != 'hidden'  "
-		+ "  return  "
-		+ "  <community>  "
-		+ "  { $x//CONFIGURATION/context/@id}  "
-		+ "  <subjects>  "
-		+ "  {for $y in tokenize($subj,',')  "
-		+ "  return  "
-		+ "  <subject>{$y}</subject>}  "
-		+ "  </subjects>  "
-		+ "  <datasources>  "
-		+ "  {for $d in $datasources  "
-		+ "  where $d/param[./@name='enabled']/text()='true'  "
-		+ "  return  "
-		+ "  <datasource>  "
-		+ "  <openaireId>  "
-		+ "  {$d//param[./@name='openaireId']/text()}  "
-		+ "  </openaireId>  "
-		+ "  <selcriteria>  "
-		+ "  {$d/param[./@name='selcriteria']/text()}  "
-		+ "  </selcriteria>  "
-		+ "  </datasource> } "
-		+ "  </datasources>  " +
-		"  <zenodocommunities>  " +
-		"{for $zc in $zenodo " +
-		"return " +
-		"<zenodocommunity> " +
-		"<zenodoid> " +
-		"{$zc} " +
-		"</zenodoid> " +
-		"</zenodocommunity>}"
-		+ "  {for $zc in $communities  "
-		+ "  return  "
-		+ "  <zenodocommunity>  "
-		+ "  <zenodoid>  "
-		+ "  {$zc/param[./@name='zenodoid']/text()} "
-		+ "  </zenodoid> "
-		+ "  <selcriteria> "
-		+ "  {$zc/param[./@name='selcriteria']/text()} "
-		+ "  </selcriteria> "
-		+ "  </zenodocommunity>} "
-		+ "  </zenodocommunities>  "
-		+ "  </community>";
+    private static final String XQUERY = "for $x in collection('/db/DRIVER/ContextDSResources/ContextDSResourceType') "
+            + "  let $subj := $x//CONFIGURATION/context/param[./@name='subject']/text() "
+            + "  let $datasources := $x//CONFIGURATION/context/category[./@id=concat($x//CONFIGURATION/context/@id,'::contentproviders')]/concept  "
+            + "  let $organizations := $x//CONFIGURATION/context/category[./@id=concat($x//CONFIGURATION/context/@id,'::resultorganizations')]/concept  "
+            + "  let $communities := $x//CONFIGURATION/context/category[./@id=concat($x//CONFIGURATION/context/@id,'::zenodocommunities')]/concept  "
+            +
+            "let $zenodo := $x//param[./@name='zenodoCommunity']/text() "
+            + "  where $x//CONFIGURATION/context[./@type='community' or ./@type='ri'] and $x//context/param[./@name = 'status']/text() != 'hidden'  "
+            + "  return  "
+            + "  <community>  "
+            + "  { $x//CONFIGURATION/context/@id}  "
+            + "  <subjects>  "
+            + "  {for $y in tokenize($subj,',')  "
+            + "  return  "
+            + "  <subject>{$y}</subject>}  "
+            + "  </subjects>  "
+            + "  <datasources>  "
+            + "  {for $d in $datasources  "
+            + "  where $d/param[./@name='enabled']/text()='true'  "
+            + "  return  "
+            + "  <datasource>  "
+            + "  <openaireId>  "
+            + "  {$d//param[./@name='openaireId']/text()}  "
+            + "  </openaireId>  "
+            + "  <selcriteria>  "
+            + "  {$d/param[./@name='selcriteria']/text()}  "
+            + "  </selcriteria>  "
+            + "  </datasource> } "
+            + "  </datasources>  " +
+            "  <zenodocommunities>  " +
+            "{for $zc in $zenodo " +
+            "return " +
+            "<zenodocommunity> " +
+            "<zenodoid> " +
+            "{$zc} " +
+            "</zenodoid> " +
+            "</zenodocommunity>}"
+            + "  {for $zc in $communities  "
+            + "  return  "
+            + "  <zenodocommunity>  "
+            + "  <zenodoid>  "
+            + "  {$zc/param[./@name='zenodoid']/text()} "
+            + "  </zenodoid> "
+            + "  <selcriteria> "
+            + "  {$zc/param[./@name='selcriteria']/text()} "
+            + "  </selcriteria> "
+            + "  </zenodocommunity>} "
+            + "  </zenodocommunities>  "
+            + "  </community>";
 
-	public static CommunityConfiguration getCommunityConfiguration(final String isLookupUrl)
-		throws ISLookUpException, DocumentException {
-		ISLookUpService isLookUp = ISLookupClientFactory.getLookUpService(isLookupUrl);
-		final List<String> res = isLookUp.quickSearchProfile(XQUERY);
+    public static CommunityConfiguration getCommunityConfiguration(final String isLookupUrl)
+            throws ISLookUpException, DocumentException {
+        ISLookUpService isLookUp = ISLookupClientFactory.getLookUpService(isLookupUrl);
+        final List<String> res = isLookUp.quickSearchProfile(XQUERY);
 
-		final String xmlConf = "<communities>" + Joiner.on(" ").join(res) + "</communities>";
+        final String xmlConf = "<communities>" + Joiner.on(" ").join(res) + "</communities>";
 
-		return CommunityConfigurationFactory.newInstance(xmlConf);
-	}
-}
+        return CommunityConfigurationFactory.newInstance(xmlConf);
+    }
+}
\ No newline at end of file