diff --git a/Controllers/ProjectsController.cs b/Controllers/ProjectsController.cs
index 6a5f183..290d39d 100644
--- a/Controllers/ProjectsController.cs
+++ b/Controllers/ProjectsController.cs
@@ -28,6 +28,10 @@ namespace TicketManager.Controllers
             return await _context.Projects
                 .Include(p => p.Assignments)
                     .ThenInclude(a => a.User)
+                .Include(p => p.Tickets)
+                .Include(p => p.Manager)
+                .Include(p => p.Files)
+                .AsNoTracking()
                 .ToListAsync();
         }
 
@@ -37,8 +41,13 @@ namespace TicketManager.Controllers
         {
             var project = await _context.Projects
                 .Include(p => p.Assignments)
+                .Include(p => p.Tickets)
+                .Include(p => p.Manager)
+                .Include(p => p.Files)
+                .AsNoTracking()
                 .FirstOrDefaultAsync(p => p.Id == id);
 
+
             if (project == null)
             { return NotFound(); }
 
diff --git a/Controllers/TicketsController.cs b/Controllers/TicketsController.cs
index 37ae92e..bddebe9 100644
--- a/Controllers/TicketsController.cs
+++ b/Controllers/TicketsController.cs
@@ -25,14 +25,25 @@ namespace TicketManager.Controllers
         [HttpGet]
         public async Task<ActionResult<IEnumerable<Ticket>>> GetTickets()
         {
-            return await _context.Tickets.ToListAsync();
+            return await _context.Tickets
+                .Include(t => t.Creator)
+                .Include(p => p.Notes)
+                .Include(p => p.Edits)
+                .Include(p => p.Files)
+                .AsNoTracking()
+                .ToListAsync();
         }
 
         // GET: api/Tickets/5
         [HttpGet("{id}")]
         public async Task<ActionResult<Ticket>> GetTicket(int id)
         {
-            var ticket = await _context.Tickets.FindAsync(id);
+            var ticket = await _context.Tickets
+                .Include(t => t.Creator)
+                .Include(p => p.Notes)
+                .Include(p => p.Edits)
+                .Include(p => p.Files)
+                .FirstOrDefaultAsync(t => t.Id == id);
 
             if (ticket == null)
             {
diff --git a/Controllers/UsersController.cs b/Controllers/UsersController.cs
index c2cb490..32ca0f3 100644
--- a/Controllers/UsersController.cs
+++ b/Controllers/UsersController.cs
@@ -25,14 +25,20 @@ namespace TicketManager.Controllers
         [HttpGet]
         public async Task<ActionResult<IEnumerable<User>>> GetUsers()
         {
-            return await _context.Users.ToListAsync();
+            return await _context.Users
+                .Include(p => p.Assignments)
+                .Include(p => p.Edits)
+                .ToListAsync();
         }
 
         // GET: api/Users/5
         [HttpGet("{id}")]
-        public async Task<ActionResult<User>> GetUser(int id)
+        public async Task<ActionResult<User>> GetUser(Guid id)
         {
-            var user = await _context.Users.FindAsync(id);
+            var user = await _context.Users
+                .Include(p => p.Assignments)
+                .Include(p => p.Edits)
+                .FirstOrDefaultAsync(p => p.Id == id);
 
             if (user == null)
             {
diff --git a/Models/Project.cs b/Models/Project.cs
index d5b2a64..b1875b8 100644
--- a/Models/Project.cs
+++ b/Models/Project.cs
@@ -24,7 +24,7 @@ namespace TicketManager.Models
         public Status Status { get; set; } = Status.ToDo;
 
         public User Manager { get; set; }
-        public int ManagerId { get; set; }
+        public Guid ManagerId { get; set; }
         private List<Assignment> _assignments;
         public List<Assignment> Assignments
         {
@@ -40,13 +40,13 @@ namespace TicketManager.Models
             { return _tickets ?? new List<Ticket>(); }
             set { _tickets = value; }
         }
-        private List<History> _edits;
-        public List<History> Edits
-        {
-            get
-            { return _edits ?? new List<History>(); }
-            set { _edits = value; }
-        }
+        // private List<History> _edits;
+        // public List<History> Edits
+        // {
+        //     get
+        //     { return _edits ?? new List<History>(); }
+        //     set { _edits = value; }
+        // }
         private List<File> _files;
         public List<File> Files
         {
diff --git a/Models/Ticket.cs b/Models/Ticket.cs
index 16e45ef..727ca6f 100644
--- a/Models/Ticket.cs
+++ b/Models/Ticket.cs
@@ -17,9 +17,9 @@ namespace TicketManager.Models
         public Category Category { get; set; } = Category.Undefined;
 
         public User Creator { get; set; }
-        public int CreatorId { get; set; }
-        public Project Project { get; set; }
-        public int ProjectId { get; set; }
+        public Guid CreatorId { get; set; }
+        // public Project Project { get; set; }
+        // public int ProjectId { get; set; }
         private List<Note> _notes;
         public List<Note> Notes
         {
diff --git a/client/src/react-app-env.d.ts b/client/src/react-app-env.d.ts
new file mode 100644
index 0000000..6431bc5
--- /dev/null
+++ b/client/src/react-app-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="react-scripts" />