diff --git a/ScrumTaskboard/TaskContext.cs b/ScrumTaskboard/TaskContext.cs
index 1bf0247..264486d 100644
--- a/ScrumTaskboard/TaskContext.cs
+++ b/ScrumTaskboard/TaskContext.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System;
-using System.Runtime.Serialization;
-
+using System.Runtime.Serialization;
+
 namespace ScrumTaskboard
 {
     public class TaskContext : DbContext 
@@ -24,12 +24,25 @@ namespace ScrumTaskboard
         public int id { get; set; }
         public string title { get; set; }
         public string content { get; set; }
-        public int status { get; set; }
-        public int category { get; set; }
-        public int assignedto { get; set; }
-        public int sprint { get; set; }
-        public int project { get; set; }
-        public int userstory { get; set; }
+        
+        public int statusid { get; set; }
+        public ScrumStatus status { get; set; }
+
+        public int categoryid { get; set; }
+        public ScrumCategory category { get; set; }
+
+        public int assignedtoid { get; set; }
+        public ScrumUser assignedto { get; set; }
+
+        public int sprintid { get; set; }
+        public ScrumSprint sprint { get; set; }
+
+        public int projectid { get; set; }
+        public ScrumProject project { get; set; }
+
+        public int userstoryid { get; set; }
+        public ScrumUserstory userstory { get; set; }
+
         public ScrumPrio priority { get; set; }
     }
 
@@ -39,10 +52,18 @@ namespace ScrumTaskboard
         public string title { get; set; }
         public string content { get; set; }
         public ScrumPrio priority { get; set; }
-        public int status { get; set; }
-        public int category { get; set; }
-        public int createdby { get; set; }
-        public int project { get; set; }
+
+        public int statusid { get; set; }
+        public ScrumStatus status { get; set; }
+
+        public int categoryid { get; set; }
+        public ScrumCategory category { get; set; }
+
+        public int createdbyid { get; set; }
+        public ScrumUser createdby { get; set; }
+
+        public int projectid { get; set; }
+        public ScrumProject project { get; set; }
     }
 
     public class ScrumCategory
@@ -51,7 +72,9 @@ namespace ScrumTaskboard
         public string title { get; set; }
         public string description { get; set; }
         public string color { get; set; }
-        public int project { get; set; }
+
+        public int projectid { get; set; }
+        public ScrumProject project { get; set; }
     }
 
     public class ScrumSprint
@@ -61,36 +84,39 @@ namespace ScrumTaskboard
         public string description { get; set; }
         public DateTime startDate { get; set; }
         public DateTime endDate { get; set; }
-        public int project { get; set; }
+
+
+        public int projectid { get; set; }
+        public ScrumProject project { get; set; }
     }
 
-    public class ScrumStatus
-    {
+    public class ScrumStatus
+    {
         public int id { get; set; }
         public string title { get; set; }
-        public string description { get; set; }
+        public string description { get; set; }
     }
 
-    public class ScrumProject
-    {
+    public class ScrumProject
+    {
         public int id { get; set; }
         public string title { get; set; }
-        public bool isprivate { get; set; }
+        public bool isprivate { get; set; }
     }
 
-    public class ScrumUser
-    {
+    public class ScrumUser
+    {
         public int id { get; set; }
         public string name { get; set; }
     }
 
-    public enum ScrumPrio
-    {
-        [EnumMember(Value = "low")]
-        low,
-        [EnumMember(Value = "medium")]
-        medium,
-        [EnumMember(Value = "high")]
-        high
+    public enum ScrumPrio
+    {
+        [EnumMember(Value = "low")]
+        low,
+        [EnumMember(Value = "medium")]
+        medium,
+        [EnumMember(Value = "high")]
+        high
     }
 }