diff --git a/dotnet/AipsCore/Domain/Models/Shape/External/IShapeRepository.cs b/dotnet/AipsCore/Domain/Models/Shape/External/IShapeRepository.cs
index f9c0d40..d8ede47 100644
--- a/dotnet/AipsCore/Domain/Models/Shape/External/IShapeRepository.cs
+++ b/dotnet/AipsCore/Domain/Models/Shape/External/IShapeRepository.cs
@@ -1,9 +1,9 @@
+using AipsCore.Domain.Abstract;
 using AipsCore.Domain.Models.Shape.ValueObjects;
 
 namespace AipsCore.Domain.Models.Shape.External;
 
-public interface IShapeRepository
+public interface IShapeRepository : IAbstractRepository<Shape, ShapeId>
 {
-    Task<Shape?> Get(ShapeId id, CancellationToken cancellationToken = default);
-    Task Add(Shape shape, CancellationToken cancellationToken = default);
+    
 }
\ No newline at end of file
diff --git a/dotnet/AipsCore/Domain/Models/User/External/IUserRepository.cs b/dotnet/AipsCore/Domain/Models/User/External/IUserRepository.cs
index c776a74..7a9f154 100644
--- a/dotnet/AipsCore/Domain/Models/User/External/IUserRepository.cs
+++ b/dotnet/AipsCore/Domain/Models/User/External/IUserRepository.cs
@@ -1,9 +1,9 @@
+using AipsCore.Domain.Abstract;
 using AipsCore.Domain.Models.User.ValueObjects;
 
 namespace AipsCore.Domain.Models.User.External;
 
-public interface IUserRepository
+public interface IUserRepository : IAbstractRepository<User, UserId>
 {
-    Task<User?> Get(UserId userId, CancellationToken cancellationToken = default);
-    Task Save(User user, CancellationToken cancellationToken = default);
+    
 }
\ No newline at end of file
diff --git a/dotnet/AipsCore/Domain/Models/Whiteboard/External/IWhiteboardRepository.cs b/dotnet/AipsCore/Domain/Models/Whiteboard/External/IWhiteboardRepository.cs
index 9de5e1f..0fcfe36 100644
--- a/dotnet/AipsCore/Domain/Models/Whiteboard/External/IWhiteboardRepository.cs
+++ b/dotnet/AipsCore/Domain/Models/Whiteboard/External/IWhiteboardRepository.cs
@@ -1,11 +1,9 @@
+using AipsCore.Domain.Abstract;
 using AipsCore.Domain.Models.Whiteboard.ValueObjects;
 
 namespace AipsCore.Domain.Models.Whiteboard.External;
 
-public interface IWhiteboardRepository
+public interface IWhiteboardRepository : IAbstractRepository<Whiteboard, WhiteboardId>
 {
-    Task<Whiteboard?> Get(WhiteboardId whiteboardId, CancellationToken cancellationToken = default);
-    Task Save(Whiteboard whiteboard, CancellationToken cancellationToken = default);
     Task<bool> WhiteboardCodeExists(WhiteboardCode whiteboardCode);
-    
 }
\ No newline at end of file
diff --git a/dotnet/AipsCore/Domain/Models/WhiteboardMembership/External/IWhiteboardMembershipRepository.cs b/dotnet/AipsCore/Domain/Models/WhiteboardMembership/External/IWhiteboardMembershipRepository.cs
index 2d70762..f4641f3 100644
--- a/dotnet/AipsCore/Domain/Models/WhiteboardMembership/External/IWhiteboardMembershipRepository.cs
+++ b/dotnet/AipsCore/Domain/Models/WhiteboardMembership/External/IWhiteboardMembershipRepository.cs
@@ -1,9 +1,9 @@
+using AipsCore.Domain.Abstract;
 using AipsCore.Domain.Models.WhiteboardMembership.ValueObjects;
 
 namespace AipsCore.Domain.Models.WhiteboardMembership.External;
 
-public interface IWhiteboardMembershipRepository
+public interface IWhiteboardMembershipRepository : IAbstractRepository<WhiteboardMembership, WhiteboardMembershipId>
 {
-    Task<WhiteboardMembership?> Get(WhiteboardMembershipId whiteboardMembershipId, CancellationToken cancellationToken = default);
-    Task Save(WhiteboardMembership whiteboardMembership, CancellationToken cancellationToken = default);
+    
 }
\ No newline at end of file