diff --git a/ems-core/src/main/java/it/integry/ems/dto/EntityHierarchyDTO.java b/ems-core/src/main/java/it/integry/ems/dto/EntityHierarchyDTO.java
index 83a706d89e..c7f87afeab 100644
--- a/ems-core/src/main/java/it/integry/ems/dto/EntityHierarchyDTO.java
+++ b/ems-core/src/main/java/it/integry/ems/dto/EntityHierarchyDTO.java
@@ -11,6 +11,7 @@ public class EntityHierarchyDTO {
     private String entityName;
     private String tableName;
     private Field field;
+    private boolean master;
     private List<EntityHierarchyDTO> children;
 
     public Class<? extends EntityBase> getClazz() {
@@ -47,6 +48,15 @@ public class EntityHierarchyDTO {
         return this;
     }
 
+    public boolean isMaster() {
+        return master;
+    }
+
+    public EntityHierarchyDTO setMaster(boolean master) {
+        this.master = master;
+        return this;
+    }
+
     public List<EntityHierarchyDTO> getChildren() {
         return children;
     }
diff --git a/ems-core/src/main/java/it/integry/ems_model/base/EntityPropertyHolder.java b/ems-core/src/main/java/it/integry/ems_model/base/EntityPropertyHolder.java
index 87d130ee72..e77b8e2784 100644
--- a/ems-core/src/main/java/it/integry/ems_model/base/EntityPropertyHolder.java
+++ b/ems-core/src/main/java/it/integry/ems_model/base/EntityPropertyHolder.java
@@ -80,15 +80,18 @@ public class EntityPropertyHolder {
         Reflections reflections = new Reflections("it.integry.ems_model.entity");
         List<EntityHierarchyDTO> mapping = new ArrayList<>();
         Set<Class<? extends EntityBase>> classes = reflections.getSubTypesOf(EntityBase.class);
+
         for (Class<? extends EntityBase> entity : classes) {
-            if (entity.isAnnotationPresent(Master.class)) {
-                EntityHierarchyDTO dto = new EntityHierarchyDTO();
-                dto.setClazz(entity);
-                dto.setEntityName(entity.getSimpleName());
-                dto.setTableName(entity.getAnnotation(Table.class).value());
-                dto.setChildren(getEntityChildren(entity));
-                mapping.add(dto);
-            }
+            if(!entity.isAnnotationPresent(Table.class)) continue;
+
+            EntityHierarchyDTO dto = new EntityHierarchyDTO();
+            dto.setClazz(entity);
+            dto.setEntityName(entity.getSimpleName());
+            dto.setTableName(entity.getAnnotation(Table.class).value());
+            dto.setChildren(getEntityChildren(entity));
+            dto.setMaster(entity.isAnnotationPresent(Master.class));
+
+            mapping.add(dto);
         }
         return mapping;
     }