6 files changed, 16 insertions, 15 deletions
diff --git a/src/DevHive.Web/Models/Identity/Role/RoleWebModel.cs b/src/DevHive.Common/Models/Identity/RoleModel.cs
index d8ae465..5db8df9 100644
--- a/src/DevHive.Web/Models/Identity/Role/RoleWebModel.cs
+++ b/src/DevHive.Common/Models/Identity/RoleModel.cs
@@ -1,8 +1,8 @@
 using System;
 
-namespace DevHive.Web.Models.Identity.Role
+namespace DevHive.Common.Models.Identity
 {
-	public class RoleWebModel
+	public class RoleModel
 	{
 		public Guid Id { get; set; }
 		public string Name { get; set; }
diff --git a/src/DevHive.Services/Models/Identity/Role/RoleServiceModel.cs b/src/DevHive.Services/Models/Identity/Role/RoleServiceModel.cs
deleted file mode 100644
index 3f834ef..0000000
--- a/src/DevHive.Services/Models/Identity/Role/RoleServiceModel.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-
-namespace DevHive.Services.Models.Identity.Role
-{
-	public class RoleServiceModel
-	{
-		public Guid Id { get; set; }
-		public string Name { get; set; }
-	}
-}
diff --git a/src/DevHive.Services/Models/Identity/User/UserServiceModel.cs b/src/DevHive.Services/Models/Identity/User/UserServiceModel.cs
index 868e7ba..8ac71b1 100644
--- a/src/DevHive.Services/Models/Identity/User/UserServiceModel.cs
+++ b/src/DevHive.Services/Models/Identity/User/UserServiceModel.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using DevHive.Common.Models.Identity;
 using DevHive.Data.Models;
 using DevHive.Services.Models.Identity.Role;
 
@@ -6,7 +7,7 @@ namespace DevHive.Services.Models.Identity.User
 {
 	public class UserServiceModel : BaseUserServiceModel
 	{
-		public IList<RoleServiceModel> Role { get; set; } = new List<RoleServiceModel>();
+		public IList<RoleModel> Role { get; set; } = new List<RoleModel>();
 		public List<UserServiceModel> Friends { get; set; } = new List<UserServiceModel>();
 	}
 }
diff --git a/src/DevHive.Web/Configurations/Extensions/ConfigureAutoMapper.cs b/src/DevHive.Web/Configurations/Extensions/ConfigureAutoMapper.cs
index afba39c..b6ebc63 100644
--- a/src/DevHive.Web/Configurations/Extensions/ConfigureAutoMapper.cs
+++ b/src/DevHive.Web/Configurations/Extensions/ConfigureAutoMapper.cs
@@ -1,6 +1,7 @@
 using System;
 using AutoMapper;
 using AutoMapper.Configuration;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace DevHive.Web.Configurations.Extensions
@@ -11,5 +12,13 @@ namespace DevHive.Web.Configurations.Extensions
 		{
 			services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
 		}
+
+		public static void UseAutoMapperConfiguration(this IApplicationBuilder app)
+		{
+			var config = new MapperConfiguration(cfg =>
+			{
+				cfg.AllowNullCollections = true;
+			});
+		}
 	}
 }
 \ No newline at end of file
diff --git a/src/DevHive.Web/Models/Identity/User/UserWebModel.cs b/src/DevHive.Web/Models/Identity/User/UserWebModel.cs
index e7bdb2a..83430ce 100644
--- a/src/DevHive.Web/Models/Identity/User/UserWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/User/UserWebModel.cs
@@ -1,11 +1,12 @@
 using System.Collections.Generic;
+using DevHive.Common.Models.Identity;
 using DevHive.Web.Models.Identity.Role;
 
 namespace DevHive.Web.Models.Identity.User 
 {
 	public class UserWebModel : BaseUserWebModel
 	{
-		public IList<RoleWebModel> Role { get; set; } = new List<RoleWebModel>();
+		public IList<RoleModel> Role { get; set; } = new List<RoleModel>();
 		public IList<UserWebModel> Friends { get; set; } = new List<UserWebModel>();
 	}
 }
diff --git a/src/DevHive.Web/Startup.cs b/src/DevHive.Web/Startup.cs
index fac1b4a..66fde9e 100644
--- a/src/DevHive.Web/Startup.cs
+++ b/src/DevHive.Web/Startup.cs
@@ -50,8 +50,8 @@ namespace DevHive.Web
 			}
 
 			app.UseDatabaseConfiguration();
+			app.UseAutoMapperConfiguration();
 
-			
 			app.UseEndpoints(endpoints =>
 			{
 				endpoints.MapControllerRoute(