diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/IIIFController.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/IIIFController.java
index d48d10d44b..a1e265ccfc 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/IIIFController.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/IIIFController.java
@@ -23,6 +23,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * Controller for IIIF Presentation and Search API.
+ *
+ * @author Michael Spalti  mspalti@willamette.edu
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @RestController
 @RequestMapping("/iiif")
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/IIIFServiceFacade.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/IIIFServiceFacade.java
index cf0d75c391..7bb723ea65 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/IIIFServiceFacade.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/IIIFServiceFacade.java
@@ -27,6 +27,9 @@ import org.springframework.stereotype.Service;
 
 /**
  * IIIF Service facade to support IIIF Presentation and Search API requests.
+ *
+ * @author Michael Spalti  mspalti@willamette.edu
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @Service
 public class IIIFServiceFacade {
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/BehaviorGenerator.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/BehaviorGenerator.java
index 3d3fccd1fa..75b5b67d48 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/BehaviorGenerator.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/BehaviorGenerator.java
@@ -14,6 +14,9 @@ import de.digitalcollections.iiif.model.enums.ViewingHint;
  * displaying the resource.
  *
  * With IIIF Presentation API 3.0 the viewingHint property is renamed to "behavior".
+ *
+ * @author Michael Spalti  mspalti@willamette.edu
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 public class BehaviorGenerator implements IIIFValue {
 
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/CanvasGenerator.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/CanvasGenerator.java
index 096abfea58..f064a1b974 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/CanvasGenerator.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/CanvasGenerator.java
@@ -18,6 +18,9 @@ import de.digitalcollections.iiif.model.sharedcanvas.Resource;
 
 /**
  * This generator wraps the domain model for a single {@code Canvas}.
+ *
+ * @author Michael Spalti  mspalti@willamette.edu
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 public class CanvasGenerator implements IIIFResource {
 
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/CanvasItemsGenerator.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/CanvasItemsGenerator.java
index 08ac918bb6..f9dfaa2624 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/CanvasItemsGenerator.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/CanvasItemsGenerator.java
@@ -25,6 +25,9 @@ import org.springframework.web.context.annotation.RequestScope;
  *
  * <p>Sequence is removed with Presentation API version 3.0. Canvases are added to the Manifest items property instead.
  * </p>
+ *
+ * @author Michael Spalti  mspalti@willamette.edu
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @RequestScope
 @Component
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ImageContentGenerator.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ImageContentGenerator.java
index 610ec571d9..aef979b635 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ImageContentGenerator.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ImageContentGenerator.java
@@ -18,6 +18,9 @@ import de.digitalcollections.iiif.model.sharedcanvas.Resource;
  * Presentation API version 2.1.1: The ImageContent entity is contained in the "resource"
  * field of annotations with motivation "sc:painting". Image resources, and only image resources,
  * are included in the image's property of the canvas. This changes in API version 3.0.
+ *
+ * @author Michael Spalti  mspalti@willamette.edu
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 public class ImageContentGenerator implements IIIFResource {
 
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ImageServiceGenerator.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ImageServiceGenerator.java
index 9a39945116..29b9072949 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ImageServiceGenerator.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ImageServiceGenerator.java
@@ -13,6 +13,9 @@ import de.digitalcollections.iiif.model.image.ImageService;
 /**
  * This service generator wraps the image service property model. An image service
  * annotation is added to each canvas annotation.
+ *
+ * @author Michael Spalti  mspalti@willamette.edu
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 public class ImageServiceGenerator implements IIIFService {
 
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ManifestGenerator.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ManifestGenerator.java
index 70f56322dd..8072692640 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ManifestGenerator.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ManifestGenerator.java
@@ -39,6 +39,9 @@ import org.springframework.web.context.annotation.RequestScope;
  *
  * Please note that this is a request scoped bean. This means that for each http request a
  * different instance will be initialized by Spring and used to serve this specific request.
+ *
+ * @author Michael Spalti  mspalti@willamette.edu
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @RequestScope
 @Component
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/MetadataEntryGenerator.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/MetadataEntryGenerator.java
index bab4dbecae..5eb92dfa4d 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/MetadataEntryGenerator.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/MetadataEntryGenerator.java
@@ -13,6 +13,9 @@ import org.dspace.core.I18nUtil;
 
 /**
  * Wraps the domain model metadata property.
+ *
+ * @author Michael Spalti  mspalti@willamette.edu
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 public class MetadataEntryGenerator implements IIIFValue {
 
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/RangeGenerator.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/RangeGenerator.java
index cc358788e2..726f789535 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/RangeGenerator.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/RangeGenerator.java
@@ -24,6 +24,9 @@ import org.dspace.app.iiif.service.RangeService;
  *
  * This is used to populate the "structures" element of the Manifest. The structure is derived from the iiif.toc
  * metadata and the ordered sequence of bitstreams (canvases)
+ *
+ * @author Michael Spalti  mspalti@willamette.edu
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 public class RangeGenerator implements IIIFResource {
 
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/AbstractResourceService.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/AbstractResourceService.java
index c7ef01984f..79530e1d3c 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/AbstractResourceService.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/AbstractResourceService.java
@@ -17,6 +17,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * Base class for services.
+ *
+ * @author Michael Spalti  mspalti@willamette.edu
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 public abstract class AbstractResourceService {
     /**
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/AnnotationListService.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/AnnotationListService.java
index fa71fae70f..e738b80105 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/AnnotationListService.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/AnnotationListService.java
@@ -31,6 +31,9 @@ import org.springframework.web.context.annotation.RequestScope;
  * This service provides methods for creating an {@code Annotation List}. There should be a single instance of
  * this service per request. The {@code @RequestScope} provides a single instance created and available during
  * complete lifecycle of the HTTP request.
+ *
+ * @author Michael Spalti  mspalti@willamette.edu
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @RequestScope
 @Component
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/CanvasLookupService.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/CanvasLookupService.java
index 5c900d0a1c..d9c9478804 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/CanvasLookupService.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/CanvasLookupService.java
@@ -24,6 +24,9 @@ import org.springframework.web.context.annotation.RequestScope;
  * This service provides methods for creating a single {@code Canvas}. There should be a single instance of
  * this service per request. The {@code @RequestScope} provides a single instance created and available during
  * complete lifecycle of the HTTP request.
+ *
+ * @author Michael Spalti  mspalti@willamette.edu
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @RequestScope
 @Component
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/CanvasService.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/CanvasService.java
index 1dac7da8bf..bd9d0bd4f2 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/CanvasService.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/CanvasService.java
@@ -35,6 +35,9 @@ import org.springframework.web.context.annotation.RequestScope;
  * This service provides methods for creating {@code Canvases}. There should be a single instance of
  * this service per request. The {@code @RequestScope} provides a single instance created and available during
  * complete lifecycle of the HTTP request.
+ *
+ * @author Michael Spalti  mspalti@willamette.edu
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @RequestScope
 @Component
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/ImageContentService.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/ImageContentService.java
index 3ef28d91c6..754e8b9bfa 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/ImageContentService.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/ImageContentService.java
@@ -20,6 +20,9 @@ import org.springframework.web.context.annotation.RequestScope;
  * This service provides methods for creating a {@code Image Resource} annotation. There should be a single instance of
  * this service per request. The {@code @RequestScope} provides a single instance created and available during
  * complete lifecycle of the HTTP request.
+ *
+ * @author Michael Spalti  mspalti@willamette.edu
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @RequestScope
 @Component
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/ManifestService.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/ManifestService.java
index ffe533e7bd..373c480a0f 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/ManifestService.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/ManifestService.java
@@ -43,6 +43,9 @@ import org.springframework.web.context.annotation.RequestScope;
  * prototype (that will turn in a request scope when injected in a request scope
  * bean). The generators for top-level domain objects need to be request scoped as they act as a builder
  * storing the object state during each incremental building step until the final object is returned (IIIF Resource).
+ *
+ * @author Michael Spalti  mspalti@willamette.edu
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @RequestScope
 @Component
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/RangeService.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/RangeService.java
index 54ec70ec0f..2021572e5c 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/RangeService.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/RangeService.java
@@ -17,6 +17,9 @@ import org.springframework.web.context.annotation.RequestScope;
  * This service provides methods for creating a {@code Range}. There should be a single instance of this service
  * per request. The {@code @RequestScope} provides a single instance created and available during complete lifecycle
  * of the HTTP request.
+ *
+ * @author Michael Spalti  mspalti@willamette.edu
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @RequestScope
 @Component
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/RelatedService.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/RelatedService.java
index 94550172ee..a29c6466b6 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/RelatedService.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/RelatedService.java
@@ -17,6 +17,9 @@ import org.springframework.web.context.annotation.RequestScope;
  * This service provides methods for creating a {@code related} annotation. There should be a single instance of
  * this service per request. The {@code @RequestScope} provides a single instance created and available during
  * complete lifecycle of the HTTP request.
+ *
+ * @author Michael Spalti  mspalti@willamette.edu
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @RequestScope
 @Component
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/SeeAlsoService.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/SeeAlsoService.java
index f4eb22ce88..f4bd8c0348 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/SeeAlsoService.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/SeeAlsoService.java
@@ -18,6 +18,9 @@ import org.springframework.web.context.annotation.RequestScope;
  * This service provides methods for creating {@code seAlso} external link. There should be a single instance of
  * this service per request. The {@code @RequestScope} provides a single instance created and available during
  * complete lifecycle of the HTTP request.
+ *
+ * @author Michael Spalti  mspalti@willamette.edu
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @RequestScope
 @Component
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/SequenceService.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/SequenceService.java
index cad81c382b..0907bf5d79 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/SequenceService.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/SequenceService.java
@@ -23,6 +23,9 @@ import org.springframework.web.context.annotation.RequestScope;
  * This service provides methods for creating a {@code Sequence}. There should be a single instance of
  * this service per request. The {@code @RequestScope} provides a single instance created and available during
  * complete lifecycle of the HTTP request.
+ *
+ * @author Michael Spalti  mspalti@willamette.edu
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @RequestScope
 @Component