diff --git a/GBase/GBase.cs b/GBase/GBase.cs
index 0bf717e..e87c247 100644
--- a/GBase/GBase.cs
+++ b/GBase/GBase.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
+using GBase.Api;
 using GBase.Attributes;
 using GBase.Factories;
 using GBase.Interfaces;
@@ -100,6 +101,15 @@ namespace GBase
             return true;
         }
 
+        public IGBaseTable<T> GetTable<T>() where T : INotifyGBaseEntryChanged
+        {
+            if (Tables.OfType<IGBaseTable<T>>().Any())
+                return Tables.OfType<IGBaseTable<T>>().First();
+
+            //TODO: This probably doesn't work, because even though t.Type : T, IGBaseTable<t.Type> !: IGBaseTable<T>
+            return (IGBaseTable<T>) Tables.FirstOrDefault(t => typeof(T).IsAssignableFrom(t.Type)); //TestMe
+        }
+
         /// <summary>
         /// Removes a given <see cref="IGBaseTable"/> from this <see cref="GBase"/>
         /// </summary>
@@ -113,6 +123,15 @@ namespace GBase
             return Tables.Remove(table);
         }
 
+        public bool AddEntry<T>(T entry) where T : INotifyGBaseEntryChanged
+        {
+            IGBaseTable<T> table = GetTable<T>();
+            if (table == null)
+                throw new Exception(); //TODO: Create exception
+
+            return table.AddEntry(entry);
+        }
+
         /// <summary>
         /// Dispose used resources asynchronously
         /// </summary>
diff --git a/GBase/GBaseTable.cs b/GBase/GBaseTable.cs
index 92fa996..5684bb1 100644
--- a/GBase/GBaseTable.cs
+++ b/GBase/GBaseTable.cs
@@ -21,7 +21,7 @@ namespace GBase
     /// <summary>
     /// A <see cref="IGBase"/> table
     /// </summary>
-    public class GBaseTable : IGBaseTable
+    public class GBaseTable<T> : IGBaseTable<T> where T : INotifyGBaseEntryChanged
     {
         private readonly IFileHandler _fileHandler;
         private readonly IGBaseColumnFactory _gBaseColumnFactory;
@@ -35,7 +35,7 @@ namespace GBase
             _gBaseColumnFactory = gBaseColumnFactory;
 
             Columns = new List<IGBaseColumn>();
-            Entries = new List<object>();
+            Entries = new List<T>();
         }
 
 
@@ -57,7 +57,7 @@ namespace GBase
         /// <summary>
         /// The entries of this <see cref="IGBaseTable"/>
         /// </summary>
-        public List<object> Entries { get; }
+        public List<T> Entries { get; }
 
 
         /// <summary>
@@ -123,7 +123,7 @@ namespace GBase
         /// </summary>
         /// <param name="entry">The entry implementing <see cref="INotifyGBaseEntryChanged"/></param>
         /// <returns>True if successful, false if not</returns>
