diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/attachment/Attachment.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/attachment/Attachment.java
index c0b3f0d217dcd329e06ba7317c9063ab001f4d6a..7eba14a357bfbc1125ee6839b56af128a7a053d4 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/attachment/Attachment.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/attachment/Attachment.java
@@ -16,6 +16,8 @@
 package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.attachment;
 
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.attachment.Attachment;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistrationDateHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistratorHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.person.Person;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.fetchoptions.attachment.AttachmentFetchOptions;
 import ch.ethz.sis.openbis.generic.shared.api.v3.exceptions.NotFetchedException;
@@ -29,7 +31,7 @@ import java.util.Date;
  * Class automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
  */
 @JsonObject("dto.entity.attachment.Attachment")
-public class Attachment implements Serializable
+public class Attachment implements Serializable, IRegistratorHolder, IRegistrationDateHolder
 {
     private static final long serialVersionUID = 1L;
 
@@ -159,6 +161,7 @@ public class Attachment implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getRegistrationDate()
     {
         return registrationDate;
@@ -172,6 +175,7 @@ public class Attachment implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Person getRegistrator()
     {
         if (getFetchOptions().hasRegistrator())
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/dataset/DataSet.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/dataset/DataSet.java
index cb2a2df4e7a25bd66eb1bbdcfe573ee4a4ca8d72..5b4f5df6a047b29eb5225f6ec788786563a3737f 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/dataset/DataSet.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/dataset/DataSet.java
@@ -18,8 +18,13 @@ package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.dataset;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.dataset.DataSetType;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.dataset.ExternalData;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.experiment.Experiment;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IModificationDateHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IModifierHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IParentChildrenHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IPropertiesHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistrationDateHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistratorHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.ITagsHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.material.Material;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.person.Person;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.sample.Sample;
@@ -40,7 +45,7 @@ import java.util.Set;
  * Class automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
  */
 @JsonObject("dto.entity.dataset.DataSet")
-public class DataSet implements Serializable, IParentChildrenHolder<DataSet>, IPropertiesHolder
+public class DataSet implements Serializable, IParentChildrenHolder<DataSet>, IModifierHolder, IModificationDateHolder, IRegistratorHolder, IPropertiesHolder, IRegistrationDateHolder, ITagsHolder
 {
     private static final long serialVersionUID = 1L;
 
@@ -289,6 +294,7 @@ public class DataSet implements Serializable, IParentChildrenHolder<DataSet>, IP
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Set<Tag> getTags()
     {
         if (getFetchOptions().hasTags())
@@ -329,6 +335,7 @@ public class DataSet implements Serializable, IParentChildrenHolder<DataSet>, IP
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getModificationDate()
     {
         return modificationDate;
@@ -342,6 +349,7 @@ public class DataSet implements Serializable, IParentChildrenHolder<DataSet>, IP
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Person getModifier()
     {
         if (getFetchOptions().hasModifier())
@@ -362,6 +370,7 @@ public class DataSet implements Serializable, IParentChildrenHolder<DataSet>, IP
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getRegistrationDate()
     {
         return registrationDate;
@@ -375,6 +384,7 @@ public class DataSet implements Serializable, IParentChildrenHolder<DataSet>, IP
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Person getRegistrator()
     {
         if (getFetchOptions().hasRegistrator())
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/dataset/DataSetType.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/dataset/DataSetType.java
index eada225af6b6bec5ae2070ab808b5437cc5ea2b7..184df422fc98322c3696025c3dc47ba14f1a92d6 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/dataset/DataSetType.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/dataset/DataSetType.java
@@ -16,6 +16,7 @@
 package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.dataset;
 
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.dataset.DataSetKind;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IModificationDateHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.fetchoptions.dataset.DataSetTypeFetchOptions;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.entitytype.EntityTypePermId;
 import ch.ethz.sis.openbis.generic.shared.api.v3.exceptions.NotFetchedException;
@@ -29,7 +30,7 @@ import java.util.Date;
  * Class automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
  */
 @JsonObject("dto.entity.dataset.DataSetType")
-public class DataSetType implements Serializable
+public class DataSetType implements Serializable, IModificationDateHolder
 {
     private static final long serialVersionUID = 1L;
 
@@ -118,6 +119,7 @@ public class DataSetType implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getModificationDate()
     {
         return modificationDate;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/experiment/Experiment.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/experiment/Experiment.java
index 01c9c197e9c7e764c237034cfb669f2a86a0e881..7ec4561fe90bddadbf51bb73f1c28fdf40804e81 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/experiment/Experiment.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/experiment/Experiment.java
@@ -18,7 +18,13 @@ package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.experiment;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.attachment.Attachment;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.dataset.DataSet;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.experiment.ExperimentType;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IAttachmentsHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IModificationDateHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IModifierHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IPropertiesHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistrationDateHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistratorHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.ITagsHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.material.Material;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.person.Person;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.project.Project;
@@ -41,7 +47,7 @@ import java.util.Set;
  * Class automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
  */
 @JsonObject("dto.entity.experiment.Experiment")
-public class Experiment implements Serializable, IPropertiesHolder
+public class Experiment implements Serializable, IModifierHolder, IModificationDateHolder, IAttachmentsHolder, IRegistratorHolder, IPropertiesHolder, IRegistrationDateHolder, ITagsHolder
 {
     private static final long serialVersionUID = 1L;
 
@@ -147,6 +153,7 @@ public class Experiment implements Serializable, IPropertiesHolder
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getRegistrationDate()
     {
         return registrationDate;
@@ -160,6 +167,7 @@ public class Experiment implements Serializable, IPropertiesHolder
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getModificationDate()
     {
         return modificationDate;
@@ -295,6 +303,7 @@ public class Experiment implements Serializable, IPropertiesHolder
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Set<Tag> getTags()
     {
         if (getFetchOptions().hasTags())
@@ -315,6 +324,7 @@ public class Experiment implements Serializable, IPropertiesHolder
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Person getRegistrator()
     {
         if (getFetchOptions().hasRegistrator())
@@ -335,6 +345,7 @@ public class Experiment implements Serializable, IPropertiesHolder
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Person getModifier()
     {
         if (getFetchOptions().hasModifier())
@@ -355,6 +366,7 @@ public class Experiment implements Serializable, IPropertiesHolder
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public List<Attachment> getAttachments()
     {
         if (getFetchOptions().hasAttachments())
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/experiment/ExperimentType.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/experiment/ExperimentType.java
index 82595521fdd7c44e3722596d4fb41d6ce2a37439..15626352f01265252e416519749ef2fe0c0a7110 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/experiment/ExperimentType.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/experiment/ExperimentType.java
@@ -15,6 +15,7 @@
  */
 package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.experiment;
 
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IModificationDateHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.fetchoptions.experiment.ExperimentTypeFetchOptions;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.entitytype.EntityTypePermId;
 import ch.ethz.sis.openbis.generic.shared.api.v3.exceptions.NotFetchedException;
@@ -28,7 +29,7 @@ import java.util.Date;
  * Class automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
  */
 @JsonObject("dto.entity.experiment.ExperimentType")
-public class ExperimentType implements Serializable
+public class ExperimentType implements Serializable, IModificationDateHolder
 {
     private static final long serialVersionUID = 1L;
 
@@ -101,6 +102,7 @@ public class ExperimentType implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getModificationDate()
     {
         return modificationDate;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/interfaces/IAttachmentsHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/interfaces/IAttachmentsHolder.java
new file mode 100644
index 0000000000000000000000000000000000000000..2a095bca8c82a4976f0799b561da2af509a9e568
--- /dev/null
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/interfaces/IAttachmentsHolder.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2015 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces;
+
+import java.util.List;
+
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.attachment.Attachment;
+
+/**
+ * @author Jakub Straszewski
+ */
+public interface IAttachmentsHolder
+{
+    List<Attachment> getAttachments();
+}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/interfaces/IModificationDateHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/interfaces/IModificationDateHolder.java
new file mode 100644
index 0000000000000000000000000000000000000000..c4e2cab8e8a7a7fbfb0eef8b3e9fc1ddbaf74630
--- /dev/null
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/interfaces/IModificationDateHolder.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces;
+
+import java.util.Date;
+
+/**
+ * @author Jakub Straszewski
+ */
+public interface IModificationDateHolder
+{
+    Date getModificationDate();
+}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/interfaces/IModifierHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/interfaces/IModifierHolder.java
new file mode 100644
index 0000000000000000000000000000000000000000..c2160590111929a9e9b1a8b8f9ac7f3538c154cf
--- /dev/null
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/interfaces/IModifierHolder.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces;
+
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.person.Person;
+
+/**
+ * @author Jakub Straszewski
+ */
+public interface IModifierHolder
+{
+    Person getModifier();
+}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/interfaces/IRegistrationDateHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/interfaces/IRegistrationDateHolder.java
new file mode 100644
index 0000000000000000000000000000000000000000..9e8824f7d7b96adeb4774b608f09ac839144ffc4
--- /dev/null
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/interfaces/IRegistrationDateHolder.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces;
+
+import java.util.Date;
+
+/**
+ * @author Jakub Straszewski
+ */
+public interface IRegistrationDateHolder
+{
+    Date getRegistrationDate();
+}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/interfaces/IRegistratorHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/interfaces/IRegistratorHolder.java
new file mode 100644
index 0000000000000000000000000000000000000000..33ebd14ab7287b43825d27d6ffdba6adc5aa022c
--- /dev/null
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/interfaces/IRegistratorHolder.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces;
+
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.person.Person;
+
+/**
+ * @author Jakub Straszewski
+ */
+public interface IRegistratorHolder
+{
+    Person getRegistrator();
+}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/interfaces/ISpaceHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/interfaces/ISpaceHolder.java
new file mode 100644
index 0000000000000000000000000000000000000000..216bd97fdb7553304704884182c05bb1a2a7d448
--- /dev/null
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/interfaces/ISpaceHolder.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces;
+
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.space.Space;
+
+/**
+ * @author Jakub Straszewski
+ */
+public interface ISpaceHolder
+{
+    Space getSpace();
+}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/interfaces/ITagsHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/interfaces/ITagsHolder.java
new file mode 100644
index 0000000000000000000000000000000000000000..ec0ac3aed985bae82b1c14fa85afb99253f82a3a
--- /dev/null
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/interfaces/ITagsHolder.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2015 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces;
+
+import java.util.Set;
+
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.tag.Tag;
+
+/**
+ * @author Jakub Straszewski
+ */
+public interface ITagsHolder
+{
+    Set<Tag> getTags();
+}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/material/Material.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/material/Material.java
index e73c092d88aff259a879e2b35b1ad824cf7fde38..bdc7bedb11fada58fa4461ce9e6fe2610fdcfe8f 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/material/Material.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/material/Material.java
@@ -15,7 +15,11 @@
  */
 package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.material;
 
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IModificationDateHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IPropertiesHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistrationDateHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistratorHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.ITagsHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.material.Material;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.person.Person;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.tag.Tag;
@@ -34,7 +38,7 @@ import java.util.Set;
  * Class automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
  */
 @JsonObject("dto.entity.material.Material")
-public class Material implements Serializable, IPropertiesHolder
+public class Material implements Serializable, IModificationDateHolder, IRegistratorHolder, IPropertiesHolder, IRegistrationDateHolder, ITagsHolder
 {
     private static final long serialVersionUID = 1L;
 
@@ -106,6 +110,7 @@ public class Material implements Serializable, IPropertiesHolder
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getRegistrationDate()
     {
         return registrationDate;
@@ -119,6 +124,7 @@ public class Material implements Serializable, IPropertiesHolder
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Person getRegistrator()
     {
         if (getFetchOptions().hasRegistrator())
@@ -139,6 +145,7 @@ public class Material implements Serializable, IPropertiesHolder
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getModificationDate()
     {
         return modificationDate;
@@ -194,6 +201,7 @@ public class Material implements Serializable, IPropertiesHolder
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Set<Tag> getTags()
     {
         if (getFetchOptions().hasTags())
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/material/MaterialType.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/material/MaterialType.java
index e084937add8183c5d65f4aac297db267923ead8c..124e888b59bb5ac2d47469db0a620e1b0ad6011e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/material/MaterialType.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/material/MaterialType.java
@@ -15,6 +15,7 @@
  */
 package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.material;
 
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IModificationDateHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.fetchoptions.material.MaterialTypeFetchOptions;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.entitytype.EntityTypePermId;
 import ch.ethz.sis.openbis.generic.shared.api.v3.exceptions.NotFetchedException;
@@ -28,7 +29,7 @@ import java.util.Date;
  * Class automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
  */
 @JsonObject("dto.entity.material.MaterialType")
-public class MaterialType implements Serializable
+public class MaterialType implements Serializable, IModificationDateHolder
 {
     private static final long serialVersionUID = 1L;
 
@@ -101,6 +102,7 @@ public class MaterialType implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getModificationDate()
     {
         return modificationDate;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/person/Person.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/person/Person.java
index 20d8e8a13cdbea6c3446dd582be9695dfc61b448..8601176a72c37e3e9d9dd69826add1b10914bb0a 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/person/Person.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/person/Person.java
@@ -15,6 +15,9 @@
  */
 package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.person;
 
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistrationDateHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistratorHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.ISpaceHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.person.Person;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.space.Space;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.fetchoptions.person.PersonFetchOptions;
@@ -29,7 +32,7 @@ import java.util.Date;
  * Class automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
  */
 @JsonObject("dto.entity.person.Person")
-public class Person implements Serializable
+public class Person implements Serializable, ISpaceHolder, IRegistratorHolder, IRegistrationDateHolder
 {
     private static final long serialVersionUID = 1L;
 
@@ -127,6 +130,7 @@ public class Person implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getRegistrationDate()
     {
         return registrationDate;
@@ -153,6 +157,7 @@ public class Person implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Space getSpace()
     {
         if (getFetchOptions().hasSpace())
@@ -173,6 +178,7 @@ public class Person implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Person getRegistrator()
     {
         if (getFetchOptions().hasRegistrator())
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/project/Project.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/project/Project.java
index 381d47b7c3b4072c3a5f09df99dba15ace153d49..97fd747f0082f2a5cddeb26f4766be61026c9dbb 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/project/Project.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/project/Project.java
@@ -16,6 +16,11 @@
 package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.project;
 
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.experiment.Experiment;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IModificationDateHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IModifierHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistrationDateHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistratorHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.ISpaceHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.person.Person;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.space.Space;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.fetchoptions.project.ProjectFetchOptions;
@@ -33,7 +38,7 @@ import java.util.List;
  * Class automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
  */
 @JsonObject("dto.entity.project.Project")
-public class Project implements Serializable
+public class Project implements Serializable, ISpaceHolder, IModifierHolder, IModificationDateHolder, IRegistratorHolder, IRegistrationDateHolder
 {
     private static final long serialVersionUID = 1L;
 
@@ -137,6 +142,7 @@ public class Project implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getRegistrationDate()
     {
         return registrationDate;
@@ -150,6 +156,7 @@ public class Project implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getModificationDate()
     {
         return modificationDate;
@@ -183,6 +190,7 @@ public class Project implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Space getSpace()
     {
         if (getFetchOptions().hasSpace())
@@ -203,6 +211,7 @@ public class Project implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Person getRegistrator()
     {
         if (getFetchOptions().hasRegistrator())
@@ -223,6 +232,7 @@ public class Project implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Person getModifier()
     {
         if (getFetchOptions().hasModifier())
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/sample/Sample.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/sample/Sample.java
index d43c301486f6c31bdccd9f7e702ad48d192ccabf..68a701566fdda6781806a9d1d5c59c3aad1b25fe 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/sample/Sample.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/sample/Sample.java
@@ -18,8 +18,15 @@ package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.sample;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.attachment.Attachment;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.dataset.DataSet;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.experiment.Experiment;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IAttachmentsHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IModificationDateHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IModifierHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IParentChildrenHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IPropertiesHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistrationDateHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistratorHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.ISpaceHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.ITagsHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.material.Material;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.person.Person;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.sample.Sample;
@@ -43,7 +50,7 @@ import java.util.Set;
  * Class automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
  */
 @JsonObject("dto.entity.sample.Sample")
-public class Sample implements Serializable, IPropertiesHolder, IParentChildrenHolder<Sample>
+public class Sample implements Serializable, ISpaceHolder, IModifierHolder, IModificationDateHolder, IAttachmentsHolder, IRegistratorHolder, IPropertiesHolder, IRegistrationDateHolder, ITagsHolder, IParentChildrenHolder<Sample>
 {
     private static final long serialVersionUID = 1L;
 
@@ -161,6 +168,7 @@ public class Sample implements Serializable, IPropertiesHolder, IParentChildrenH
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getRegistrationDate()
     {
         return registrationDate;
@@ -174,6 +182,7 @@ public class Sample implements Serializable, IPropertiesHolder, IParentChildrenH
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getModificationDate()
     {
         return modificationDate;
@@ -207,6 +216,7 @@ public class Sample implements Serializable, IPropertiesHolder, IParentChildrenH
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Space getSpace()
     {
         if (getFetchOptions().hasSpace())
@@ -391,6 +401,7 @@ public class Sample implements Serializable, IPropertiesHolder, IParentChildrenH
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Set<Tag> getTags()
     {
         if (getFetchOptions().hasTags())
@@ -411,6 +422,7 @@ public class Sample implements Serializable, IPropertiesHolder, IParentChildrenH
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Person getRegistrator()
     {
         if (getFetchOptions().hasRegistrator())
@@ -431,6 +443,7 @@ public class Sample implements Serializable, IPropertiesHolder, IParentChildrenH
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Person getModifier()
     {
         if (getFetchOptions().hasModifier())
@@ -451,6 +464,7 @@ public class Sample implements Serializable, IPropertiesHolder, IParentChildrenH
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public List<Attachment> getAttachments()
     {
         if (getFetchOptions().hasAttachments())
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/sample/SampleType.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/sample/SampleType.java
index 3c444e297b5339c52be513375119c8d3399069df..8eda45633025a98393b481684d28548e7b7b2a46 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/sample/SampleType.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/sample/SampleType.java
@@ -15,6 +15,7 @@
  */
 package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.sample;
 
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IModificationDateHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.fetchoptions.sample.SampleTypeFetchOptions;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.entitytype.EntityTypePermId;
 import ch.ethz.sis.openbis.generic.shared.api.v3.exceptions.NotFetchedException;
@@ -28,7 +29,7 @@ import java.util.Date;
  * Class automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
  */
 @JsonObject("dto.entity.sample.SampleType")
-public class SampleType implements Serializable
+public class SampleType implements Serializable, IModificationDateHolder
 {
     private static final long serialVersionUID = 1L;
 
@@ -181,6 +182,7 @@ public class SampleType implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getModificationDate()
     {
         return modificationDate;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/space/Space.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/space/Space.java
index 327928debde3a4a8128438a001d6009fa268f025..3455de54527626ebf3ed0fed9fd7851f15a7ce9a 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/space/Space.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/space/Space.java
@@ -15,6 +15,8 @@
  */
 package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.space;
 
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistrationDateHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistratorHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.person.Person;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.project.Project;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.sample.Sample;
@@ -32,7 +34,7 @@ import java.util.List;
  * Class automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
  */
 @JsonObject("dto.entity.space.Space")
-public class Space implements Serializable
+public class Space implements Serializable, IRegistratorHolder, IRegistrationDateHolder
 {
     private static final long serialVersionUID = 1L;
 
@@ -114,6 +116,7 @@ public class Space implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getRegistrationDate()
     {
         return registrationDate;
@@ -127,6 +130,7 @@ public class Space implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Person getRegistrator()
     {
         if (getFetchOptions().hasRegistrator())
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/tag/Tag.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/tag/Tag.java
index 721ec1fe013bdc4e578e3d9ee10d1357166dd266..12c0eb768732dbf1702d7634d98543071f182972 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/tag/Tag.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/tag/Tag.java
@@ -15,6 +15,7 @@
  */
 package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.tag;
 
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistrationDateHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.person.Person;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.fetchoptions.tag.TagFetchOptions;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.tag.TagPermId;
@@ -29,7 +30,7 @@ import java.util.Date;
  * Class automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
  */
 @JsonObject("dto.entity.tag.Tag")
-public class Tag implements Serializable
+public class Tag implements Serializable, IRegistrationDateHolder
 {
     private static final long serialVersionUID = 1L;
 
@@ -121,6 +122,7 @@ public class Tag implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getRegistrationDate()
     {
         return registrationDate;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/vocabulary/Vocabulary.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/vocabulary/Vocabulary.java
index a5912acd631f389b0ef73443a57a693ca124fe02..68282f1a00acb0bc7ea0257d64ebe309b368a3dd 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/vocabulary/Vocabulary.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/vocabulary/Vocabulary.java
@@ -15,6 +15,9 @@
  */
 package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.vocabulary;
 
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IModificationDateHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistrationDateHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistratorHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.person.Person;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.fetchoptions.vocabulary.VocabularyFetchOptions;
 import ch.ethz.sis.openbis.generic.shared.api.v3.exceptions.NotFetchedException;
@@ -28,7 +31,7 @@ import java.util.Date;
  * Class automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
  */
 @JsonObject("dto.entity.vocabulary.Vocabulary")
-public class Vocabulary implements Serializable
+public class Vocabulary implements Serializable, IModificationDateHolder, IRegistratorHolder, IRegistrationDateHolder
 {
     private static final long serialVersionUID = 1L;
 
@@ -91,6 +94,7 @@ public class Vocabulary implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getRegistrationDate()
     {
         return registrationDate;
@@ -104,6 +108,7 @@ public class Vocabulary implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Person getRegistrator()
     {
         if (getFetchOptions().hasRegistrator())
@@ -124,6 +129,7 @@ public class Vocabulary implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getModificationDate()
     {
         return modificationDate;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/vocabulary/VocabularyTerm.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/vocabulary/VocabularyTerm.java
index 6086efb2f8d679a0a2cfe90c9dfdd6f089e74669..b6c78b61e3e873ad1d27b4811e827bd29f70d64a 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/vocabulary/VocabularyTerm.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/entity/vocabulary/VocabularyTerm.java
@@ -15,6 +15,9 @@
  */
 package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.vocabulary;
 
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IModificationDateHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistrationDateHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistratorHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.person.Person;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.vocabulary.Vocabulary;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.fetchoptions.vocabulary.VocabularyTermFetchOptions;
@@ -29,7 +32,7 @@ import java.util.Date;
  * Class automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
  */
 @JsonObject("dto.entity.vocabulary.VocabularyTerm")
-public class VocabularyTerm implements Serializable
+public class VocabularyTerm implements Serializable, IModificationDateHolder, IRegistratorHolder, IRegistrationDateHolder
 {
     private static final long serialVersionUID = 1L;
 
@@ -163,6 +166,7 @@ public class VocabularyTerm implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getRegistrationDate()
     {
         return registrationDate;
@@ -176,6 +180,7 @@ public class VocabularyTerm implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Person getRegistrator()
     {
         if (getFetchOptions().hasRegistrator())
@@ -196,6 +201,7 @@ public class VocabularyTerm implements Serializable
 
     // Method automatically generated with {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
     @JsonIgnore
+    @Override
     public Date getModificationDate()
     {
         return modificationDate;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/generators/AbstractGenerator.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/generators/AbstractGenerator.java
index de7132eb9bff1f50faf562e92757a8394f9c57aa..5905d413f5b7382cb685023233c616c4dc22fa0b 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/generators/AbstractGenerator.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/generators/AbstractGenerator.java
@@ -7,7 +7,14 @@ import java.util.Set;
 
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.attachment.Attachment;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.experiment.Experiment;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IAttachmentsHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IModificationDateHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IModifierHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IPropertiesHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistrationDateHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IRegistratorHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.ISpaceHolder;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.ITagsHolder;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.material.Material;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.person.Person;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.sample.Sample;
@@ -27,22 +34,29 @@ public class AbstractGenerator
 
     public static void addModificationDate(DtoGenerator gen)
     {
-        gen.addSimpleField(Date.class, "modificationDate");
+        gen.addSimpleField(Date.class, "modificationDate").withInterface(IModificationDateHolder.class);
+    }
+
+    public static void addModifier(DtoGenerator gen)
+    {
+        gen.addFetchedField(Person.class, "modifier", "Modifier", PersonFetchOptions.class)
+                .withInterface(IModifierHolder.class);
     }
 
     public static void addRegistrationDate(DtoGenerator gen)
     {
-        gen.addSimpleField(Date.class, "registrationDate");
+        gen.addSimpleField(Date.class, "registrationDate").withInterface(IRegistrationDateHolder.class);
     }
 
-    public static void addCode(DtoGenerator gen)
+    public static void addRegistrator(DtoGenerator gen)
     {
-        gen.addSimpleField(String.class, "code");
+        gen.addFetchedField(Person.class, "registrator", "Registrator", PersonFetchOptions.class)
+                .withInterface(IRegistratorHolder.class);
     }
 
-    public static void addModifier(DtoGenerator gen)
+    public static void addCode(DtoGenerator gen)
     {
-        gen.addFetchedField(Person.class, "modifier", "Modifier", PersonFetchOptions.class);
+        gen.addSimpleField(String.class, "code");
     }
 
     public static void addExperiment(DtoGenerator gen)
@@ -57,35 +71,33 @@ public class AbstractGenerator
 
     public static void addSpace(DtoGenerator gen)
     {
-        gen.addFetchedField(Space.class, "space", "Space", SpaceFetchOptions.class);
-    }
-
-    public static void addRegistrator(DtoGenerator gen)
-    {
-        gen.addFetchedField(Person.class, "registrator", "Registrator", PersonFetchOptions.class);
+        gen.addFetchedField(Space.class, "space", "Space", SpaceFetchOptions.class)
+                .withInterface(ISpaceHolder.class);
     }
 
     public static void addTags(DtoGenerator gen)
     {
-        gen.addPluralFetchedField("Set<Tag>", Set.class.getName(), "tags", "Tags", TagFetchOptions.class);
+        gen.addPluralFetchedField("Set<Tag>", Set.class.getName(), "tags", "Tags", TagFetchOptions.class)
+                .withInterface(ITagsHolder.class);
         gen.addClassForImport(Tag.class);
         gen.addClassForImport(Set.class);
     }
 
     public static void addProperties(DtoGenerator gen)
     {
-        gen.addPluralFetchedFieldFromInterface("Map<String, String>", Map.class.getName(), "properties", "Properties", PropertyFetchOptions.class);
+        gen.addPluralFetchedField("Map<String, String>", Map.class.getName(), "properties", "Properties", PropertyFetchOptions.class)
+                .withInterface(IPropertiesHolder.class);
         gen.addClassForImport(Map.class);
-        gen.addPluralFetchedFieldFromInterface("Map<String, Material>", Map.class.getName(), "materialProperties", "Material Properties",
-                MaterialFetchOptions.class);
+        gen.addPluralFetchedField("Map<String, Material>", Map.class.getName(), "materialProperties", "Material Properties",
+                MaterialFetchOptions.class).withInterface(IPropertiesHolder.class);
         gen.addClassForImport(Map.class);
         gen.addClassForImport(Material.class);
-        gen.addImplementedInterface(IPropertiesHolder.class);
     }
 
     public static void addAttachments(DtoGenerator gen)
     {
-        gen.addPluralFetchedField("List<Attachment>", List.class.getName(), "attachments", "Attachments", AttachmentFetchOptions.class);
+        gen.addPluralFetchedField("List<Attachment>", List.class.getName(), "attachments", "Attachments", AttachmentFetchOptions.class)
+                .withInterface(IAttachmentsHolder.class);
         gen.addClassForImport(Attachment.class);
         gen.addClassForImport(List.class);
     }
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/generators/DtoGenerator.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/generators/DtoGenerator.java
index 4adfe85c3ea5e78c6e044b351614bf84260dbc3c..805d3cff6d2456ccb1c8a1cc86bac0953bc888ff 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/generators/DtoGenerator.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/generators/DtoGenerator.java
@@ -4,7 +4,7 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.PrintStream;
 import java.io.Serializable;
-import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -39,7 +39,7 @@ public class DtoGenerator
 
     private String toStringContent;
 
-    private List<String> implementedInterfaces;
+    private Set<String> implementedInterfaces;
 
     public DtoGenerator(String subPackage, String className, Class<?> fetchOptionsClass)
     {
@@ -47,7 +47,7 @@ public class DtoGenerator
         this.className = className;
         this.additionalImports = new HashSet<String>();
         this.fields = new LinkedList<DtoGenerator.DTOField>();
-        this.implementedInterfaces = new ArrayList<String>();
+        this.implementedInterfaces = new HashSet<String>();
 
         addClassForImport(JsonProperty.class);
         addClassForImport(JsonIgnore.class);
@@ -65,7 +65,17 @@ public class DtoGenerator
         return className;
     }
 
-    private static class DTOField
+    private DTOField create(String fieldName, Class<?> fieldClass, String description, Class<?> fetchOptions)
+    {
+        return new DTOField(fieldName, fieldClass, description, fetchOptions, false);
+    }
+
+    private DTOField createPlural(String fieldName, String className, String fullClassName, String description, Class<?> fetchOptions)
+    {
+        return new DTOField(fieldName, className, fullClassName, description, fetchOptions, true);
+    }
+
+    class DTOField
     {
         String fieldName;
 
@@ -86,28 +96,7 @@ public class DtoGenerator
 
         boolean interfaceMethod;
 
-        public static DTOField create(String fieldName, Class<?> fieldClass, String description, Class<?> fetchOptions)
-        {
-            return new DTOField(fieldName, fieldClass, description, fetchOptions, false, false);
-        }
-
-        public static DTOField createFromInterface(String fieldName, Class<?> fieldClass, String description, Class<?> fetchOptions)
-        {
-            return new DTOField(fieldName, fieldClass, description, fetchOptions, false, true);
-        }
-
-        public static DTOField createPlural(String fieldName, String className, String fullClassName, String description, Class<?> fetchOptions)
-        {
-            return new DTOField(fieldName, className, fullClassName, description, fetchOptions, true, false);
-        }
-
-        public static DTOField createPluralFromInterface(String fieldName, String className, String fullClassName, String description,
-                Class<?> fetchOptions)
-        {
-            return new DTOField(fieldName, className, fullClassName, description, fetchOptions, true, true);
-        }
-
-        private DTOField(String fieldName, Class<?> fieldClass, String description, Class<?> fetchOptions, boolean plural, boolean interfaceMethod)
+        private DTOField(String fieldName, Class<?> fieldClass, String description, Class<?> fetchOptions, boolean plural)
         {
             this.fieldName = fieldName;
             this.definitionClassName = fieldClass.getSimpleName();
@@ -118,11 +107,9 @@ public class DtoGenerator
             this.description = description;
             this.fetchOptions = fetchOptions;
             this.plural = plural;
-            this.interfaceMethod = interfaceMethod;
         }
 
-        private DTOField(String fieldName, String className, String fullClassName, String description, Class<?> fetchOptions, boolean plural,
-                boolean interfaceMethod)
+        private DTOField(String fieldName, String className, String fullClassName, String description, Class<?> fetchOptions, boolean plural)
         {
             this.fieldName = fieldName;
             this.definitionClassName = className;
@@ -130,7 +117,6 @@ public class DtoGenerator
             this.description = description;
             this.fetchOptions = fetchOptions;
             this.plural = plural;
-            this.interfaceMethod = interfaceMethod;
         }
 
         String getPersistentName()
@@ -143,6 +129,17 @@ public class DtoGenerator
             return fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1);
         }
 
+        void withInterface(Class<?> i)
+        {
+            addImplementedInterface(i);
+            interfaceMethod = true;
+        }
+
+        void withInterfaceReflexive(Class<?> i)
+        {
+            addImplementedInterfaceGeneric(i);
+            interfaceMethod = true;
+        }
     }
 
     private void setOutputStream(PrintStream printStream)
@@ -153,9 +150,11 @@ public class DtoGenerator
     /**
      * Add simple field i.e. one that doesn't have fetched content
      */
-    public void addSimpleField(Class<?> c, String name)
+    public DTOField addSimpleField(Class<?> c, String name)
     {
-        fields.add(DTOField.create(name, c, null, null));
+        DTOField field = create(name, c, null, null);
+        fields.add(field);
+        return field;
     }
 
     /**
@@ -187,30 +186,24 @@ public class DtoGenerator
      */
     public void addSimpleField(Class<?> c, String name, String persistentFieldName)
     {
-        DTOField dtoField = DTOField.create(name, c, null, null);
+        DTOField dtoField = create(name, c, null, null);
         dtoField.persistentFieldName = persistentFieldName;
         fields.add(dtoField);
     }
 
-    public void addFetchedField(Class<?> c, String name, String description, Class<?> fetchOptionsClass)
-    {
-        fields.add(DTOField.create(name, c, description, fetchOptionsClass));
-    }
-
-    public void addFetchedFieldFromInterface(Class<?> c, String name, String description, Class<?> fetchOptionsClass)
-    {
-        fields.add(DTOField.createFromInterface(name, c, description, fetchOptionsClass));
-    }
-
-    public void addPluralFetchedField(String definitionClassName, String importClassName, String name, String description, Class<?> fetchOptionsClass)
+    public DTOField addFetchedField(Class<?> c, String name, String description, Class<?> fetchOptionsClass)
     {
-        fields.add(DTOField.createPlural(name, definitionClassName, importClassName, description, fetchOptionsClass));
+        DTOField field = create(name, c, description, fetchOptionsClass);
+        fields.add(field);
+        return field;
     }
 
-    public void addPluralFetchedFieldFromInterface(String definitionClassName, String importClassName, String name, String description,
+    public DTOField addPluralFetchedField(String definitionClassName, String importClassName, String name, String description,
             Class<?> fetchOptionsClass)
     {
-        fields.add(DTOField.createPluralFromInterface(name, definitionClassName, importClassName, description, fetchOptionsClass));
+        DTOField field = createPlural(name, definitionClassName, importClassName, description, fetchOptionsClass);
+        fields.add(field);
+        return field;
     }
 
     public void addClassForImport(Class<?> c)
@@ -631,7 +624,7 @@ public class DtoGenerator
         print("");
     }
 
-    private void printClassHeader(String className, String jsonPackage, List<String> implementedInterfaces)
+    private void printClassHeader(String className, String jsonPackage, Collection<String> implementedInterfaces)
     {
         print("/**");
         print(" * Class automatically generated with {@link %s}", this.getClass().getName());
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/generators/Generator.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/generators/Generator.java
index e200baf7243cc586f5b2804a099551097ab714bd..e2cb034f7c6e7f2f58b6907a549817dd30471155 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/generators/Generator.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/generators/Generator.java
@@ -70,9 +70,10 @@ public class Generator extends AbstractGenerator
         addSpace(gen);
         addExperiment(gen);
         addProperties(gen);
-        gen.addPluralFetchedFieldFromInterface("List<Sample>", List.class.getName(), "parents", "Parents", SampleFetchOptions.class);
-        gen.addPluralFetchedFieldFromInterface("List<Sample>", List.class.getName(), "children", "Children", SampleFetchOptions.class);
-        gen.addImplementedInterfaceGeneric(IParentChildrenHolder.class);
+        gen.addPluralFetchedField("List<Sample>", List.class.getName(), "parents", "Parents", SampleFetchOptions.class)
+                .withInterfaceReflexive(IParentChildrenHolder.class);
+        gen.addPluralFetchedField("List<Sample>", List.class.getName(), "children", "Children", SampleFetchOptions.class)
+                .withInterfaceReflexive(IParentChildrenHolder.class);
         gen.addFetchedField(Sample.class, "container", "Container sample", SampleFetchOptions.class);
         gen.addPluralFetchedField("List<Sample>", List.class.getName(), "contained", "Contained samples", SampleFetchOptions.class);
         gen.addPluralFetchedField("List<DataSet>", List.class.getName(), "dataSets", "Data sets", DataSetFetchOptions.class);
@@ -193,9 +194,10 @@ public class Generator extends AbstractGenerator
         gen.addBooleanField("derived");
         gen.addBooleanField("placeholder");
 
-        gen.addPluralFetchedFieldFromInterface("List<DataSet>", List.class.getName(), "parents", "Parents", DataSetFetchOptions.class);
-        gen.addPluralFetchedFieldFromInterface("List<DataSet>", List.class.getName(), "children", "Children", DataSetFetchOptions.class);
-        gen.addImplementedInterfaceGeneric(IParentChildrenHolder.class);
+        gen.addPluralFetchedField("List<DataSet>", List.class.getName(), "parents", "Parents", DataSetFetchOptions.class)
+                .withInterfaceReflexive(IParentChildrenHolder.class);
+        gen.addPluralFetchedField("List<DataSet>", List.class.getName(), "children", "Children", DataSetFetchOptions.class)
+                .withInterfaceReflexive(IParentChildrenHolder.class);
         gen.addPluralFetchedField("List<DataSet>", List.class.getName(), "containers", "Container data sets", DataSetFetchOptions.class);
         gen.addPluralFetchedField("List<DataSet>", List.class.getName(), "contained", "Contained data sets", DataSetFetchOptions.class);
         gen.addFetchedField(ExternalData.class, "externalData", "External data", ExternalDataFetchOptions.class);