diff --git a/Volo.Abp.sln b/Volo.Abp.sln
index fb09f7a89e..44e7c27bb9 100644
--- a/Volo.Abp.sln
+++ b/Volo.Abp.sln
@@ -212,6 +212,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abp.IdentityServer", "Abp.I
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Abp.IdentityServer.EntityFrameworkCore.Tests", "test\Abp.IdentityServer.EntityFrameworkCore.Tests\Abp.IdentityServer.EntityFrameworkCore.Tests.csproj", "{0C73A439-7CD2-4105-8B70-30B896C15C72}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.IdentityServer.Application.Contracts", "src\Volo.Abp.IdentityServer.Application.Contracts\Volo.Abp.IdentityServer.Application.Contracts.csproj", "{253C20C0-1F46-410A-ACFE-2F375491E6D2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -562,6 +564,10 @@ Global
 		{0C73A439-7CD2-4105-8B70-30B896C15C72}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0C73A439-7CD2-4105-8B70-30B896C15C72}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0C73A439-7CD2-4105-8B70-30B896C15C72}.Release|Any CPU.Build.0 = Release|Any CPU
+		{253C20C0-1F46-410A-ACFE-2F375491E6D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{253C20C0-1F46-410A-ACFE-2F375491E6D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{253C20C0-1F46-410A-ACFE-2F375491E6D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{253C20C0-1F46-410A-ACFE-2F375491E6D2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -664,6 +670,7 @@ Global
 		{8D891D68-7859-477D-BE78-99258B8B1E86} = {324B920F-5BBA-46D8-BDC6-E1FA5EFE3733}
 		{3DF5C4E8-51E7-4931-B4F4-EA390AB8FCC9} = {447C8A77-E5F0-4538-8687-7383196D04EA}
 		{0C73A439-7CD2-4105-8B70-30B896C15C72} = {3DF5C4E8-51E7-4931-B4F4-EA390AB8FCC9}
+		{253C20C0-1F46-410A-ACFE-2F375491E6D2} = {324B920F-5BBA-46D8-BDC6-E1FA5EFE3733}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5}
diff --git a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll
index 9dae5160a2..e8b4663419 100644
Binary files a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll and b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll differ
diff --git a/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.csproj b/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.csproj
index dd7c434e4d..3a5f5ac4d6 100644
--- a/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.csproj
+++ b/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.csproj
@@ -16,7 +16,6 @@
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.Ddd\Volo.Abp.Ddd.csproj" />
     <ProjectReference Include="..\Volo.Abp.Identity.Domain.Shared\Volo.Abp.Identity.Domain.Shared.csproj" />
-    <ProjectReference Include="..\Volo.Abp\Volo.Abp.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/AbpIdentityApplicationContractsModule.cs b/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/AbpIdentityApplicationContractsModule.cs
index 90ba1ab05d..e481a0be43 100644
--- a/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/AbpIdentityApplicationContractsModule.cs
+++ b/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/AbpIdentityApplicationContractsModule.cs
@@ -3,8 +3,8 @@ using Volo.Abp.Modularity;
 
 namespace Volo.Abp.Identity
 {
-    [DependsOn(typeof(AbpCommonModule))]
     [DependsOn(typeof(AbpDddModule))]
+    [DependsOn(typeof(AbpIdentityDomainSharedModule))]
     public class AbpIdentityApplicationContractsModule : AbpModule
     {
         public override void ConfigureServices(IServiceCollection services)
diff --git a/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserCreateOrUpdateOutput.cs b/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserCreateOrUpdateOutput.cs
deleted file mode 100644
index 7a390bbc25..0000000000
--- a/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserCreateOrUpdateOutput.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Volo.Abp.Application.Dtos;
-
-namespace Volo.Abp.Identity
-{
-    public class IdentityUserCreateOrUpdateOutput
-    {
-        public IdentityUserDto User { get; set; }
-
-        public IdentityUserRoleDto[] Roles { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserRoleDto.cs b/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserRoleDto.cs
deleted file mode 100644
index eea833d957..0000000000
--- a/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserRoleDto.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-
-namespace Volo.Abp.Identity
-{
-    public class IdentityUserRoleDto
-    {
-        public Guid Id { get; set; }
-
-        public string Name { get; set; }
-
-        public bool IsAssigned { get; set; }
-    }
-}
diff --git a/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModule.cs b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModule.cs
index e2e86483d8..21bd6c7922 100644
--- a/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModule.cs
+++ b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModule.cs
@@ -5,7 +5,11 @@ using Volo.Abp.Modularity;
 
 namespace Volo.Abp.Identity
 {
-    [DependsOn(typeof(AbpIdentityDomainModule), typeof(AbpIdentityApplicationContractsModule), typeof(AbpAutoMapperModule))]
+    [DependsOn(
+        typeof(AbpIdentityDomainModule), 
+        typeof(AbpIdentityApplicationContractsModule), 
+        typeof(AbpAutoMapperModule)
+        )]
     public class AbpIdentityApplicationModule : AbpModule
     {
         public override void ConfigureServices(IServiceCollection services)
@@ -14,10 +18,7 @@ namespace Volo.Abp.Identity
 
             services.Configure<AbpAutoMapperOptions>(options =>
             {
-                options.Configurators.Add(context =>
-                {
-                    context.MapperConfiguration.AddProfile<AbpIdentityApplicationModuleAutoMapperProfile>();
-                });
+                options.AddProfile<AbpIdentityApplicationModuleAutoMapperProfile>();
             });
         }
     }
diff --git a/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ObjectMappings/AbpIdentityApplicationModuleAutoMapperProfile.cs b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ObjectMappings/AbpIdentityApplicationModuleAutoMapperProfile.cs
index ba3c094f6a..57dee9f692 100644
--- a/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ObjectMappings/AbpIdentityApplicationModuleAutoMapperProfile.cs
+++ b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ObjectMappings/AbpIdentityApplicationModuleAutoMapperProfile.cs
@@ -8,7 +8,6 @@ namespace Volo.Abp.Identity.ObjectMappings
         {
             CreateMap<IdentityUser, IdentityUserDto>();
             CreateMap<IdentityRole, IdentityRoleDto>();
-            CreateMap<IdentityRoleDto, IdentityUserRoleDto>(); //TODO: This should be removed!
         }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.csproj b/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.csproj
index c842fdb561..f6f1b36532 100644
--- a/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.csproj
+++ b/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Volo.Abp\Volo.Abp.csproj" />
+    <ProjectReference Include="..\Volo.Abp.Core\Volo.Abp.Core.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs b/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs
index 91be79aef7..ffb7b7cb80 100644
--- a/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs
+++ b/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs
@@ -2,7 +2,6 @@
 
 namespace Volo.Abp.Identity
 {
-    [DependsOn(typeof(AbpCommonModule))]
     public class AbpIdentityDomainSharedModule : AbpModule
     {
 
diff --git a/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj b/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj
index 4262bd1a32..cd2d5ded52 100644
--- a/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj
+++ b/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj
@@ -16,7 +16,6 @@
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.Ddd\Volo.Abp.Ddd.csproj" />
     <ProjectReference Include="..\Volo.Abp.Identity.Domain.Shared\Volo.Abp.Identity.Domain.Shared.csproj" />
-    <ProjectReference Include="..\Volo.Abp\Volo.Abp.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Volo.Abp.IdentityServer.Application.Contracts/Volo.Abp.IdentityServer.Application.Contracts.csproj b/src/Volo.Abp.IdentityServer.Application.Contracts/Volo.Abp.IdentityServer.Application.Contracts.csproj
new file mode 100644
index 0000000000..13ed59429d
--- /dev/null
+++ b/src/Volo.Abp.IdentityServer.Application.Contracts/Volo.Abp.IdentityServer.Application.Contracts.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\common.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <AssemblyName>Volo.Abp.IdentityServer.Application.Contracts</AssemblyName>
+    <PackageId>Volo.Abp.IdentityServer.Application.Contracts</PackageId>
+    <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <RootNamespace />
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Folder Include="Volo\Abp\IdentityServer\" />
+  </ItemGroup>
+
+</Project>