diff --git a/Source/SeaInk.Infrastructure/SeaInk.Infrastructure.DataAccess/Database/DatabaseContext.cs b/Source/SeaInk.Infrastructure/SeaInk.Infrastructure.DataAccess/Database/DatabaseContext.cs
index a32565a..52eab79 100644
--- a/Source/SeaInk.Infrastructure/SeaInk.Infrastructure.DataAccess/Database/DatabaseContext.cs
+++ b/Source/SeaInk.Infrastructure/SeaInk.Infrastructure.DataAccess/Database/DatabaseContext.cs
@@ -1,9 +1,10 @@
 using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
 using SeaInk.Core.Entities;
 using SeaInk.Core.TableLayout;
-using SeaInk.Core.TableLayout.Components;
-using SeaInk.Core.TableLayout.ComponentsBase;
+using SeaInk.Infrastructure.DataAccess.Exceptions;
 using SeaInk.Infrastructure.DataAccess.Models;
+using SeaInk.Utility.Extensions;
 
 namespace SeaInk.Infrastructure.DataAccess.Database
 {
@@ -36,7 +37,12 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             ConfigureMentor(modelBuilder);
             ConfigureStudent(modelBuilder);
 
-            // ConfigureTableComponents(modelBuilder);
+            modelBuilder.Entity<StudyGroupSubjectLayout>()
+                .Property(ssg => ssg.Layout)
+                .HasConversion(
+                    component => JsonConvert.SerializeObject(component),
+                    s => JsonConvert.DeserializeObject<TableLayoutComponent>(s)
+                        .ThrowIfNull(new FailedTableLayoutComponentDeserializationException(s)));
         }
 
         private static void ConfigureAssignment(ModelBuilder modelBuilder)
@@ -91,16 +97,5 @@ private static void ConfigureStudyGroupSubject(ModelBuilder modelBuilder)
                 .Navigation(ssg => ssg.Mentors)
                 .HasField("_mentors");
         }
-
-        private static void ConfigureTableComponents(ModelBuilder modelBuilder)
-        {
-            modelBuilder.Entity<LabelComponent>().Property(x => x.Id).ValueGeneratedNever();
-            modelBuilder.Entity(typeof(CompositeLayoutComponent<>)).HasMany("_components");
-            modelBuilder.Entity<LabelComponent>().Property("_value");
-
-            modelBuilder.Entity<TableLayoutComponent>().HasOne<HeaderLayoutComponent>("_header");
-            modelBuilder.Entity<HeaderLayoutComponent>().HasOne<HorizontalStackLayoutComponent<LayoutComponent>>("_stack");
-            modelBuilder.Entity<AssignmentsComponent>().HasOne<HorizontalStackLayoutComponent<AssignmentColumnComponent>>("_stack");
-        }
     }
 }
\ No newline at end of file
diff --git a/Source/SeaInk.Infrastructure/SeaInk.Infrastructure.DataAccess/Exceptions/FailedTableLayoutComponentDeserializationException.cs b/Source/SeaInk.Infrastructure/SeaInk.Infrastructure.DataAccess/Exceptions/FailedTableLayoutComponentDeserializationException.cs
new file mode 100644
index 0000000..6b5525b
--- /dev/null
+++ b/Source/SeaInk.Infrastructure/SeaInk.Infrastructure.DataAccess/Exceptions/FailedTableLayoutComponentDeserializationException.cs
@@ -0,0 +1,10 @@
+using SeaInk.Core.TableLayout;
+using SeaInk.Core.Tools;
+
+namespace SeaInk.Infrastructure.DataAccess.Exceptions;
+
+public class FailedTableLayoutComponentDeserializationException : SeaInkException
+{
+    public FailedTableLayoutComponentDeserializationException(string serialized)
+        : base($"{nameof(TableLayoutComponent)} deserialization failed. Value:\n{serialized}") { }
+}
\ No newline at end of file
diff --git a/Source/SeaInk.Infrastructure/SeaInk.Infrastructure.DataAccess/SeaInk.Infrastructure.DataAccess.csproj b/Source/SeaInk.Infrastructure/SeaInk.Infrastructure.DataAccess/SeaInk.Infrastructure.DataAccess.csproj
index 8912e8c..ec6bb53 100644
--- a/Source/SeaInk.Infrastructure/SeaInk.Infrastructure.DataAccess/SeaInk.Infrastructure.DataAccess.csproj
+++ b/Source/SeaInk.Infrastructure/SeaInk.Infrastructure.DataAccess/SeaInk.Infrastructure.DataAccess.csproj
@@ -24,6 +24,7 @@
       <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="6.0.0" />
       <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
       <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.376">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>