diff --git a/ccm-core/src/main/java/org/libreccm/core/Permission.java b/ccm-core/src/main/java/org/libreccm/core/Permission.java
index 746a1a285..5f8973c12 100644
--- a/ccm-core/src/main/java/org/libreccm/core/Permission.java
+++ b/ccm-core/src/main/java/org/libreccm/core/Permission.java
@@ -42,7 +42,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 /**
  * Represents a {@link Privilege} granted to a {@link Subject} on an 
- * {@link CcmObject} or all {@link CcmObjects}.
+ * {@link CcmObject} or all {@link CcmObject}s.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
diff --git a/ccm-core/src/main/java/org/libreccm/core/PermissionManager.java b/ccm-core/src/main/java/org/libreccm/core/PermissionManager.java
index 198d5d2c5..afe0ea6f8 100644
--- a/ccm-core/src/main/java/org/libreccm/core/PermissionManager.java
+++ b/ccm-core/src/main/java/org/libreccm/core/PermissionManager.java
@@ -18,13 +18,12 @@
  */
 package org.libreccm.core;
 
-import java.util.List;
-
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
+import java.util.List;
 
 /**
- * This class provides methods for managing {@link Permissions}.
+ * This class provides methods for managing {@link Permission}s.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/Resource.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/Resource.java
index 91fb77df6..19dd8fd30 100644
--- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/Resource.java
+++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/Resource.java
@@ -26,6 +26,8 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
@@ -46,6 +48,11 @@ import java.util.List;
  */
 @Entity
 @Table(schema = "CCM_DOCREPO", name = "RESOURCES")
+@NamedQueries({
+        @NamedQuery(name = "findChildrenByParent",
+                query = "SELECT r FROM Resource r WHERE r.parent = :parentID"),
+        @NamedQuery(name = "findResourceByPath",
+                query = "SELECT r FROM Resource r WHERE r.path = :pathName")})
 public abstract class Resource extends CcmObject {
 
     private static final long serialVersionUID = -910317798106611214L;
diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/ResourceRepository.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/ResourceRepository.java
index 638ddcb56..cdbf19059 100644
--- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/ResourceRepository.java
+++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/ResourceRepository.java
@@ -22,7 +22,7 @@ package org.libreccm.docrepo;
 import org.libreccm.auditing.AbstractAuditedEntityRepository;
 
 /**
- *
+ * Repository class for retrieving, storing and deleting {@code Resource}s.
  *
  * @author <a href="mailto:tosmers@uni-bremen.de">Tobias Osmers</a>
  */
@@ -30,16 +30,18 @@ public class ResourceRepository extends AbstractAuditedEntityRepository<Long, Re
 
     @Override
     public Long getEntityId(Resource entity) {
-        return null;
+        return entity.getObjectId();
     }
 
     @Override
     public Class<Resource> getEntityClass() {
-        return null;
+        return Resource.class;
     }
 
     @Override
     public boolean isNew(Resource entity) {
         return false;
     }
+
+
 }