diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/statistics/AbstractUsageReportGenerator.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/statistics/AbstractUsageReportGenerator.java
index 940773547da..23c8f99e585 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/statistics/AbstractUsageReportGenerator.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/statistics/AbstractUsageReportGenerator.java
@@ -40,5 +40,6 @@ public String getRelation() {
     public void setRelation(String relation) {
         this.relation = relation;
     }
+
 }
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/statistics/StatisticsReportsConfiguration.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/statistics/StatisticsReportsConfiguration.java
index 3e366f7cc9d..8fef2b35853 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/statistics/StatisticsReportsConfiguration.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/statistics/StatisticsReportsConfiguration.java
@@ -11,6 +11,7 @@
 import java.util.Map;
 import java.util.Optional;
 
+import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.model.UsageReportCategoryRest;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Collection;
@@ -40,6 +41,13 @@ public List<UsageReportCategoryRest> getCategories(DSpaceObject dso) {
         } else if (dso instanceof Community) {
             return mapping.get("community");
         } else if (dso instanceof Collection) {
+            String entityType = getEntityType(dso);
+            if (StringUtils.isNotEmpty(entityType)) {
+                List<UsageReportCategoryRest> result = mapping.get("collection-" + entityType);
+                if (result != null) {
+                    return result;
+                }
+            }
             return mapping.get("collection");
         } else if (dso instanceof Item) {
             Item item = (Item) dso;
@@ -59,6 +67,16 @@ public List<UsageReportCategoryRest> getCategories(DSpaceObject dso) {
         return null;
     }
 
+    private String getEntityType(DSpaceObject dso) {
+        return dso.getMetadata()
+                  .stream()
+                  .filter(metadataValue ->
+                      "dspace.entity.type".equals(metadataValue.getMetadataField().toString('.')))
+                  .map(MetadataValue::getValue)
+                  .findFirst()
+                  .orElse("");
+    }
+
     public UsageReportGenerator getReportGenerator(DSpaceObject dso, String reportId) {
         List<UsageReportCategoryRest> categories = getCategories(dso);
         Optional<UsageReportCategoryRest> cat = categories.stream().filter(x -> x.getReports().containsKey(reportId))
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/statistics/TopCategoriesGenerator.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/statistics/TopCategoriesGenerator.java
index 39d8a1730c0..fbba8f902ee 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/statistics/TopCategoriesGenerator.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/statistics/TopCategoriesGenerator.java
@@ -10,6 +10,7 @@
 import static org.dspace.core.Constants.ITEM;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -24,6 +25,7 @@
 import org.dspace.core.Context;
 import org.dspace.discovery.configuration.DiscoveryConfiguration;
 import org.dspace.discovery.configuration.DiscoveryConfigurationService;
+import org.dspace.services.ConfigurationService;
 import org.dspace.statistics.content.StatisticsDatasetDisplay;
 import org.dspace.statistics.service.SolrLoggerService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +42,9 @@ public class TopCategoriesGenerator extends AbstractUsageReportGenerator {
     @Autowired
     private SolrLoggerService solrLoggerService;
 
+    @Autowired
+    private ConfigurationService configurationService;
+
     @Autowired
     private DiscoveryConfigurationService discoveryConfigurationService;
 
@@ -67,8 +72,8 @@ private Map<String, Integer> getCategoriesCount(DSpaceObject dso, String startDa
 
         Map<String, Integer> categoriesCount = new HashMap<String, Integer>();
 
-        for (String category : categoryQueries.keySet()) {
-            String categoryQuery = categoryQueries.get(category);
+        for (String category : getCategoryQueries().keySet()) {
+            String categoryQuery = getCategoryQueries().get(category);
             Integer categoryCount = getCategoryCount(dso, discoveryConfiguration, categoryQuery, startDate, endDate);
             categoriesCount.put(category, categoryCount);
         }
@@ -105,7 +110,7 @@ private String composeCategoryQuery(DSpaceObject dso, DiscoveryConfiguration con
     }
 
     private String getAllCategoryQueriesReverted() {
-        return categoryQueries.values().stream()
+        return getCategoryQueries().values().stream()
             .filter(categoryQuery -> !OTHER_CATEGORY.equals(categoryQuery))
             .map(categoryQuery -> "-" + formatCategoryQuery(categoryQuery))
             .collect(Collectors.joining(" AND "));
@@ -130,10 +135,26 @@ public String getReportType() {
     }
 
     public Map<String, String> getCategoryQueries() {
+        if (categoryQueries == null) {
+            return getDefaultCategoryQueries();
+        }
         return categoryQueries;
     }
 
     public void setCategoryQueries(Map<String, String> categoryQueries) {
         this.categoryQueries = categoryQueries;
     }
+
+    private Map<String, String> getDefaultCategoryQueries() {
+        return Arrays.stream(getDefaultEntityTypes())
+                     .collect(Collectors.toMap(
+                         type -> type.toLowerCase(),
+                         type -> "entityType_keyword: '" + type + "'"
+                     ));
+    }
+
+    private String[] getDefaultEntityTypes() {
+        return configurationService.getArrayProperty("cris.entity-type");
+    }
+
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/StatisticsRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/StatisticsRestRepositoryIT.java
index 68dee1555f7..b0d740142c9 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/StatisticsRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/StatisticsRestRepositoryIT.java
@@ -1296,21 +1296,20 @@ public void usageReportsSearch_Site_mainReports() throws Exception {
         context.turnOffAuthorisationSystem();
         Site site = SiteBuilder.createSite(context).build();
         Item item = ItemBuilder.createItem(context, collectionNotVisited)
+            .withEntityType("Publication")
             .withTitle("My item")
-            .withType("Controlled Vocabulary for Resource Type Genres::image")
             .build();
         Item item2 = ItemBuilder.createItem(context, collectionNotVisited)
+            .withEntityType("Patent")
             .withTitle("My item 2")
-            .withType("Controlled Vocabulary for Resource Type Genres::thesis")
             .build();
         Item item3 = ItemBuilder.createItem(context, collectionNotVisited)
+            .withEntityType("Funding")
             .withTitle("My item 3")
-            .withType("Controlled Vocabulary for Resource Type Genres::thesis::bachelor thesis")
             .build();
         Item item4 = ItemBuilder.createItem(context, collectionNotVisited)
+            .withEntityType("Project")
             .withTitle("My item 4")
-            .withType("Controlled Vocabulary for Resource Type Genres::text::periodical::"
-                + "journal::contribution to journal::journal article")
             .build();
         context.restoreAuthSystemState();
 
@@ -1395,32 +1394,49 @@ public void usageReportsSearch_Site_mainReports() throws Exception {
         pointCountry.addValue("views", 5);
         pointCountry.setIdAndLabel(Locale.US.getCountry(), Locale.US.getDisplayCountry(context.getCurrentLocale()));
 
-        UsageReportPointCategoryRest articleCategory = new UsageReportPointCategoryRest();
-        articleCategory.addValue("views", 1);
-        articleCategory.setId("article");
+        UsageReportPointCategoryRest publicationCategory = new UsageReportPointCategoryRest();
+        publicationCategory.addValue("views", 1);
+        publicationCategory.setId("publication");
 
-        UsageReportPointCategoryRest thesisCategory = new UsageReportPointCategoryRest();
-        thesisCategory.addValue("views", 3);
-        thesisCategory.setId("thesis");
+        UsageReportPointCategoryRest patentCategory = new UsageReportPointCategoryRest();
+        patentCategory.addValue("views", 2);
+        patentCategory.setId("patent");
 
-        UsageReportPointCategoryRest otherCategory = new UsageReportPointCategoryRest();
-        otherCategory.addValue("views", 1);
-        otherCategory.setId("other");
+        UsageReportPointCategoryRest fundingCategory = new UsageReportPointCategoryRest();
+        fundingCategory.addValue("views", 1);
+        fundingCategory.setId("funding");
 
-        UsageReportPointCategoryRest bookCategory = new UsageReportPointCategoryRest();
-        bookCategory.addValue("views", 0);
-        bookCategory.setId("book");
+        UsageReportPointCategoryRest projectCategory = new UsageReportPointCategoryRest();
+        projectCategory.addValue("views", 1);
+        projectCategory.setId("project");
 
-        UsageReportPointCategoryRest bookChapterCategory = new UsageReportPointCategoryRest();
-        bookChapterCategory.addValue("views", 0);
-        bookChapterCategory.setId("bookChapter");
+        UsageReportPointCategoryRest productCategory = new UsageReportPointCategoryRest();
+        productCategory.addValue("views", 0);
+        productCategory.setId("product");
 
-        UsageReportPointCategoryRest datasetCategory = new UsageReportPointCategoryRest();
-        datasetCategory.addValue("views", 0);
-        datasetCategory.setId("dataset");
+        UsageReportPointCategoryRest journalCategory = new UsageReportPointCategoryRest();
+        journalCategory.addValue("views", 0);
+        journalCategory.setId("journal");
 
-        List<UsageReportPointRest> categories = List.of(articleCategory, thesisCategory, otherCategory, bookCategory,
-            bookChapterCategory, datasetCategory);
+        UsageReportPointCategoryRest personCategory = new UsageReportPointCategoryRest();
+        personCategory.addValue("views", 0);
+        personCategory.setId("person");
+
+        UsageReportPointCategoryRest orgUnitCategory = new UsageReportPointCategoryRest();
+        orgUnitCategory.addValue("views", 0);
+        orgUnitCategory.setId("orgunit");
+
+        UsageReportPointCategoryRest equipmentCategory = new UsageReportPointCategoryRest();
+        equipmentCategory.addValue("views", 0);
+        equipmentCategory.setId("equipment");
+
+        UsageReportPointCategoryRest eventCategory = new UsageReportPointCategoryRest();
+        eventCategory.addValue("views", 0);
+        eventCategory.setId("event");
+
+        List<UsageReportPointRest> categories = List.of(publicationCategory, patentCategory, fundingCategory,
+            projectCategory, productCategory, journalCategory, personCategory, orgUnitCategory,
+            equipmentCategory, eventCategory);
 
         // And request the sites global usage report (show top most popular items)
         getClient(adminToken)
@@ -1956,32 +1972,50 @@ public void usageReportsSearch_ItemNotVisited_AtTime() throws Exception {
         expectedPoint1.setType("item");
         points.add(expectedPoint1);
 
-        UsageReportPointCategoryRest articleCategory = new UsageReportPointCategoryRest();
-        articleCategory.addValue("views", 0);
-        articleCategory.setId("article");
 
-        UsageReportPointCategoryRest thesisCategory = new UsageReportPointCategoryRest();
-        thesisCategory.addValue("views", 0);
-        thesisCategory.setId("thesis");
+        UsageReportPointCategoryRest publicationCategory = new UsageReportPointCategoryRest();
+        publicationCategory.addValue("views", 0);
+        publicationCategory.setId("publication");
 
-        UsageReportPointCategoryRest otherCategory = new UsageReportPointCategoryRest();
-        otherCategory.addValue("views", 0);
-        otherCategory.setId("other");
+        UsageReportPointCategoryRest patentCategory = new UsageReportPointCategoryRest();
+        patentCategory.addValue("views", 0);
+        patentCategory.setId("patent");
 
-        UsageReportPointCategoryRest bookCategory = new UsageReportPointCategoryRest();
-        bookCategory.addValue("views", 0);
-        bookCategory.setId("book");
+        UsageReportPointCategoryRest fundingCategory = new UsageReportPointCategoryRest();
+        fundingCategory.addValue("views", 0);
+        fundingCategory.setId("funding");
 
-        UsageReportPointCategoryRest bookChapterCategory = new UsageReportPointCategoryRest();
-        bookChapterCategory.addValue("views", 0);
-        bookChapterCategory.setId("bookChapter");
+        UsageReportPointCategoryRest projectCategory = new UsageReportPointCategoryRest();
+        projectCategory.addValue("views", 0);
+        projectCategory.setId("project");
 
-        UsageReportPointCategoryRest datasetCategory = new UsageReportPointCategoryRest();
-        datasetCategory.addValue("views", 0);
-        datasetCategory.setId("dataset");
+        UsageReportPointCategoryRest productCategory = new UsageReportPointCategoryRest();
+        productCategory.addValue("views", 0);
+        productCategory.setId("product");
 
-        List<UsageReportPointRest> categories = List.of(articleCategory, thesisCategory, otherCategory, bookCategory,
-            bookChapterCategory, datasetCategory);
+        UsageReportPointCategoryRest journalCategory = new UsageReportPointCategoryRest();
+        journalCategory.addValue("views", 0);
+        journalCategory.setId("journal");
+
+        UsageReportPointCategoryRest personCategory = new UsageReportPointCategoryRest();
+        personCategory.addValue("views", 0);
+        personCategory.setId("person");
+
+        UsageReportPointCategoryRest orgUnitCategory = new UsageReportPointCategoryRest();
+        orgUnitCategory.addValue("views", 0);
+        orgUnitCategory.setId("orgunit");
+
+        UsageReportPointCategoryRest equipmentCategory = new UsageReportPointCategoryRest();
+        equipmentCategory.addValue("views", 0);
+        equipmentCategory.setId("equipment");
+
+        UsageReportPointCategoryRest eventCategory = new UsageReportPointCategoryRest();
+        eventCategory.addValue("views", 0);
+        eventCategory.setId("event");
+
+        List<UsageReportPointRest> categories = List.of(publicationCategory, patentCategory, fundingCategory,
+            projectCategory, productCategory, journalCategory, personCategory, orgUnitCategory,
+            equipmentCategory, eventCategory);
 
         UsageReportPointRest pointPerMonth = new UsageReportPointDateRest();
         pointPerMonth.setId("June 2019");
@@ -2445,6 +2479,11 @@ public void usageReportsSearch_OrgUnitWithPublicationVisited() throws Exception
     public void usageReportsSearch_Collection_ItemReports() throws Exception {
         context.turnOffAuthorisationSystem();
 
+        Community community = CommunityBuilder.createCommunity(context).build();
+        collectionNotVisited = CollectionBuilder.createCollection(context, community)
+                                                .withEntityType("Publication")
+                                                .build();
+
         Item item = ItemBuilder.createItem(context, collectionNotVisited)
                                .withTitle("My item")
                                .withType("Controlled Vocabulary for Resource Type Genres::image")
@@ -2575,7 +2614,7 @@ public void usageReportsSearch_Collection_ItemReports() throws Exception {
         // And request the collections global usage report (show top most popular items)
         getClient(adminToken)
             .perform(get("/api/statistics/usagereports/search/object")
-                .param("category", "collection-itemReports")
+                .param("category", "publicationCollection-itemReports")
                 .param("uri", "http://localhost:8080/server/api/core/collections/" + collectionNotVisited.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.usagereports", not(empty())))
@@ -2701,21 +2740,20 @@ public void usageReportsSearch_Community_ItemReports() throws Exception {
         collectionNotVisited = CollectionBuilder.createCollection(context, community).build();
 
         Item item = ItemBuilder.createItem(context, collectionNotVisited)
+                               .withEntityType("Publication")
                                .withTitle("My item")
-                               .withType("Controlled Vocabulary for Resource Type Genres::image")
                                .build();
         Item item2 = ItemBuilder.createItem(context, collectionNotVisited)
+                                .withEntityType("Patent")
                                 .withTitle("My item 2")
-                                .withType("Controlled Vocabulary for Resource Type Genres::thesis")
                                 .build();
         Item item3 = ItemBuilder.createItem(context, collectionNotVisited)
+                                .withEntityType("Funding")
                                 .withTitle("My item 3")
-                                .withType("Controlled Vocabulary for Resource Type Genres::thesis::bachelor thesis")
                                 .build();
         Item item4 = ItemBuilder.createItem(context, collectionNotVisited)
+                                .withEntityType("Project")
                                 .withTitle("My item 4")
-                                .withType("Controlled Vocabulary for Resource Type Genres::text::periodical::"
-                                    + "journal::contribution to journal::journal article")
                                 .build();
         context.restoreAuthSystemState();
 
@@ -2800,33 +2838,49 @@ public void usageReportsSearch_Community_ItemReports() throws Exception {
         pointCountry.addValue("views", 5);
         pointCountry.setIdAndLabel(Locale.US.getCountry(), Locale.US.getDisplayCountry(context.getCurrentLocale()));
 
-        UsageReportPointCategoryRest articleCategory = new UsageReportPointCategoryRest();
-        articleCategory.addValue("views", 1);
-        articleCategory.setId("article");
+        UsageReportPointCategoryRest publicationCategory = new UsageReportPointCategoryRest();
+        publicationCategory.addValue("views", 1);
+        publicationCategory.setId("publication");
 
-        UsageReportPointCategoryRest thesisCategory = new UsageReportPointCategoryRest();
-        thesisCategory.addValue("views", 3);
-        thesisCategory.setId("thesis");
+        UsageReportPointCategoryRest patentCategory = new UsageReportPointCategoryRest();
+        patentCategory.addValue("views", 2);
+        patentCategory.setId("patent");
 
-        UsageReportPointCategoryRest otherCategory = new UsageReportPointCategoryRest();
-        otherCategory.addValue("views", 1);
-        otherCategory.setId("other");
+        UsageReportPointCategoryRest fundingCategory = new UsageReportPointCategoryRest();
+        fundingCategory.addValue("views", 1);
+        fundingCategory.setId("funding");
 
-        UsageReportPointCategoryRest bookCategory = new UsageReportPointCategoryRest();
-        bookCategory.addValue("views", 0);
-        bookCategory.setId("book");
+        UsageReportPointCategoryRest projectCategory = new UsageReportPointCategoryRest();
+        projectCategory.addValue("views", 1);
+        projectCategory.setId("project");
 
-        UsageReportPointCategoryRest bookChapterCategory = new UsageReportPointCategoryRest();
-        bookChapterCategory.addValue("views", 0);
-        bookChapterCategory.setId("bookChapter");
+        UsageReportPointCategoryRest productCategory = new UsageReportPointCategoryRest();
+        productCategory.addValue("views", 0);
+        productCategory.setId("product");
 
-        UsageReportPointCategoryRest datasetCategory = new UsageReportPointCategoryRest();
-        datasetCategory.addValue("views", 0);
-        datasetCategory.setId("dataset");
+        UsageReportPointCategoryRest journalCategory = new UsageReportPointCategoryRest();
+        journalCategory.addValue("views", 0);
+        journalCategory.setId("journal");
 
-        List<UsageReportPointRest> categories = List.of(articleCategory, thesisCategory, otherCategory, bookCategory,
-            bookChapterCategory, datasetCategory);
+        UsageReportPointCategoryRest personCategory = new UsageReportPointCategoryRest();
+        personCategory.addValue("views", 0);
+        personCategory.setId("person");
+
+        UsageReportPointCategoryRest orgUnitCategory = new UsageReportPointCategoryRest();
+        orgUnitCategory.addValue("views", 0);
+        orgUnitCategory.setId("orgunit");
+
+        UsageReportPointCategoryRest equipmentCategory = new UsageReportPointCategoryRest();
+        equipmentCategory.addValue("views", 0);
+        equipmentCategory.setId("equipment");
+
+        UsageReportPointCategoryRest eventCategory = new UsageReportPointCategoryRest();
+        eventCategory.addValue("views", 0);
+        eventCategory.setId("event");
 
+        List<UsageReportPointRest> categories = List.of(publicationCategory, patentCategory, fundingCategory,
+            projectCategory, productCategory, journalCategory, personCategory, orgUnitCategory,
+            equipmentCategory, eventCategory);
         // And request the collections global usage report (show top most popular items)
         getClient(adminToken)
             .perform(get("/api/statistics/usagereports/search/object")
diff --git a/dspace/config/spring/rest/statistics.xml b/dspace/config/spring/rest/statistics.xml
index 23b528eddcb..2ec3f3be3ee 100644
--- a/dspace/config/spring/rest/statistics.xml
+++ b/dspace/config/spring/rest/statistics.xml
@@ -2,10 +2,13 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
                   http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
                   http://www.springframework.org/schema/context
-                  http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+                  http://www.springframework.org/schema/context/spring-context-2.5.xsd
+                  http://www.springframework.org/schema/util
+                  http://www.springframework.org/schema/util/spring-util.xsd">
 
     <context:annotation-config/> <!-- allows us to use spring annotations in beans -->
 
@@ -405,16 +408,6 @@
     <bean id="topSiteCategoriesGenerator" class="org.dspace.app.rest.statistics.TopCategoriesGenerator" >
         <property name="viewMode" value="chart.pie"/>
         <property name="maxResults" value="10"/>
-        <property name="categoryQueries">
-            <map>
-                <entry key="article" value="itemtype_keyword: ( 'research article' OR 'journal article' )"/>
-                <entry key="book" value="itemtype_keyword: 'book'"/>
-                <entry key="bookChapter" value="itemtype_keyword: 'book part'"/>
-                <entry key="dataset" value="itemtype_keyword: ( 'dataset' OR 'interview' ) "/>
-                <entry key="thesis" value="itemtype_keyword: ( 'thesis' OR 'bachelor thesis' OR 'doctoral thesis' OR 'master thesis' )"/>
-                <entry key="other" value="OTHER"/>
-            </map>
-        </property>
     </bean>
 
     <bean id="topContinentsGeneratorRelationCollection" class="org.dspace.app.rest.statistics.TopContinentsGenerator">
@@ -449,18 +442,111 @@
         <property name="viewMode" value="chart.pie"/>
         <property name="maxResults" value="10"/>
         <property name="relation" value="RELATION.Collection.items"/>
-        <property name="categoryQueries">
-            <map>
-                <entry key="article" value="itemtype_keyword: ( 'research article' OR 'journal article' )"/>
-                <entry key="book" value="itemtype_keyword: 'book'"/>
-                <entry key="bookChapter" value="itemtype_keyword: 'book part'"/>
-                <entry key="dataset" value="itemtype_keyword: ( 'dataset' OR 'interview' ) "/>
-                <entry key="thesis" value="itemtype_keyword: ( 'thesis' OR 'bachelor thesis' OR 'doctoral thesis' OR 'master thesis' )"/>
-                <entry key="other" value="OTHER"/>
-            </map>
-        </property>
     </bean>
 
+    <bean id="topCategoriesGeneratorRelationPublicationCollection" class="org.dspace.app.rest.statistics.TopCategoriesGenerator" >
+        <property name="viewMode" value="chart.pie"/>
+        <property name="maxResults" value="10"/>
+        <property name="relation" value="RELATION.Collection.items"/>
+        <property name="categoryQueries" ref="publicationCategoryQueries"/>
+    </bean>
+
+    <bean id="topCategoriesGeneratorRelationProjectCollection" class="org.dspace.app.rest.statistics.TopCategoriesGenerator" >
+        <property name="viewMode" value="chart.pie"/>
+        <property name="maxResults" value="10"/>
+        <property name="relation" value="RELATION.Collection.items"/>
+        <property name="categoryQueries" ref="projectCategoryQueries"/>
+    </bean>
+
+    <bean id="topCategoriesGeneratorRelationFundingCollection" class="org.dspace.app.rest.statistics.TopCategoriesGenerator" >
+        <property name="viewMode" value="chart.pie"/>
+        <property name="maxResults" value="10"/>
+        <property name="relation" value="RELATION.Collection.items"/>
+        <property name="categoryQueries" ref="fundingCategoryQueries"/>
+    </bean>
+
+    <bean id="topCategoriesGeneratorRelationOrgUnitCollection" class="org.dspace.app.rest.statistics.TopCategoriesGenerator" >
+        <property name="viewMode" value="chart.pie"/>
+        <property name="maxResults" value="10"/>
+        <property name="relation" value="RELATION.Collection.items"/>
+        <property name="categoryQueries" ref="orgUnitCategoryQueries"/>
+    </bean>
+
+    <bean id="topCategoriesGeneratorRelationProductCollection" class="org.dspace.app.rest.statistics.TopCategoriesGenerator" >
+        <property name="viewMode" value="chart.pie"/>
+        <property name="maxResults" value="10"/>
+        <property name="relation" value="RELATION.Collection.items"/>
+        <property name="categoryQueries" ref="productCategoryQueries"/>
+    </bean>
+
+    <bean id="topCategoriesGeneratorRelationPatentCollection" class="org.dspace.app.rest.statistics.TopCategoriesGenerator" >
+        <property name="viewMode" value="chart.pie"/>
+        <property name="maxResults" value="10"/>
+        <property name="relation" value="RELATION.Collection.items"/>
+        <property name="categoryQueries" ref="patentCategoryQueries"/>
+    </bean>
+
+    <bean id="topCategoriesGeneratorRelationEventCollection" class="org.dspace.app.rest.statistics.TopCategoriesGenerator" >
+        <property name="viewMode" value="chart.pie"/>
+        <property name="maxResults" value="10"/>
+        <property name="relation" value="RELATION.Collection.items"/>
+        <property name="categoryQueries" ref="eventCategoryQueries"/>
+    </bean>
+
+    <bean id="topCategoriesGeneratorRelationPersonCollection" class="org.dspace.app.rest.statistics.TopCategoriesGenerator" >
+        <property name="viewMode" value="chart.pie"/>
+        <property name="maxResults" value="10"/>
+        <property name="relation" value="RELATION.Collection.items"/>
+        <property name="categoryQueries" ref="personCategoryQueries"/>
+    </bean>
+
+    <util:map id="publicationCategoryQueries" map-class="java.util.HashMap">
+        <entry key="article" value="itemtype_keyword: ( 'research article' OR 'journal article' )"/>
+        <entry key="book" value="itemtype_keyword: 'book'"/>
+        <entry key="bookChapter" value="itemtype_keyword: 'book part'"/>
+        <entry key="dataset" value="itemtype_keyword: ( 'dataset' OR 'interview' ) "/>
+        <entry key="thesis" value="itemtype_keyword: ( 'thesis' OR 'bachelor thesis' OR 'doctoral thesis' OR 'master thesis' )"/>
+        <entry key="other" value="OTHER"/>
+    </util:map>
+
+    <util:map id="projectCategoryQueries" map-class="java.util.HashMap">
+        <entry key="basic research" value="itemtype_keyword: 'basic research'"/>
+        <entry key="applied research" value="itemtype_keyword: 'applied research'"/>
+    </util:map>
+
+    <util:map id="fundingCategoryQueries" map-class="java.util.HashMap">
+        <entry key="gift" value="itemtype_keyword: 'Gift'"/>
+        <entry key="internalFunding" value="itemtype_keyword: 'Internal Funding'"/>
+        <entry key="contract" value="itemtype_keyword: 'Contract'"/>
+        <entry key="Award" value="itemtype_keyword: 'Award'"/>
+        <entry key="grant" value="itemtype_keyword: 'Grant'"/>
+    </util:map>
+
+    <util:map id="orgUnitCategoryQueries" map-class="java.util.HashMap">
+        <entry key="university" value="itemtype_keyword: 'University'"/>
+        <entry key="company" value="itemtype_keyword: 'Company'"/>
+        <entry key="government" value="itemtype_keyword: 'Government'"/>
+    </util:map>
+
+    <util:map id="productCategoryQueries" map-class="java.util.HashMap">
+        <entry key="map" value="itemtype_keyword: 'map'"/>
+        <entry key="dataset" value="itemtype_keyword: ('clinical trial data' OR 'aggregated data' OR 'compiled data')"/>
+    </util:map>
+
+    <util:map id="patentCategoryQueries" map-class="java.util.HashMap">
+        <entry key="design" value="itemtype_keyword: 'design patent'"/>
+        <entry key="plant" value="itemtype_keyword: 'plant patent'"/>
+    </util:map>
+
+    <util:map id="eventCategoryQueries" map-class="java.util.HashMap">
+        <entry key="conference" value="itemtype_keyword: 'Conference'"/>
+        <entry key="workshop" value="itemtype_keyword: 'Workshop'"/>
+    </util:map>
+
+    <util:map id="personCategoryQueries" map-class="java.util.HashMap">
+        <entry key="person" value="itemtype_keyword: 'Person'"/>
+    </util:map>
+
     <bean id="totalVisitPerPeriodRelationCollection" class="org.dspace.app.rest.statistics.TotalVisitPerPeriodGenerator">
         <property name="viewMode" value="chart.line"/>
         <property name="periodType" value="month"/>
@@ -501,16 +587,6 @@
         <property name="viewMode" value="chart.pie"/>
         <property name="maxResults" value="10"/>
         <property name="relation" value="RELATION.Community.items"/>
-        <property name="categoryQueries">
-            <map>
-                <entry key="article" value="itemtype_keyword: ( 'research article' OR 'journal article' )"/>
-                <entry key="book" value="itemtype_keyword: 'book'"/>
-                <entry key="bookChapter" value="itemtype_keyword: 'book part'"/>
-                <entry key="dataset" value="itemtype_keyword: ( 'dataset' OR 'interview' ) "/>
-                <entry key="thesis" value="itemtype_keyword: ( 'thesis' OR 'bachelor thesis' OR 'doctoral thesis' OR 'master thesis' )"/>
-                <entry key="other" value="OTHER"/>
-            </map>
-        </property>
     </bean>
 
     <bean id="totalVisitPerPeriodRelationCommunity" class="org.dspace.app.rest.statistics.TotalVisitPerPeriodGenerator">
@@ -801,6 +877,123 @@
         </property>
     </bean>
 
+    <bean id="publicationCollection-itemReports" class="org.dspace.app.rest.model.UsageReportCategoryRest">
+        <property name="categoryType" value="itemReports"/>
+        <property name="reports">
+            <map>
+                <entry key="TopItemsContinents" value-ref="topContinentsGeneratorRelationCollection"/>
+                <entry key="TopItemsCountries" value-ref="topCountriesGeneratorRelationCollection"/>
+                <entry key="TopItemsCities" value-ref="topCitiesGeneratorRelationCollection"/>
+                <entry key="TotalItemsVisits" value-ref="topItemsGeneratorRelationCollection"/>
+                <entry key="TopItemsCategories" value-ref="topCategoriesGeneratorRelationPublicationCollection"/>
+                <entry key="TotalItemsVisitsPerMonth" value-ref="totalVisitPerPeriodRelationCollection"/>
+            </map>
+        </property>
+    </bean>
+
+    <bean id="projectCollection-itemReports" class="org.dspace.app.rest.model.UsageReportCategoryRest">
+        <property name="categoryType" value="itemReports"/>
+        <property name="reports">
+            <map>
+                <entry key="TopItemsContinents" value-ref="topContinentsGeneratorRelationCollection"/>
+                <entry key="TopItemsCountries" value-ref="topCountriesGeneratorRelationCollection"/>
+                <entry key="TopItemsCities" value-ref="topCitiesGeneratorRelationCollection"/>
+                <entry key="TotalItemsVisits" value-ref="topItemsGeneratorRelationCollection"/>
+                <entry key="TopItemsCategories" value-ref="topCategoriesGeneratorRelationProjectCollection"/>
+                <entry key="TotalItemsVisitsPerMonth" value-ref="totalVisitPerPeriodRelationCollection"/>
+            </map>
+        </property>
+    </bean>
+
+    <bean id="fundingCollection-itemReports" class="org.dspace.app.rest.model.UsageReportCategoryRest">
+        <property name="categoryType" value="itemReports"/>
+        <property name="reports">
+            <map>
+                <entry key="TopItemsContinents" value-ref="topContinentsGeneratorRelationCollection"/>
+                <entry key="TopItemsCountries" value-ref="topCountriesGeneratorRelationCollection"/>
+                <entry key="TopItemsCities" value-ref="topCitiesGeneratorRelationCollection"/>
+                <entry key="TotalItemsVisits" value-ref="topItemsGeneratorRelationCollection"/>
+                <entry key="TopItemsCategories" value-ref="topCategoriesGeneratorRelationFundingCollection"/>
+                <entry key="TotalItemsVisitsPerMonth" value-ref="totalVisitPerPeriodRelationCollection"/>
+            </map>
+        </property>
+    </bean>
+
+    <bean id="orgUnitCollection-itemReports" class="org.dspace.app.rest.model.UsageReportCategoryRest">
+        <property name="categoryType" value="itemReports"/>
+        <property name="reports">
+            <map>
+                <entry key="TopItemsContinents" value-ref="topContinentsGeneratorRelationCollection"/>
+                <entry key="TopItemsCountries" value-ref="topCountriesGeneratorRelationCollection"/>
+                <entry key="TopItemsCities" value-ref="topCitiesGeneratorRelationCollection"/>
+                <entry key="TotalItemsVisits" value-ref="topItemsGeneratorRelationCollection"/>
+                <entry key="TopItemsCategories" value-ref="topCategoriesGeneratorRelationOrgUnitCollection"/>
+                <entry key="TotalItemsVisitsPerMonth" value-ref="totalVisitPerPeriodRelationCollection"/>
+            </map>
+        </property>
+    </bean>
+
+    <bean id="productCollection-itemReports" class="org.dspace.app.rest.model.UsageReportCategoryRest">
+        <property name="categoryType" value="itemReports"/>
+        <property name="reports">
+            <map>
+                <entry key="TopItemsContinents" value-ref="topContinentsGeneratorRelationCollection"/>
+                <entry key="TopItemsCountries" value-ref="topCountriesGeneratorRelationCollection"/>
+                <entry key="TopItemsCities" value-ref="topCitiesGeneratorRelationCollection"/>
+                <entry key="TotalItemsVisits" value-ref="topItemsGeneratorRelationCollection"/>
+                <entry key="TopItemsCategories" value-ref="topCategoriesGeneratorRelationProductCollection"/>
+                <entry key="TotalItemsVisitsPerMonth" value-ref="totalVisitPerPeriodRelationCollection"/>
+            </map>
+        </property>
+    </bean>
+
+    <bean id="patentCollection-itemReports" class="org.dspace.app.rest.model.UsageReportCategoryRest">
+        <property name="categoryType" value="itemReports"/>
+        <property name="reports">
+            <map>
+                <entry key="TopItemsContinents" value-ref="topContinentsGeneratorRelationCollection"/>
+                <entry key="TopItemsCountries" value-ref="topCountriesGeneratorRelationCollection"/>
+                <entry key="TopItemsCities" value-ref="topCitiesGeneratorRelationCollection"/>
+                <entry key="TotalItemsVisits" value-ref="topItemsGeneratorRelationCollection"/>
+                <entry key="TopItemsCategories" value-ref="topCategoriesGeneratorRelationPatentCollection"/>
+                <entry key="TotalItemsVisitsPerMonth" value-ref="totalVisitPerPeriodRelationCollection"/>
+            </map>
+        </property>
+    </bean>
+
+    <bean id="eventCollection-itemReports" class="org.dspace.app.rest.model.UsageReportCategoryRest">
+        <property name="categoryType" value="itemReports"/>
+        <property name="reports">
+            <map>
+                <entry key="TopItemsContinents" value-ref="topContinentsGeneratorRelationCollection"/>
+                <entry key="TopItemsCountries" value-ref="topCountriesGeneratorRelationCollection"/>
+                <entry key="TopItemsCities" value-ref="topCitiesGeneratorRelationCollection"/>
+                <entry key="TotalItemsVisits" value-ref="topItemsGeneratorRelationCollection"/>
+                <entry key="TopItemsCategories" value-ref="topCategoriesGeneratorRelationEventCollection"/>
+                <entry key="TotalItemsVisitsPerMonth" value-ref="totalVisitPerPeriodRelationCollection"/>
+            </map>
+        </property>
+    </bean>
+
+    <!--
+        disabled the category tab of person collection
+        if needed just uncomment the below line and configure the different types of person
+    -->
+
+    <bean id="personCollection-itemReports" class="org.dspace.app.rest.model.UsageReportCategoryRest">
+        <property name="categoryType" value="itemReports"/>
+        <property name="reports">
+            <map>
+                <entry key="TopItemsContinents" value-ref="topContinentsGeneratorRelationCollection"/>
+                <entry key="TopItemsCountries" value-ref="topCountriesGeneratorRelationCollection"/>
+                <entry key="TopItemsCities" value-ref="topCitiesGeneratorRelationCollection"/>
+                <entry key="TotalItemsVisits" value-ref="topItemsGeneratorRelationCollection"/>
+<!--                <entry key="TopItemsCategories" value-ref="topCategoriesGeneratorRelationPersonCollection"/>-->
+                <entry key="TotalItemsVisitsPerMonth" value-ref="totalVisitPerPeriodRelationCollection"/>
+            </map>
+        </property>
+    </bean>
+
     <bean id="community-mainReports" class="org.dspace.app.rest.model.UsageReportCategoryRest">
         <property name="categoryType" value="mainReports"/>
         <property name="reports">
@@ -890,6 +1083,62 @@
                         <ref bean="collection-downloadReports"/>
                     </list>
                 </entry>
+                <entry key="collection-Publication">
+                    <list>
+                        <ref bean="collection-mainReports"/>
+                        <ref bean="publicationCollection-itemReports"/>
+                        <ref bean="collection-downloadReports"/>
+                    </list>
+                </entry>
+                <entry key="collection-Project">
+                    <list>
+                        <ref bean="collection-mainReports"/>
+                        <ref bean="projectCollection-itemReports"/>
+                        <ref bean="collection-downloadReports"/>
+                    </list>
+                </entry>
+                <entry key="collection-Funding">
+                    <list>
+                        <ref bean="collection-mainReports"/>
+                        <ref bean="fundingCollection-itemReports"/>
+                        <ref bean="collection-downloadReports"/>
+                    </list>
+                </entry>
+                <entry key="collection-OrgUnit">
+                    <list>
+                        <ref bean="collection-mainReports"/>
+                        <ref bean="orgUnitCollection-itemReports"/>
+                        <ref bean="collection-downloadReports"/>
+                    </list>
+                </entry>
+                <entry key="collection-Product">
+                    <list>
+                        <ref bean="collection-mainReports"/>
+                        <ref bean="productCollection-itemReports"/>
+                        <ref bean="collection-downloadReports"/>
+                    </list>
+                </entry>
+                <entry key="collection-Patent">
+                    <list>
+                        <ref bean="collection-mainReports"/>
+                        <ref bean="patentCollection-itemReports"/>
+                        <ref bean="collection-downloadReports"/>
+                    </list>
+                </entry>
+                <entry key="collection-Event">
+                    <list>
+                        <ref bean="collection-mainReports"/>
+                        <ref bean="eventCollection-itemReports"/>
+                        <ref bean="collection-downloadReports"/>
+                    </list>
+                </entry>
+                <entry key="collection-Person">
+                    <list>
+                        <ref bean="collection-mainReports"/>
+                        <ref bean="personCollection-itemReports"/>
+                        <ref bean="collection-downloadReports"/>
+                    </list>
+                </entry>
                 <entry key="item">
                     <list>
                         <ref bean="item-mainReports"/>