diff --git a/GBase/Exceptions/InvalidTableTypeException.cs b/GBase/Exceptions/InvalidTableTypeException.cs
index 9be6013..948b84c 100644
--- a/GBase/Exceptions/InvalidTableTypeException.cs
+++ b/GBase/Exceptions/InvalidTableTypeException.cs
@@ -3,21 +3,21 @@
 // Copyright(c) 2020 SimonG. All Rights Reserved.
 
 using System;
-using GBase.Api;
+using GBase.Interfaces;
 
 namespace GBase.Exceptions
 {
     /// <summary>
-    /// <see cref="Exception"/> that the passed table type doesn't implement <see cref="INotifyGBaseEntryChanged"/>"/>
+    /// <see cref="Exception"/> that the passed table type doesn't implement <see cref="IGBaseObject"/>"/>
     /// </summary>
     public class InvalidTableTypeException : Exception
     {
         /// <summary>
-        /// <see cref="Exception"/> that the passed table type doesn't implement <see cref="INotifyGBaseEntryChanged"/>"/>
+        /// <see cref="Exception"/> that the passed table type doesn't implement <see cref="IGBaseObject"/>"/>
         /// </summary>
         /// <param name="type">The table type</param>
         public InvalidTableTypeException(Type type)
-            : base($"Table type ({type}) doesn't implement {nameof(INotifyGBaseEntryChanged)}.")
+            : base($"Table type ({type}) doesn't implement {nameof(IGBaseObject)}.")
         {
             Type = type;
         }
diff --git a/GBase/GBaseTable.cs b/GBase/GBaseTable.cs
index 6571f69..5d8cfb9 100644
--- a/GBase/GBaseTable.cs
+++ b/GBase/GBaseTable.cs
@@ -8,7 +8,6 @@ using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
-using GBase.Api;
 using GBase.Attributes;
 using GBase.Exceptions;
 using GBase.Factories;
@@ -176,9 +175,9 @@ namespace GBase
         }
 
         /// <summary>
-        /// Add an entry that implements <see cref="INotifyGBaseEntryChanged"/> to this <see cref="IGBaseTable"/>
+        /// Add an entry that implements <see cref="IGBaseObject"/> to this <see cref="IGBaseTable"/>
         /// </summary>
-        /// <param name="entry">The entry implementing <see cref="INotifyGBaseEntryChanged"/></param>
+        /// <param name="entry">The entry implementing <see cref="IGBaseObject"/></param>
         /// <param name="cancellationToken"></param>
         /// <returns>True if successful, false if not</returns>
         public async Task<bool> AddEntry(T entry, CancellationToken cancellationToken)
@@ -200,9 +199,9 @@ namespace GBase
         }
 
         /// <summary>
-        /// Remove an entry that implements <see cref="INotifyGBaseEntryChanged"/> from this <see cref="IGBaseTable"/>
+        /// Remove an entry that implements <see cref="IGBaseObject"/> from this <see cref="IGBaseTable"/>
         /// </summary>
-        /// <param name="entry">The entry implementing <see cref="INotifyGBaseEntryChanged"/></param>
+        /// <param name="entry">The entry implementing <see cref="IGBaseObject"/></param>
         /// <returns>True if successful, false if not</returns>
         public async Task<bool> RemoveEntry(T entry)
         {
diff --git a/GBase/Interfaces/IGBaseTable.cs b/GBase/Interfaces/IGBaseTable.cs
index a43a036..505cd0f 100644
--- a/GBase/Interfaces/IGBaseTable.cs
+++ b/GBase/Interfaces/IGBaseTable.cs
@@ -6,7 +6,6 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using GBase.Api;
 
 namespace GBase.Interfaces
 {
@@ -18,9 +17,9 @@ namespace GBase.Interfaces
         List<T> Entries { get; }
 
         /// <summary>
-        /// Add an entry that implements <see cref="INotifyGBaseEntryChanged"/> to this <see cref="IGBaseTable"/>
+        /// Add an entry that implements <see cref="IGBaseObject"/> to this <see cref="IGBaseTable"/>
         /// </summary>
-        /// <param name="entry">The entry implementing <see cref="INotifyGBaseEntryChanged"/></param>
+        /// <param name="entry">The entry implementing <see cref="IGBaseObject"/></param>
         /// <param name="cancellationToken"></param>
         /// <returns>True if successful, false if not</returns>
         Task<bool> AddEntry(T entry, CancellationToken cancellationToken);
@@ -29,9 +28,9 @@ namespace GBase.Interfaces
         //T GetEntry(T entry); //TODO: This doesn't make sense... (passing instance of T to get the same instance back...)
 
         /// <summary>
-        /// Remove an entry that implements <see cref="INotifyGBaseEntryChanged"/> from this <see cref="IGBaseTable"/>
+        /// Remove an entry that implements <see cref="IGBaseObject"/> from this <see cref="IGBaseTable"/>
         /// </summary>
-        /// <param name="entry">The entry implementing <see cref="INotifyGBaseEntryChanged"/></param>
+        /// <param name="entry">The entry implementing <see cref="IGBaseObject"/></param>
         /// <returns>True if successful, false if not</returns>
         Task<bool> RemoveEntry(T entry);