diff --git a/Sources/Model/IDataManager.cs b/Sources/Model/IDataManager.cs
index 34fbb0f..7657f06 100644
--- a/Sources/Model/IDataManager.cs
+++ b/Sources/Model/IDataManager.cs
@@ -2,7 +2,9 @@
 
 public interface IDataManager
 {
-    List<Title> GetTitles();
+    List<CustomTitle> GetCustomTitles();
+
+    List<InfoTitle> GetInfoTitles();
 
     List<Album> GetAlbums();
 
@@ -16,7 +18,9 @@ public interface IDataManager
 
     public void AddPlaylist(Playlist playlist);
 
-    public void AddTitle(Title title);
+    public void AddCustomTitle(CustomTitle title);
+
+    public void AddInfoTitle(InfoTitle title);
 
     public void RemoveAlbum(Album album);
 
@@ -24,6 +28,8 @@ public interface IDataManager
 
     public void RemovePlaylist(Playlist playlist);
 
-    public void RemoveTitle(Title title);
+    public void RemoveCustomTitle(CustomTitle title);
+
+    public void RemoveInfoTitle(InfoTitle title);
 
 }
\ No newline at end of file
diff --git a/Sources/Model/Manager.cs b/Sources/Model/Manager.cs
index 02bb855..10598e7 100644
--- a/Sources/Model/Manager.cs
+++ b/Sources/Model/Manager.cs
@@ -14,13 +14,23 @@ public class Manager
         }
     }
 
-    private List<Title> titles = new List<Title>();
+    private List<CustomTitle> customTitles = new List<CustomTitle>();
 
-    public IEnumerable<Title> Titles
+    public IEnumerable<CustomTitle> CustomTitles
     {
         get
         {
-            return titles.ToList();
+            return customTitles.ToList();
+        }
+    }
+
+    private List<InfoTitle> infoTitles = new List<InfoTitle>();
+
+    public IEnumerable<InfoTitle> InfoTitles
+    {
+        get
+        {
+            return infoTitles.ToList();
         }
     }
 
@@ -49,7 +59,8 @@ public class Manager
         DataManager = new StubManager();
 
         albums = DataManager.GetAlbums();
-        titles = DataManager.GetTitles();
+        customTitles = DataManager.GetCustomTitles();
+        infoTitles = DataManager.GetInfoTitles();
         playlists = DataManager.GetPlaylists();
         artists = DataManager.GetArtists();
     }
@@ -60,11 +71,18 @@ public class Manager
         albums = DataManager.GetAlbums();
     }
 
-    public void AddTitle(Title title)
+    public void AddCustomTitle(CustomTitle title)
     {
-        DataManager.AddTitle(title);
-        titles = DataManager.GetTitles();
+        DataManager.AddCustomTitle(title);
+        customTitles = DataManager.GetCustomTitles();
     }
+
+    public void AddInfoTitle(InfoTitle title)
+    {
+        DataManager.AddInfoTitle(title);
+        infoTitles = DataManager.GetInfoTitles();
+    }
+
     public void AddPlaylist(Playlist playlist)
     {
         DataManager.AddPlaylist(playlist);
@@ -77,10 +95,16 @@ public class Manager
         albums = DataManager.GetAlbums();
     }
 
-    public void RemoveTitle(Title title)
+    public void RemoveCustomTitle(CustomTitle title)
+    {
+        DataManager.RemoveCustomTitle(title);
+        customTitles = DataManager.GetCustomTitles();
+    }
+
+    public void RemoveInfoTitle(InfoTitle title)
     {
-        DataManager.RemoveTitle(title);
-        titles = DataManager.GetTitles();
+        DataManager.RemoveInfoTitle(title);
+        infoTitles = DataManager.GetInfoTitles();
     }
 
     public void RemovePlaylist(Playlist playlist)
@@ -94,9 +118,14 @@ public class Manager
         return DataManager.GetAlbums();
     }
 
-    public IEnumerable<Title> GetTitles()
+    public IEnumerable<CustomTitle> GetCustomTitles()
+    {
+        return DataManager.GetCustomTitles();
+    }
+
+    public IEnumerable<InfoTitle> GetInfoTitles()
     {
-        return DataManager.GetTitles();
+        return DataManager.GetInfoTitles();
     }
 
     public IEnumerable<Artist> GetArtists()
diff --git a/Sources/Model/Stub/StubManager.cs b/Sources/Model/Stub/StubManager.cs
index b7836c3..f73fcfb 100644
--- a/Sources/Model/Stub/StubManager.cs
+++ b/Sources/Model/Stub/StubManager.cs
@@ -183,10 +183,16 @@ public class StubManager : IDataManager
         albums.Add(album);
     }
 
-    /*public void AddTitle(Title title)
+    public void AddCustomTitle(CustomTitle title)
     {
-        titles.Add(title);
-    }*/
+        customTitles.Add(title);
+    }
+
+    public void AddInfoTitle(InfoTitle title)
+    {
+        infoTitles.Add(title);
+    }
+
     public void AddPlaylist(Playlist playlist)
     {
         playlists.Add(playlist);
@@ -204,10 +210,15 @@ public class StubManager : IDataManager
         albums.Remove(album);
     }
 
-    /*public void RemoveTitle(Title title)
+    public void RemoveCustomTitle(CustomTitle title)
     {
-        titles.Remove(title);
-    }*/
+        customTitles.Remove(title);
+    }
+
+    public void RemoveInfoTitle(InfoTitle title)
+    {
+        infoTitles.Remove(title);
+    }
 
     public void RemovePlaylist(Playlist playlist)
     {