diff --git a/framework/src/Volo.Abp.AutoMapper/AutoMapper/AbpAutoMapperExtensibleDtoExtensions.cs b/framework/src/Volo.Abp.AutoMapper/AutoMapper/AbpAutoMapperExtensibleDtoExtensions.cs
index 031a3a9948..e78e9628c1 100644
--- a/framework/src/Volo.Abp.AutoMapper/AutoMapper/AbpAutoMapperExtensibleDtoExtensions.cs
+++ b/framework/src/Volo.Abp.AutoMapper/AutoMapper/AbpAutoMapperExtensibleDtoExtensions.cs
@@ -25,7 +25,8 @@ namespace AutoMapper
                             HasExtraPropertiesObjectExtendingExtensions
                                 .MapExtraPropertiesTo<TSource, TDestination>(
                                     source.ExtraProperties,
-                                    result
+                                    result,
+                                    definitionChecks
                                 );
 
                             return result;
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/ITenantAppService.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/ITenantAppService.cs
index cd5f0697f7..69081ec5b9 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/ITenantAppService.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/ITenantAppService.cs
@@ -11,6 +11,5 @@ namespace Volo.Abp.TenantManagement
         Task UpdateDefaultConnectionStringAsync(Guid id, string defaultConnectionString);
 
         Task DeleteDefaultConnectionStringAsync(Guid id);
-
     }
 }
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantCreateDto.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantCreateDto.cs
index 189d7d0f80..5d8d02ada9 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantCreateDto.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantCreateDto.cs
@@ -1,9 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text.RegularExpressions;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Localization;
-using Volo.Abp.TenantManagement.Localization;
+using System.ComponentModel.DataAnnotations;
 
 namespace Volo.Abp.TenantManagement
 {
@@ -14,7 +9,6 @@ namespace Volo.Abp.TenantManagement
         [MaxLength(256)]
         public string AdminEmailAddress { get; set; }
 
-
         [Required]
         [MaxLength(128)]
         public string AdminPassword { get; set; }
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantCreateOrUpdateDtoBase.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantCreateOrUpdateDtoBase.cs
index b02da79b79..19f73b0d51 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantCreateOrUpdateDtoBase.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantCreateOrUpdateDtoBase.cs
@@ -1,8 +1,9 @@
 using System.ComponentModel.DataAnnotations;
+using Volo.Abp.ObjectExtending;
 
 namespace Volo.Abp.TenantManagement
 {
-    public abstract class TenantCreateOrUpdateDtoBase
+    public abstract class TenantCreateOrUpdateDtoBase : ExtensibleObject
     {
         [Required]
         [StringLength(TenantConsts.MaxNameLength)]
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantDto.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantDto.cs
index a410e90da5..36422c7a1c 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantDto.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantDto.cs
@@ -3,7 +3,7 @@ using Volo.Abp.Application.Dtos;
 
 namespace Volo.Abp.TenantManagement
 {
-    public class TenantDto : EntityDto<Guid>
+    public class TenantDto : ExtensibleEntityDto<Guid>
     {
         public string Name { get; set; }
     }
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/AbpTenantManagementApplicationAutoMapperProfile.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/AbpTenantManagementApplicationAutoMapperProfile.cs
index 61a2994dd7..f0212a926e 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/AbpTenantManagementApplicationAutoMapperProfile.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/AbpTenantManagementApplicationAutoMapperProfile.cs
@@ -6,7 +6,8 @@ namespace Volo.Abp.TenantManagement
     {
         public AbpTenantManagementApplicationAutoMapperProfile()
         {
-            CreateMap<Tenant, TenantDto>();
+            CreateMap<Tenant, TenantDto>()
+                .MapExtraProperties();
         }
     }
 }
\ No newline at end of file
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs
index cbe9b67c76..f618011cc7 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs
@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending;
 
 namespace Volo.Abp.TenantManagement
 {
@@ -27,13 +28,19 @@ namespace Volo.Abp.TenantManagement
         public virtual async Task<TenantDto> GetAsync(Guid id)
         {
             return ObjectMapper.Map<Tenant, TenantDto>(
-                await TenantRepository.GetAsync(id));
+                await TenantRepository.GetAsync(id)
+            );
         }
 
         public virtual async Task<PagedResultDto<TenantDto>> GetListAsync(GetTenantsInput input)
         {
             var count = await TenantRepository.GetCountAsync(input.Filter);
-            var list = await TenantRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter);
+            var list = await TenantRepository.GetListAsync(
+                input.Sorting,
+                input.MaxResultCount,
+                input.SkipCount,
+                input.Filter
+            );
 
             return new PagedResultDto<TenantDto>(
                 count,
@@ -45,6 +52,8 @@ namespace Volo.Abp.TenantManagement
         public virtual async Task<TenantDto> CreateAsync(TenantCreateDto input)
         {
             var tenant = await TenantManager.CreateAsync(input.Name);
+            input.MapExtraPropertiesTo(tenant);
+
             await TenantRepository.InsertAsync(tenant);
 
             using (CurrentTenant.Change(tenant.Id, tenant.Name))
@@ -66,6 +75,7 @@ namespace Volo.Abp.TenantManagement
         {
             var tenant = await TenantRepository.GetAsync(id);
             await TenantManager.ChangeNameAsync(tenant, input.Name);
+            input.MapExtraPropertiesTo(tenant);
             await TenantRepository.UpdateAsync(tenant);
             return ObjectMapper.Map<Tenant, TenantDto>(tenant);
         }
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebAutoMapperProfile.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebAutoMapperProfile.cs
index a5a094eb71..d226e9629c 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebAutoMapperProfile.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebAutoMapperProfile.cs
@@ -1,4 +1,5 @@
 using AutoMapper;
+using Volo.Abp.AutoMapper;
 using Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants;
 
 namespace Volo.Abp.TenantManagement.Web
@@ -6,20 +7,17 @@ namespace Volo.Abp.TenantManagement.Web
     public class AbpTenantManagementWebAutoMapperProfile : Profile
     {
         public AbpTenantManagementWebAutoMapperProfile()
-        {
-            CreateRoleMappings();
-        }
-
-        protected virtual void CreateRoleMappings()
         {
             //List
             CreateMap<TenantDto, EditModalModel.TenantInfoModel>();
 
             //CreateModal
-            CreateMap<CreateModalModel.TenantInfoModel, TenantCreateDto>();
+            CreateMap<CreateModalModel.TenantInfoModel, TenantCreateDto>()
+                .Ignore(x => x.ExtraProperties);
 
             //EditModal
-            CreateMap<EditModalModel.TenantInfoModel, TenantUpdateDto>();
+            CreateMap<EditModalModel.TenantInfoModel, TenantUpdateDto>()
+                .Ignore(x => x.ExtraProperties);
         }
     }
 }
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs
index 2184169d5e..5456e512ec 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs
@@ -2,7 +2,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
-using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
 
 namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
 {
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs
index 098f7e1393..86569149f8 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs
@@ -1,7 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
-using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
 
 namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
 {
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml.cs
index 5fb2f06859..1ae5709d57 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml.cs
@@ -2,7 +2,6 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
-using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
 
 namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
 {
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Program.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Program.cs
index 5143e37164..b57311cc96 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Program.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Program.cs
@@ -17,6 +17,7 @@ namespace MyCompanyName.MyProjectName.Web
                 .MinimumLevel.Information()
 #endif
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning)
                 .Enrich.FromLogContext()
                 .WriteTo.Async(c => c.File("Logs/logs.txt"))
                 .CreateLogger();