diff --git a/dotnet/AipsCore/Infrastructure/Persistence/User/User.cs b/dotnet/AipsCore/Infrastructure/Persistence/User/User.cs
index 1e5c9d0..3d6f3a2 100644
--- a/dotnet/AipsCore/Infrastructure/Persistence/User/User.cs
+++ b/dotnet/AipsCore/Infrastructure/Persistence/User/User.cs
@@ -19,4 +19,10 @@ public class User
     public DateTime CreatedAt { get; set; }
     
     public DateTime? DeletedAt { get; set; }
+    
+    public ICollection<Shape.Shape> Shapes { get; set; } = new List<Shape.Shape>();
+    
+    public ICollection<Whiteboard.Whiteboard> Whiteboards { get; set; } = new List<Whiteboard.Whiteboard>();
+    
+    public ICollection<WhiteboardMembership.WhiteboardMembership> Memberships { get; set; } = new List<WhiteboardMembership.WhiteboardMembership>();
 }
\ No newline at end of file
diff --git a/dotnet/AipsCore/Infrastructure/Persistence/Whiteboard/Whiteboard.cs b/dotnet/AipsCore/Infrastructure/Persistence/Whiteboard/Whiteboard.cs
index d44b0fd..f0f0f5b 100644
--- a/dotnet/AipsCore/Infrastructure/Persistence/Whiteboard/Whiteboard.cs
+++ b/dotnet/AipsCore/Infrastructure/Persistence/Whiteboard/Whiteboard.cs
@@ -32,4 +32,8 @@ public class Whiteboard
     public WhiteboardJoinPolicy JoinPolicy { get; set; }
     
     public WhiteboardState State { get; set; }
+    
+    public ICollection<Shape.Shape> Shapes { get; set; } = new List<Shape.Shape>();
+    
+    public ICollection<WhiteboardMembership.WhiteboardMembership> Memberships { get; set; } = new List<WhiteboardMembership.WhiteboardMembership>();
 }
\ No newline at end of file