diff --git a/templates/service/host/IdentityServerHost/Migrations/20190320142333_Initial.Designer.cs b/templates/service/host/IdentityServerHost/Migrations/20190410095119_Initial.Designer.cs
similarity index 93%
rename from templates/service/host/IdentityServerHost/Migrations/20190320142333_Initial.Designer.cs
rename to templates/service/host/IdentityServerHost/Migrations/20190410095119_Initial.Designer.cs
index 8ef18c7e12..edb0c5cedf 100644
--- a/templates/service/host/IdentityServerHost/Migrations/20190320142333_Initial.Designer.cs
+++ b/templates/service/host/IdentityServerHost/Migrations/20190410095119_Initial.Designer.cs
@@ -10,7 +10,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace IdentityServerHost.Migrations
 {
     [DbContext(typeof(DemoAppDbContext))]
-    [Migration("20190320142333_Initial")]
+    [Migration("20190410095119_Initial")]
     partial class Initial
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -84,6 +84,8 @@ namespace IdentityServerHost.Migrations
                     b.Property<Guid?>("TenantId")
                         .HasColumnName("TenantId");
 
+                    b.Property<string>("TenantName");
+
                     b.Property<string>("Url")
                         .HasColumnName("Url")
                         .HasMaxLength(256);
@@ -163,6 +165,8 @@ namespace IdentityServerHost.Migrations
                         .HasColumnName("EntityId")
                         .HasMaxLength(128);
 
+                    b.Property<Guid?>("EntityTenantId");
+
                     b.Property<string>("EntityTypeFullName")
                         .IsRequired()
                         .HasColumnName("EntityTypeFullName")
@@ -522,6 +526,18 @@ namespace IdentityServerHost.Migrations
 
                     b.Property<string>("ConcurrencyStamp");
 
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnName("DeletionTime");
+
                     b.Property<string>("Description")
                         .HasMaxLength(1000);
 
@@ -533,6 +549,17 @@ namespace IdentityServerHost.Migrations
                     b.Property<string>("ExtraProperties")
                         .HasColumnName("ExtraProperties");
 
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("IsDeleted")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnName("LastModifierId");
+
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(200);
@@ -660,6 +687,18 @@ namespace IdentityServerHost.Migrations
 
                     b.Property<int?>("ConsentLifetime");
 
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnName("DeletionTime");
+
                     b.Property<string>("Description")
                         .HasMaxLength(1000);
 
@@ -679,6 +718,17 @@ namespace IdentityServerHost.Migrations
 
                     b.Property<bool>("IncludeJwtId");
 
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("IsDeleted")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnName("LastModifierId");
+
                     b.Property<string>("LogoUri")
                         .HasMaxLength(300);
 
@@ -890,6 +940,18 @@ namespace IdentityServerHost.Migrations
 
                     b.Property<string>("ConcurrencyStamp");
 
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnName("DeletionTime");
+
                     b.Property<string>("Description")
                         .HasMaxLength(1000);
 
@@ -903,6 +965,17 @@ namespace IdentityServerHost.Migrations
                     b.Property<string>("ExtraProperties")
                         .HasColumnName("ExtraProperties");
 
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("IsDeleted")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnName("LastModifierId");
+
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(200);
diff --git a/templates/service/host/IdentityServerHost/Migrations/20190320142333_Initial.cs b/templates/service/host/IdentityServerHost/Migrations/20190410095119_Initial.cs
similarity index 96%
rename from templates/service/host/IdentityServerHost/Migrations/20190320142333_Initial.cs
rename to templates/service/host/IdentityServerHost/Migrations/20190410095119_Initial.cs
index 88588fb970..b90275e883 100644
--- a/templates/service/host/IdentityServerHost/Migrations/20190320142333_Initial.cs
+++ b/templates/service/host/IdentityServerHost/Migrations/20190410095119_Initial.cs
@@ -18,6 +18,7 @@ namespace IdentityServerHost.Migrations
                     UserId = table.Column<Guid>(nullable: true),
                     UserName = table.Column<string>(maxLength: 256, nullable: true),
                     TenantId = table.Column<Guid>(nullable: true),
+                    TenantName = table.Column<string>(nullable: true),
                     ImpersonatorUserId = table.Column<Guid>(nullable: true),
                     ImpersonatorTenantId = table.Column<Guid>(nullable: true),
                     ExecutionTime = table.Column<DateTime>(nullable: false),
@@ -150,6 +151,13 @@ namespace IdentityServerHost.Migrations
                     Id = table.Column<Guid>(nullable: false),
                     ExtraProperties = table.Column<string>(nullable: true),
                     ConcurrencyStamp = table.Column<string>(nullable: true),
+                    CreationTime = table.Column<DateTime>(nullable: false),
+                    CreatorId = table.Column<Guid>(nullable: true),
+                    LastModificationTime = table.Column<DateTime>(nullable: true),
+                    LastModifierId = table.Column<Guid>(nullable: true),
+                    IsDeleted = table.Column<bool>(nullable: false, defaultValue: false),
+                    DeleterId = table.Column<Guid>(nullable: true),
+                    DeletionTime = table.Column<DateTime>(nullable: true),
                     Name = table.Column<string>(maxLength: 200, nullable: false),
                     DisplayName = table.Column<string>(maxLength: 200, nullable: true),
                     Description = table.Column<string>(maxLength: 1000, nullable: true),
@@ -167,6 +175,13 @@ namespace IdentityServerHost.Migrations
                     Id = table.Column<Guid>(nullable: false),
                     ExtraProperties = table.Column<string>(nullable: true),
                     ConcurrencyStamp = table.Column<string>(nullable: true),
+                    CreationTime = table.Column<DateTime>(nullable: false),
+                    CreatorId = table.Column<Guid>(nullable: true),
+                    LastModificationTime = table.Column<DateTime>(nullable: true),
+                    LastModifierId = table.Column<Guid>(nullable: true),
+                    IsDeleted = table.Column<bool>(nullable: false, defaultValue: false),
+                    DeleterId = table.Column<Guid>(nullable: true),
+                    DeletionTime = table.Column<DateTime>(nullable: true),
                     ClientId = table.Column<string>(maxLength: 200, nullable: false),
                     ClientName = table.Column<string>(maxLength: 200, nullable: true),
                     Description = table.Column<string>(maxLength: 1000, nullable: true),
@@ -214,6 +229,13 @@ namespace IdentityServerHost.Migrations
                     Id = table.Column<Guid>(nullable: false),
                     ExtraProperties = table.Column<string>(nullable: true),
                     ConcurrencyStamp = table.Column<string>(nullable: true),
+                    CreationTime = table.Column<DateTime>(nullable: false),
+                    CreatorId = table.Column<Guid>(nullable: true),
+                    LastModificationTime = table.Column<DateTime>(nullable: true),
+                    LastModifierId = table.Column<Guid>(nullable: true),
+                    IsDeleted = table.Column<bool>(nullable: false, defaultValue: false),
+                    DeleterId = table.Column<Guid>(nullable: true),
+                    DeletionTime = table.Column<DateTime>(nullable: true),
                     Name = table.Column<string>(maxLength: 200, nullable: false),
                     DisplayName = table.Column<string>(maxLength: 200, nullable: true),
                     Description = table.Column<string>(maxLength: 1000, nullable: true),
@@ -281,6 +303,7 @@ namespace IdentityServerHost.Migrations
                     TenantId = table.Column<Guid>(nullable: true),
                     ChangeTime = table.Column<DateTime>(nullable: false),
                     ChangeType = table.Column<byte>(nullable: false),
+                    EntityTenantId = table.Column<Guid>(nullable: true),
                     EntityId = table.Column<string>(maxLength: 128, nullable: false),
                     EntityTypeFullName = table.Column<string>(maxLength: 128, nullable: false),
                     ExtraProperties = table.Column<string>(nullable: true)
diff --git a/templates/service/host/IdentityServerHost/Migrations/DemoAppDbContextModelSnapshot.cs b/templates/service/host/IdentityServerHost/Migrations/DemoAppDbContextModelSnapshot.cs
index 1aec48ea05..3b63d152aa 100644
--- a/templates/service/host/IdentityServerHost/Migrations/DemoAppDbContextModelSnapshot.cs
+++ b/templates/service/host/IdentityServerHost/Migrations/DemoAppDbContextModelSnapshot.cs
@@ -82,6 +82,8 @@ namespace IdentityServerHost.Migrations
                     b.Property<Guid?>("TenantId")
                         .HasColumnName("TenantId");
 
+                    b.Property<string>("TenantName");
+
                     b.Property<string>("Url")
                         .HasColumnName("Url")
                         .HasMaxLength(256);
@@ -161,6 +163,8 @@ namespace IdentityServerHost.Migrations
                         .HasColumnName("EntityId")
                         .HasMaxLength(128);
 
+                    b.Property<Guid?>("EntityTenantId");
+
                     b.Property<string>("EntityTypeFullName")
                         .IsRequired()
                         .HasColumnName("EntityTypeFullName")
@@ -520,6 +524,18 @@ namespace IdentityServerHost.Migrations
 
                     b.Property<string>("ConcurrencyStamp");
 
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnName("DeletionTime");
+
                     b.Property<string>("Description")
                         .HasMaxLength(1000);
 
@@ -531,6 +547,17 @@ namespace IdentityServerHost.Migrations
                     b.Property<string>("ExtraProperties")
                         .HasColumnName("ExtraProperties");
 
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("IsDeleted")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnName("LastModifierId");
+
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(200);
@@ -658,6 +685,18 @@ namespace IdentityServerHost.Migrations
 
                     b.Property<int?>("ConsentLifetime");
 
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnName("DeletionTime");
+
                     b.Property<string>("Description")
                         .HasMaxLength(1000);
 
@@ -677,6 +716,17 @@ namespace IdentityServerHost.Migrations
 
                     b.Property<bool>("IncludeJwtId");
 
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("IsDeleted")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnName("LastModifierId");
+
                     b.Property<string>("LogoUri")
                         .HasMaxLength(300);
 
@@ -888,6 +938,18 @@ namespace IdentityServerHost.Migrations
 
                     b.Property<string>("ConcurrencyStamp");
 
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnName("DeletionTime");
+
                     b.Property<string>("Description")
                         .HasMaxLength(1000);
 
@@ -901,6 +963,17 @@ namespace IdentityServerHost.Migrations
                     b.Property<string>("ExtraProperties")
                         .HasColumnName("ExtraProperties");
 
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("IsDeleted")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnName("LastModifierId");
+
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(200);
diff --git a/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190320142412_Initial.Designer.cs b/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190410095222_Initial.Designer.cs
similarity index 98%
rename from templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190320142412_Initial.Designer.cs
rename to templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190410095222_Initial.Designer.cs
index 423eb1cb0a..4803948516 100644
--- a/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190320142412_Initial.Designer.cs
+++ b/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190410095222_Initial.Designer.cs
@@ -10,7 +10,7 @@ using MyCompanyName.MyProjectName.Host;
 namespace MyCompanyName.MyProjectName.Host.Migrations
 {
     [DbContext(typeof(DemoAppDbContext))]
-    [Migration("20190320142412_Initial")]
+    [Migration("20190410095222_Initial")]
     partial class Initial
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -84,6 +84,8 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
                     b.Property<Guid?>("TenantId")
                         .HasColumnName("TenantId");
 
+                    b.Property<string>("TenantName");
+
                     b.Property<string>("Url")
                         .HasColumnName("Url")
                         .HasMaxLength(256);
@@ -163,6 +165,8 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
                         .HasColumnName("EntityId")
                         .HasMaxLength(128);
 
+                    b.Property<Guid?>("EntityTenantId");
+
                     b.Property<string>("EntityTypeFullName")
                         .IsRequired()
                         .HasColumnName("EntityTypeFullName")
diff --git a/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190320142412_Initial.cs b/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190410095222_Initial.cs
similarity index 98%
rename from templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190320142412_Initial.cs
rename to templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190410095222_Initial.cs
index b2074c3513..ecef8c8f9a 100644
--- a/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190320142412_Initial.cs
+++ b/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190410095222_Initial.cs
@@ -18,6 +18,7 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
                     UserId = table.Column<Guid>(nullable: true),
                     UserName = table.Column<string>(maxLength: 256, nullable: true),
                     TenantId = table.Column<Guid>(nullable: true),
+                    TenantName = table.Column<string>(nullable: true),
                     ImpersonatorUserId = table.Column<Guid>(nullable: true),
                     ImpersonatorTenantId = table.Column<Guid>(nullable: true),
                     ExecutionTime = table.Column<DateTime>(nullable: false),
@@ -102,6 +103,7 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
                     TenantId = table.Column<Guid>(nullable: true),
                     ChangeTime = table.Column<DateTime>(nullable: false),
                     ChangeType = table.Column<byte>(nullable: false),
+                    EntityTenantId = table.Column<Guid>(nullable: true),
                     EntityId = table.Column<string>(maxLength: 128, nullable: false),
                     EntityTypeFullName = table.Column<string>(maxLength: 128, nullable: false),
                     ExtraProperties = table.Column<string>(nullable: true)
diff --git a/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/DemoAppDbContextModelSnapshot.cs b/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/DemoAppDbContextModelSnapshot.cs
index ffe92c9c59..b6682a0c1c 100644
--- a/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/DemoAppDbContextModelSnapshot.cs
+++ b/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/DemoAppDbContextModelSnapshot.cs
@@ -82,6 +82,8 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
                     b.Property<Guid?>("TenantId")
                         .HasColumnName("TenantId");
 
+                    b.Property<string>("TenantName");
+
                     b.Property<string>("Url")
                         .HasColumnName("Url")
                         .HasMaxLength(256);
@@ -161,6 +163,8 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
                         .HasColumnName("EntityId")
                         .HasMaxLength(128);
 
+                    b.Property<Guid?>("EntityTenantId");
+
                     b.Property<string>("EntityTypeFullName")
                         .IsRequired()
                         .HasColumnName("EntityTypeFullName")