Index: src/Common/DelftTools.Shell.Core/Project.cs
===================================================================
diff -u -r8edbe5e2130c81b456385607891c6ef98928f88e -r5238d4a7956b8d24318d37d9974d50b039fd95e7
--- src/Common/DelftTools.Shell.Core/Project.cs	(.../Project.cs)	(revision 8edbe5e2130c81b456385607891c6ef98928f88e)
+++ src/Common/DelftTools.Shell.Core/Project.cs	(.../Project.cs)	(revision 5238d4a7956b8d24318d37d9974d50b039fd95e7)
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using DelftTools.Utils.Aop;
 using DelftTools.Utils.Collections.Generic;
 using DelftTools.Utils.Data;
 
@@ -7,6 +8,7 @@
     /// <summary>
     /// Container of all data and tasks.
     /// </summary>
+    [Entity(FireOnCollectionChange = false)]
     public class Project : EditableObjectUnique<long>, IObservable
     {
         private string name;
Index: src/Common/DelftTools.Utils/Data/EditableObjectUnique.cs
===================================================================
diff -u -rd505e5545e25721aee2dfb60bc2a27ab1878a0ad -r5238d4a7956b8d24318d37d9974d50b039fd95e7
--- src/Common/DelftTools.Utils/Data/EditableObjectUnique.cs	(.../EditableObjectUnique.cs)	(revision d505e5545e25721aee2dfb60bc2a27ab1878a0ad)
+++ src/Common/DelftTools.Utils/Data/EditableObjectUnique.cs	(.../EditableObjectUnique.cs)	(revision 5238d4a7956b8d24318d37d9974d50b039fd95e7)
@@ -10,7 +10,6 @@
     /// </summary>
     /// <remarks>This IEditableObject implementation allows nested edit actions</remarks>
     /// <typeparam name="T"></typeparam>
-    [Entity(FireOnCollectionChange = false)]
     public abstract class EditableObjectUnique<T> : IEditableObject
     {
         private readonly Stack<IEditAction> editActions = new Stack<IEditAction>();