diff --git a/back/src/Kyoo.Abstractions/Models/Resources/Episode.cs b/back/src/Kyoo.Abstractions/Models/Resources/Episode.cs
index a226c8a8..eda05306 100644
--- a/back/src/Kyoo.Abstractions/Models/Resources/Episode.cs
+++ b/back/src/Kyoo.Abstractions/Models/Resources/Episode.cs
@@ -150,6 +150,25 @@ namespace Kyoo.Abstractions.Models
 		/// <inheritdoc />
 		public Dictionary<string, MetadataId> ExternalId { get; set; } = new();
 
+		/// <summary>
+		/// The previous episode that should be seen before viewing this one.
+		/// </summary>
+		[LoadableRelation] public Episode? PreviousEpisode { get; set; }
+
+		/// <summary>
+		/// The next episode to watch after this one.
+		/// </summary>
+		[LoadableRelation] public Episode? NextEpisode { get; set; }
+
+		/// <summary>
+		/// Links to watch this episode.
+		/// </summary>
+		public object Links => new
+		{
+			Direct = $"/video/episode/{Slug}/direct",
+			Hls = $"/video/episode/{Slug}/master.m3u8",
+		};
+
 		/// <summary>
 		/// Get the slug of an episode.
 		/// </summary>
diff --git a/back/src/Kyoo.Abstractions/Models/Resources/Movie.cs b/back/src/Kyoo.Abstractions/Models/Resources/Movie.cs
index 99a9f854..de9b6243 100644
--- a/back/src/Kyoo.Abstractions/Models/Resources/Movie.cs
+++ b/back/src/Kyoo.Abstractions/Models/Resources/Movie.cs
@@ -121,6 +121,15 @@ namespace Kyoo.Abstractions.Models
 		/// </summary>
 		[LoadableRelation] public ICollection<Collection>? Collections { get; set; }
 
+		/// <summary>
+		/// Links to watch this movie.
+		/// </summary>
+		public object Links => new
+		{
+			Direct = $"/video/movie/{Slug}/direct",
+			Hls = $"/video/movie/{Slug}/master.m3u8",
+		};
+
 		/// <inheritdoc />
 		public void OnMerge(object merged)
 		{
diff --git a/back/src/Kyoo.Core/Controllers/LibraryManager.cs b/back/src/Kyoo.Core/Controllers/LibraryManager.cs
index d2c4d172..b134e76b 100644
--- a/back/src/Kyoo.Core/Controllers/LibraryManager.cs
+++ b/back/src/Kyoo.Core/Controllers/LibraryManager.cs
@@ -255,6 +255,28 @@ namespace Kyoo.Core.Controllers
 					.GetAll(x => x.Collections.Any(y => y.Id == obj.Id))
 					.Then(x => c.Shows = x),
 
+				(Collection c, nameof(Collection.Movies)) => MovieRepository
+					.GetAll(x => x.Collections.Any(y => y.Id == obj.Id))
+					.Then(x => c.Movies = x),
+
+
+				(Movie m, nameof(Movie.People)) => PeopleRepository
+					.GetFromShow(obj.Id)
+					.Then(x => m.People = x),
+
+				(Movie m, nameof(Movie.Collections)) => CollectionRepository
+					.GetAll(x => x.Movies.Any(y => y.Id == obj.Id))
+					.Then(x => m.Collections = x),
+
+				(Movie m, nameof(Movie.Studio)) => StudioRepository
+					.GetOrDefault(x => x.Movies.Any(y => y.Id == obj.Id))
+					.Then(x =>
+					{
+						m.Studio = x;
+						m.StudioID = x?.Id ?? 0;
+					}),
+
+
 				(Show s, nameof(Show.People)) => PeopleRepository
 					.GetFromShow(obj.Id)
 					.Then(x => s.People = x),
@@ -312,11 +334,28 @@ namespace Kyoo.Core.Controllers
 						e.SeasonID = x?.Id ?? 0;
 					}),
 
+				(Episode e, nameof(Episode.PreviousEpisode)) => EpisodeRepository
+					.GetAll(
+						where: x => x.ShowID == e.ShowID,
+						limit: new Pagination(1, e.Id, true)
+					).Then(x => e.PreviousEpisode = x.FirstOrDefault()),
+
+				(Episode e, nameof(Episode.NextEpisode)) => EpisodeRepository
+					.GetAll(
+						where: x => x.ShowID == e.ShowID,
+						limit: new Pagination(1, e.Id)
+					).Then(x => e.NextEpisode = x.FirstOrDefault()),
+
 
 				(Studio s, nameof(Studio.Shows)) => ShowRepository
 					.GetAll(x => x.Studio.Id == obj.Id)
 					.Then(x => s.Shows = x),
 
+				(Studio s, nameof(Studio.Movies)) => MovieRepository
+					.GetAll(x => x.Studio.Id == obj.Id)
+					.Then(x => s.Movies = x),
+
+
 				(People p, nameof(People.Roles)) => PeopleRepository
 					.GetFromPeople(obj.Id)
 					.Then(x => p.Roles = x),
