diff --git a/dotnet/AipsCore/Domain/Models/Shape/Shape.cs b/dotnet/AipsCore/Domain/Models/Shape/Shape.cs
index 3be68f2..0503bf5 100644
--- a/dotnet/AipsCore/Domain/Models/Shape/Shape.cs
+++ b/dotnet/AipsCore/Domain/Models/Shape/Shape.cs
@@ -1,6 +1,7 @@
 using System.Drawing;
 using AipsCore.Domain.Models.Shape.Enums;
 using AipsCore.Domain.Models.Shape.ValueObjects;
+using AipsCore.Domain.Models.Whiteboard.ValueObjects;
 
 namespace AipsCore.Domain.Models.Shape;
 
@@ -8,16 +9,19 @@ public abstract class Shape
 {
     public ShapeId Id { get; }
     
+    public WhiteboardId WhiteboardId { get; private set; }
+    
     public abstract ShapeTypeEnum ShapeType { get; }
     
     public Position Position { get; private set; }
 
     public Color Color { get; private set; }
 
-    protected Shape(ShapeId id, Position position, Color color)
+    protected Shape(ShapeId id, WhiteboardId whiteboardId, Position position, Color color)
     {
         Id = id;
         Position = position;
         Color = color;
+        WhiteboardId = whiteboardId;
     }
 }
\ No newline at end of file
diff --git a/dotnet/AipsCore/Domain/Models/Shape/Sub/Arrow/Arrow.cs b/dotnet/AipsCore/Domain/Models/Shape/Sub/Arrow/Arrow.cs
index bf8b9c1..ab8593b 100644
--- a/dotnet/AipsCore/Domain/Models/Shape/Sub/Arrow/Arrow.cs
+++ b/dotnet/AipsCore/Domain/Models/Shape/Sub/Arrow/Arrow.cs
@@ -1,6 +1,7 @@
 using System.Drawing;
 using AipsCore.Domain.Models.Shape.Enums;
 using AipsCore.Domain.Models.Shape.ValueObjects;
+using AipsCore.Domain.Models.Whiteboard.ValueObjects;
 
 namespace AipsCore.Domain.Models.Shape.Sub.Arrow;
 
@@ -9,7 +10,7 @@ public class Arrow : Shape
     public Position EndPosition { get; private set; }
     public Thickness Thickness { get; private set; }
     
-    public Arrow(ShapeId id, Position position, Color color, Position endPosition, Thickness thickness) : base(id, position, color)
+    public Arrow(ShapeId id, WhiteboardId whiteboardId, Position position, Color color, Position endPosition, Thickness thickness) : base(id, whiteboardId, position, color)
     {
         EndPosition = endPosition;
         Thickness = thickness;
diff --git a/dotnet/AipsCore/Domain/Models/Shape/Sub/Line/Line.cs b/dotnet/AipsCore/Domain/Models/Shape/Sub/Line/Line.cs
index b3ea13a..5ce452c 100644
--- a/dotnet/AipsCore/Domain/Models/Shape/Sub/Line/Line.cs
+++ b/dotnet/AipsCore/Domain/Models/Shape/Sub/Line/Line.cs
@@ -1,6 +1,7 @@
 using System.Drawing;
 using AipsCore.Domain.Models.Shape.Enums;
 using AipsCore.Domain.Models.Shape.ValueObjects;
+using AipsCore.Domain.Models.Whiteboard.ValueObjects;
 
 namespace AipsCore.Domain.Models.Shape.Sub.Line;
 
@@ -9,7 +10,7 @@ public class Line : Shape
     public Position EndPosition { get; private set; }
     public Thickness Thickness { get; private set; }
     
-    public Line(ShapeId id, Position position, Color color, Position endPosition, Thickness thickness) : base(id, position, color)
+    public Line(ShapeId id, WhiteboardId whiteboardId, Position position, Color color, Position endPosition, Thickness thickness) : base(id, whiteboardId, position, color)
     {
         EndPosition = endPosition;
         Thickness = thickness;
diff --git a/dotnet/AipsCore/Domain/Models/Shape/Sub/Rectangle/Rectangle.cs b/dotnet/AipsCore/Domain/Models/Shape/Sub/Rectangle/Rectangle.cs
index 743176d..fee0a10 100644
--- a/dotnet/AipsCore/Domain/Models/Shape/Sub/Rectangle/Rectangle.cs
+++ b/dotnet/AipsCore/Domain/Models/Shape/Sub/Rectangle/Rectangle.cs
@@ -1,6 +1,7 @@
 using System.Drawing;
 using AipsCore.Domain.Models.Shape.Enums;
 using AipsCore.Domain.Models.Shape.ValueObjects;
+using AipsCore.Domain.Models.Whiteboard.ValueObjects;
 
 namespace AipsCore.Domain.Models.Shape.Sub.Rectangle;
 
@@ -12,8 +13,8 @@ public class Rectangle : Shape
     
     public Thickness BorderThickness { get; }
     
-    public Rectangle(ShapeId id, Position position, Color color, Position endPosition, Thickness borderThickness) 
-        : base(id, position, color)
+    public Rectangle(ShapeId id, WhiteboardId whiteboardId, Position position, Color color, Position endPosition, Thickness borderThickness) 
+        : base(id, whiteboardId, position, color)
     {
         EndPosition = endPosition;
         BorderThickness = borderThickness;
diff --git a/dotnet/AipsCore/Domain/Models/Shape/Sub/TextShape/TextShape.cs b/dotnet/AipsCore/Domain/Models/Shape/Sub/TextShape/TextShape.cs
index 057d0d2..5b92592 100644
--- a/dotnet/AipsCore/Domain/Models/Shape/Sub/TextShape/TextShape.cs
+++ b/dotnet/AipsCore/Domain/Models/Shape/Sub/TextShape/TextShape.cs
@@ -2,6 +2,7 @@ using System.Drawing;
 using AipsCore.Domain.Models.Shape.Enums;
 using AipsCore.Domain.Models.Shape.Sub.TextShape.ValueObjects;
 using AipsCore.Domain.Models.Shape.ValueObjects;
+using AipsCore.Domain.Models.Whiteboard.ValueObjects;
 
 namespace AipsCore.Domain.Models.Shape.Sub.TextShape;
 
@@ -11,8 +12,8 @@ public class TextShape : Shape
     
     public TextShapeSize TextShapeSize { get; private set; }
     
-    public TextShape(ShapeId id, Position position, Color color, TextShapeValue textShapeValue, TextShapeSize textShapeSize) 
-        : base(id, position, color)
+    public TextShape(ShapeId id, WhiteboardId whiteboardId, Position position, Color color, TextShapeValue textShapeValue, TextShapeSize textShapeSize) 
+        : base(id, whiteboardId, position, color)
     {
         TextShapeValue = textShapeValue;
         TextShapeSize = textShapeSize;