4 files changed, 9 insertions, 6 deletions
diff --git a/src/DevHive.Data/Interfaces/Models/IComment.cs b/src/DevHive.Data/Interfaces/Models/IComment.cs
index 9a72da4..e7b5ad5 100644
--- a/src/DevHive.Data/Interfaces/Models/IComment.cs
+++ b/src/DevHive.Data/Interfaces/Models/IComment.cs
@@ -1,12 +1,13 @@
 using System;
+using DevHive.Data.Models;
 
 namespace DevHive.Data.Interfaces.Models
 {
 	public interface IComment : IModel
 	{
-		Guid PostId { get; set; }
+		Post Parrent { get; set; }
 
-		Guid CreatorId { get; set; }
+		User Creator { get; set; }
 
 		string Message { get; set; }
 
diff --git a/src/DevHive.Data/Interfaces/Models/IPost.cs b/src/DevHive.Data/Interfaces/Models/IPost.cs
index e68407d..0902465 100644
--- a/src/DevHive.Data/Interfaces/Models/IPost.cs
+++ b/src/DevHive.Data/Interfaces/Models/IPost.cs
@@ -6,7 +6,7 @@ namespace DevHive.Data.Interfaces.Models
 {
 	public interface IPost : IModel
 	{
-		Guid CreatorId { get; set; }
+		User Creator { get; set; }
 
 		string Message { get; set; }
 
diff --git a/src/DevHive.Data/Models/Comment.cs b/src/DevHive.Data/Models/Comment.cs
index c953355..e2bb21d 100644
--- a/src/DevHive.Data/Models/Comment.cs
+++ b/src/DevHive.Data/Models/Comment.cs
@@ -7,9 +7,11 @@ namespace DevHive.Data.Models
 	{
 		public Guid Id { get; set; }
 
-		public Guid PostId { get; set; }
+		// public Guid PostId { get; set; }
+		public Post Post { get; set; }
 
-		public Guid CreatorId { get; set; }
+		// public Guid CreatorId { get; set; }
+		public User Creator { get; set; }
 
 		public string Message { get; set; }
 
diff --git a/src/DevHive.Data/Models/Post.cs b/src/DevHive.Data/Models/Post.cs
index 1b1ec4d..0ea7142 100644
--- a/src/DevHive.Data/Models/Post.cs
+++ b/src/DevHive.Data/Models/Post.cs
@@ -10,7 +10,7 @@ namespace DevHive.Data.Models
 	{
 		public Guid Id { get; set; }
 
-		public Guid CreatorId { get; set; }
+		public User Creator { get; set; }
 
 		public string Message { get; set; }