diff --git a/ErsatzTV.Core/Domain/Scheduling/ChannelPlayout.cs b/ErsatzTV.Core/Domain/Scheduling/ChannelPlayout.cs
new file mode 100644
index 00000000..18eea47e
--- /dev/null
+++ b/ErsatzTV.Core/Domain/Scheduling/ChannelPlayout.cs
@@ -0,0 +1,8 @@
+namespace ErsatzTV.Core.Domain.Scheduling;
+
+public class ChannelPlayout
+{
+    public int Id { get; set; }
+    public int ChannelId { get; set; }
+    public Channel Channel { get; set; }
+}
diff --git a/ErsatzTV.Core/Domain/Scheduling/ChannelPlayoutItem.cs b/ErsatzTV.Core/Domain/Scheduling/ChannelPlayoutItem.cs
new file mode 100644
index 00000000..b8d78f11
--- /dev/null
+++ b/ErsatzTV.Core/Domain/Scheduling/ChannelPlayoutItem.cs
@@ -0,0 +1,16 @@
+namespace ErsatzTV.Core.Domain.Scheduling;
+
+public class ChannelPlayoutItem
+{
+    public int Id { get; set; }
+    public int ChannelPlayoutId { get; set; }
+    public ChannelPlayout ChannelPlayout { get; set; }
+    public int MediaItemId { get; set; }
+    public MediaItem MediaItem { get; set; }
+    public DateTime Start { get; set; }
+    public DateTime Finish { get; set; }
+    public TimeSpan InPoint { get; set; }
+    public TimeSpan OutPoint { get; set; }
+    public DateTimeOffset StartOffset => new DateTimeOffset(Start, TimeSpan.Zero).ToLocalTime();
+    public DateTimeOffset FinishOffset => new DateTimeOffset(Finish, TimeSpan.Zero).ToLocalTime();
+}
diff --git a/ErsatzTV.Core/Domain/Scheduling/ScheduleBlockItem.cs b/ErsatzTV.Core/Domain/Scheduling/ScheduleBlockItem.cs
index fcf1de27..949629b3 100644
--- a/ErsatzTV.Core/Domain/Scheduling/ScheduleBlockItem.cs
+++ b/ErsatzTV.Core/Domain/Scheduling/ScheduleBlockItem.cs
@@ -6,7 +6,7 @@ public class ScheduleBlockItem
     public int Index { get; set; }
     public string Name { get; set; }
     public string Query { get; set; }
-    // public ScheduleBlockItemGuideMode GuideMode { get; set; }
+    // public ScheduleBlockItemContentType ContentType { get; set; }
     // public string CustomTitle { get; set; }
     public PlayoutMode PlayoutMode { get; set; }
     public PlaybackOrder PlaybackOrder { get; set; }
diff --git a/ErsatzTV.Core/Domain/Scheduling/ScheduleBlockItemContentType.cs b/ErsatzTV.Core/Domain/Scheduling/ScheduleBlockItemContentType.cs
new file mode 100644
index 00000000..2bd78d4b
--- /dev/null
+++ b/ErsatzTV.Core/Domain/Scheduling/ScheduleBlockItemContentType.cs
@@ -0,0 +1,7 @@
+namespace ErsatzTV.Core.Domain.Scheduling;
+
+public enum ScheduleBlockItemContentType
+{
+    Normal = 0,
+    Filler = 1
+}
diff --git a/ErsatzTV.Core/Domain/Scheduling/ScheduleBlockItemGuideMode.cs b/ErsatzTV.Core/Domain/Scheduling/ScheduleBlockItemGuideMode.cs
deleted file mode 100644
index bbb78a71..00000000
--- a/ErsatzTV.Core/Domain/Scheduling/ScheduleBlockItemGuideMode.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace ErsatzTV.Core.Domain.Scheduling;
-
-public enum ScheduleBlockItemGuideMode
-{
-    Normal = 0,
-    UsePrevious = 1,
-    UseNext = 2
-}