-        public bool AddEntry(INotifyGBaseEntryChanged entry) //TODO: Write to file
+        public bool AddEntry(T entry) //TODO: Write to file
         {
             Entries.Add(entry);
             entry.GBaseEntryChanged += OnGBaseEntryChanged;
@@ -136,7 +136,7 @@ namespace GBase
         /// </summary>
         /// <param name="entry">The entry implementing <see cref="INotifyGBaseEntryChanged"/></param>
         /// <returns>True if successful, false if not</returns>
-        public bool RemoveEntry(INotifyGBaseEntryChanged entry) //TODO: remove from file
+        public bool RemoveEntry(T entry) //TODO: remove from file
         {
             if (!Entries.Contains(entry))
                 return false;
@@ -188,7 +188,7 @@ namespace GBase
 
             Columns.Clear();
 
-            foreach (var entry in Entries.OfType<INotifyGBaseEntryChanged>().ToList())
+            foreach (var entry in Entries.ToList())
             {
                 RemoveEntry(entry);
             }
diff --git a/GBase/Interfaces/IGBase.cs b/GBase/Interfaces/IGBase.cs
index 614211a..955e242 100644
--- a/GBase/Interfaces/IGBase.cs
+++ b/GBase/Interfaces/IGBase.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
+using GBase.Api;
 using GBase.Interfaces.Settings;
 
 namespace GBase.Interfaces
@@ -48,11 +49,15 @@ namespace GBase.Interfaces
         /// <returns>True if successful, false if not</returns>
         bool AddTable(IGBaseTable table);
 
+        IGBaseTable<T> GetTable<T>() where T : INotifyGBaseEntryChanged;
+
         /// <summary>
         /// Removes a given <see cref="IGBaseTable"/> from this <see cref="IGBase"/>
         /// </summary>
         /// <param name="table">The given <see cref="IGBaseTable"/></param>
         /// <returns>True if successful, false if not</returns>
         bool RemoveTable(IGBaseTable table);
+
+        bool AddEntry<T>(T entry) where T : INotifyGBaseEntryChanged;
     }
 }
\ No newline at end of file
diff --git a/GBase/Interfaces/IGBaseTable.cs b/GBase/Interfaces/IGBaseTable.cs
index 613c0af..52673bc 100644
--- a/GBase/Interfaces/IGBaseTable.cs
+++ b/GBase/Interfaces/IGBaseTable.cs
@@ -10,6 +10,31 @@ using GBase.Api;
 
 namespace GBase.Interfaces
 {
+    public interface IGBaseTable<T> : IGBaseTable where T : INotifyGBaseEntryChanged
+    {
+        /// <summary>
+        /// The entries of this <see cref="IGBaseTable"/>
+        /// </summary>
+        List<T> Entries { get; }
+        
+        /// <summary>
+        /// Add an entry that implements <see cref="INotifyGBaseEntryChanged"/> to this <see cref="IGBaseTable"/>
+        /// </summary>
+        /// <param name="entry">The entry implementing <see cref="INotifyGBaseEntryChanged"/></param>
+        /// <returns>True if successful, false if not</returns>
+        bool AddEntry(T entry);
+
+        
+        //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"/>
+        /// </summary>
+        /// <param name="entry">The entry implementing <see cref="INotifyGBaseEntryChanged"/></param>
+        /// <returns>True if successful, false if not</returns>
+        bool RemoveEntry(T entry);
+    }
+    
     /// <summary>
     /// A <see cref="IGBase"/> table
     /// </summary>
@@ -30,11 +55,6 @@ namespace GBase.Interfaces
         /// </summary>
         List<IGBaseColumn> Columns { get; }
 
-        /// <summary>
-        /// The entries of this <see cref="IGBaseTable"/>
-        /// </summary>
-        List<object> Entries { get; }
-
         /// <summary>
         /// Initialize this <see cref="IGBase"/>
         /// </summary>
@@ -58,19 +78,5 @@ namespace GBase.Interfaces
         /// <param name="column">The given <see cref="IGBaseColumn"/></param>
         /// <returns>True if successful, false if not</returns>
         bool RemoveColumn(IGBaseColumn column);
-
-        /// <summary>
-        /// Add an entry that implements <see cref="INotifyGBaseEntryChanged"/> to this <see cref="IGBaseTable"/>
-        /// </summary>
-        /// <param name="entry">The entry implementing <see cref="INotifyGBaseEntryChanged"/></param>
-        /// <returns>True if successful, false if not</returns>
-        bool AddEntry(INotifyGBaseEntryChanged entry);
-
-        /// <summary>
-        /// Remove an entry that implements <see cref="INotifyGBaseEntryChanged"/> from this <see cref="IGBaseTable"/>
-        /// </summary>
-        /// <param name="entry">The entry implementing <see cref="INotifyGBaseEntryChanged"/></param>
-        /// <returns>True if successful, false if not</returns>
-        bool RemoveEntry(INotifyGBaseEntryChanged entry);
     }
 }
\ No newline at end of file