diff --git a/back/src/Kyoo.Core/Controllers/Repositories/LibraryItemRepository.cs b/back/src/Kyoo.Core/Controllers/Repositories/LibraryItemRepository.cs
index 3414b63c..33dd9b8b 100644
--- a/back/src/Kyoo.Core/Controllers/Repositories/LibraryItemRepository.cs
+++ b/back/src/Kyoo.Core/Controllers/Repositories/LibraryItemRepository.cs
@@ -69,8 +69,6 @@ namespace Kyoo.Core.Controllers
 			Pagination limit = default)
 		{
 			return await ApplyFilters(_database.LibraryItems, where, sort, limit);
-				// .Select(x => x.ToItem())
-				// .ToList();
 		}
 
 		/// <inheritdoc />
diff --git a/back/src/Kyoo.Core/Views/Helper/Serializers/JsonSerializerContract.cs b/back/src/Kyoo.Core/Views/Helper/Serializers/JsonSerializerContract.cs
index e8cacb82..a5daeec4 100644
--- a/back/src/Kyoo.Core/Views/Helper/Serializers/JsonSerializerContract.cs
+++ b/back/src/Kyoo.Core/Views/Helper/Serializers/JsonSerializerContract.cs
@@ -16,7 +16,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Kyoo. If not, see <https://www.gnu.org/licenses/>.
 
-using System;
 using System.Collections.Generic;
 using System.Reflection;
 using Kyoo.Abstractions.Models;
@@ -73,76 +72,5 @@ namespace Kyoo.Core.Api
 				property.ShouldDeserialize = _ => false;
 			return property;
 		}
-
-		/// <inheritdoc />
-		protected override IList<JsonProperty> CreateProperties(Type type, MemberSerialization memberSerialization)
-		{
-			IList<JsonProperty> properties = base.CreateProperties(type, memberSerialization);
-			// if (!type.IsAssignableTo(typeof(Image)))
-			// 	return properties;
-			// foreach ((int id, string image) in Images.ImageName)
-			// {
-			// 	properties.Add(new JsonProperty
-			// 	{
-			// 		DeclaringType = type,
-			// 		PropertyName = image.ToLower(),
-			// 		UnderlyingName = image,
-			// 		PropertyType = typeof(string),
-			// 		Readable = true,
-			// 		Writable = false,
-			// 		ItemIsReference = false,
-			// 		TypeNameHandling = TypeNameHandling.None,
-			// 		ShouldSerialize = x =>
-			// 		{
-			// 			IThumbnails thumb = (IThumbnails)x;
-			// 			return thumb?.Images?.ContainsKey(id) == true;
-			// 		},
-			// 		ValueProvider = new ThumbnailProvider(id)
-			// 	});
-			// }
-			return properties;
-		}
-
-		/// <summary>
-		/// A custom <see cref="IValueProvider"/> that uses the
-		/// <see cref="IThumbnails"/>.<see cref="IThumbnails.Images"/> as a value.
-		/// </summary>
-		private class ThumbnailProvider : IValueProvider
-		{
-			/// <summary>
-			/// The index/ID of the image to retrieve/set.
-			/// </summary>
-			private readonly int _imageIndex;
-
-			/// <summary>
-			/// Create a new <see cref="ThumbnailProvider"/>.
-			/// </summary>
-			/// <param name="imageIndex">The index/ID of the image to retrieve/set.</param>
-			public ThumbnailProvider(int imageIndex)
-			{
-				_imageIndex = imageIndex;
-			}
-
-			/// <inheritdoc />
-			public void SetValue(object target, object value)
-			{
-				throw new NotSupportedException();
-			}
-
-			/// <inheritdoc />
-			public object GetValue(object target)
-			{
-				return null;
-				// string slug = (target as IResource)?.Slug ?? (target as ICustomTypeDescriptor)?.GetComponentName();
-				// if (target is not IThumbnails thumb
-				// || slug == null
-				// || string.IsNullOrEmpty(thumb.Images?.GetValueOrDefault(_imageIndex)))
-				// return null;
-				// string type = target is ICustomTypeDescriptor descriptor
-				// ? descriptor.GetClassName()
-				// : target.GetType().Name;
-				// return $"/{type}/{slug}/{Images.ImageName[_imageIndex]}".ToLowerInvariant();
-			}
-		}
 	}
 }
diff --git a/back/src/Kyoo.Postgresql/DatabaseContext.cs b/back/src/Kyoo.Postgresql/DatabaseContext.cs
index 7982c6e6..3d794f2c 100644
--- a/back/src/Kyoo.Postgresql/DatabaseContext.cs
+++ b/back/src/Kyoo.Postgresql/DatabaseContext.cs
@@ -231,6 +231,10 @@ namespace Kyoo.Postgresql
 		{
 			base.OnModelCreating(modelBuilder);
 
+			modelBuilder.Entity<Episode>()
+				.Ignore(x => x.PreviousEpisode)
+				.Ignore(x => x.NextEpisode);
+
 			modelBuilder.Entity<PeopleRole>()
 				.Ignore(x => x.ForPeople);