diff --git a/src/Libraries/Nop.Data/Extensions/FluentMigratorExtensions.cs b/src/Libraries/Nop.Data/Extensions/FluentMigratorExtensions.cs
index 81f9d6f88f8..4ab5dc404e7 100644
--- a/src/Libraries/Nop.Data/Extensions/FluentMigratorExtensions.cs
+++ b/src/Libraries/Nop.Data/Extensions/FluentMigratorExtensions.cs
@@ -1,9 +1,14 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Data;
+using System.Linq.Expressions;
 using System.Reflection;
+using FluentMigrator.Builders.Alter;
 using FluentMigrator.Builders.Alter.Table;
 using FluentMigrator.Builders.Create;
 using FluentMigrator.Builders.Create.Table;
+using FluentMigrator.Builders.Delete;
+using FluentMigrator.Builders.Schema;
+using FluentMigrator.Builders.Schema.Table;
 using FluentMigrator.Infrastructure.Extensions;
 using FluentMigrator.Model;
 using FluentMigrator.Runner;
@@ -63,7 +68,7 @@ private static void DefineByOwnType(string columnName, Type propType, CreateTabl
     /// <param name="builder">The builder to add the database engine(s) to</param>
     /// <returns>The migration runner builder</returns>
     public static IMigrationRunnerBuilder AddNopDbEngines(this IMigrationRunnerBuilder builder)
-    {        
+    {
         if (!DataSettingsManager.IsDatabaseInstalled())
             return builder.AddSqlServer().AddMySql5().AddPostgres92();
 
@@ -145,6 +150,124 @@ public static void TableFor<TEntity>(this ICreateExpressionRoot expressionRoot)
         builder.RetrieveTableExpressions(type);
     }
 
+    /// <summary>
+    /// Targets a specific column of the entity’s mapped table for an ALTER COLUMN operation,
+    /// resolving both table and column names using <see cref="NameCompatibilityManager"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity type mapped to the database table.</typeparam>
+    /// <param name="expressionRoot">The root expression for an ALTER TABLE operation.</param>
+    /// <param name="selector">An expression selecting the entity property to alter.</param>
+    /// <returns>
+    /// A fluent syntax interface for specifying the new column type 
+    /// and additional ALTER COLUMN options.
+    /// </returns>
+    public static IAlterTableColumnAsTypeSyntax AlterColumnFor<TEntity>(this IAlterExpressionRoot expressionRoot, Expression<Func<TEntity, object>> selector) where TEntity : BaseEntity
+    {
+        var tableName = NameCompatibilityManager.GetTableName(typeof(TEntity));
+        var propertyMemberExpression = selector.Body as MemberExpression
+                 ?? (selector.Body as UnaryExpression)?.Operand as MemberExpression
+                 ?? throw new ArgumentException("Selector must be a property expression.", nameof(selector));
+        var columnName = NameCompatibilityManager.GetColumnName(typeof(TEntity), propertyMemberExpression.Member.Name);
+        return expressionRoot.Table(tableName).AlterColumn(columnName);
+    }
+
+    /// <summary>
+    /// Deletes a column from the table mapped to the specified entity,
+    /// resolving the table name using <see cref="NameCompatibilityManager"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity type mapped to the database table.</typeparam>
+    /// <param name="expressionRoot">The root delete expression.</param>
+    /// <param name="columnName">The name of the column to delete.</param>
+    public static void Column<TEntity>(this IDeleteExpressionRoot expressionRoot, string columnName) where TEntity : BaseEntity
+    {
+        var tableName = NameCompatibilityManager.GetTableName(typeof(TEntity));
+        expressionRoot.Column(columnName).FromTable(tableName);
+    }
+
+    /// <summary>
+    /// Determines whether the database table mapped to the specified entity exists,
+    /// resolving the table name using <see cref="NameCompatibilityManager"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity type mapped to the database table.</typeparam>
+    /// <param name="expressionRoot">The root schema expression.</param>
+    /// <returns><c>true</c> if the table exists; otherwise, <c>false</c>.</returns>
+    public static bool TableExist<TEntity>(this ISchemaExpressionRoot expressionRoot) where TEntity : BaseEntity
+    {
+        var tableName = NameCompatibilityManager.GetTableName(typeof(TEntity));
+        return expressionRoot.Table(tableName).Exists();
+    }
+
+    /// <summary>
+    /// Checks whether a mapped column exists in the database table for the specified entity.
+    /// Resolves both the table name and column name using <see cref="NameCompatibilityManager"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity type mapped to the database table.</typeparam>
+    /// <param name="expressionRoot">The root schema expression.</param>
+    /// <param name="selector">An expression selecting the entity property to check.</param>
+    /// <returns><c>true</c> if the column exists; otherwise, <c>false</c>.</returns>
+    public static bool ColumnExist<TEntity>(
+    this ISchemaExpressionRoot expressionRoot, Expression<Func<TEntity, object>> selector) where TEntity : BaseEntity
+    {
+        var tableName = NameCompatibilityManager.GetTableName(typeof(TEntity));
+        var propertyMemberExpression = selector.Body as MemberExpression
+                 ?? (selector.Body as UnaryExpression)?.Operand as MemberExpression
+                 ?? throw new ArgumentException("Selector must be a property expression.", nameof(selector));
+        var columnName = NameCompatibilityManager.GetColumnName(typeof(TEntity), propertyMemberExpression.Member.Name);
+        return expressionRoot.Table(tableName).Column(columnName).Exists();
+    }
+
+    /// <summary>
+    /// Checks whether a mapped column exists in the database table for the specified entity.
+    /// Resolves both the table name and column name using <see cref="NameCompatibilityManager"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity type mapped to the database table.</typeparam>
+    /// <param name="expressionRoot">The root schema expression.</param>
+    /// <param name="columnName">The column name</param>
+    /// <returns><c>true</c> if the column exists; otherwise, <c>false</c>.</returns>
+    public static bool ColumnExist<TEntity>(
+    this ISchemaExpressionRoot expressionRoot, string columnName) where TEntity : BaseEntity
+    {
+        var tableName = NameCompatibilityManager.GetTableName(typeof(TEntity));
+        return expressionRoot.Table(tableName).Column(columnName).Exists();
+    }
+
+    /// <summary>
+    /// Targets the entity's mapped table for schema-related operations.
+    /// </summary>
+    /// <param name="expressionRoot">The root expression for schema inspection</param>
+    /// <typeparam name="TEntity">The entity type mapped to the database table</typeparam>
+    /// <returns>
+    /// A fluent syntax interface for performing schema operations 
+    /// such as checking table or column existence.
+    /// </returns>
+    public static ISchemaTableSyntax TableFor<TEntity>(this ISchemaExpressionRoot expressionRoot) where TEntity : BaseEntity
+    {
+        var tableName = NameCompatibilityManager.GetTableName(typeof(TEntity));
+        return expressionRoot.Table(tableName);
+    }
+
+    /// <summary>
+    /// Adds a new column to the entity's mapped table for ALTER TABLE operations,
+    /// resolving the column name via <see cref="NameCompatibilityManager"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity type mapped to the database table</typeparam>
+    /// <param name="tableSchema">The alter table expression</param>
+    /// <param name="selector">An expression selecting the entity property</param>
+    /// <returns>
+    /// A fluent syntax interface allowing further ALTER TABLE operations 
+    /// on the specified column.
+    /// </returns>
+    public static IAlterTableColumnAsTypeSyntax AddColumnFor<TEntity>(
+    this IAlterExpressionRoot expressionRoot, Expression<Func<TEntity, object>> selector) where TEntity : BaseEntity
+    {
+        var tableName = NameCompatibilityManager.GetTableName(typeof(TEntity));
+        var propertyMemberExpression = selector.Body as MemberExpression
+                 ?? (selector.Body as UnaryExpression)?.Operand as MemberExpression
+                 ?? throw new ArgumentException("Selector must be a property expression.", nameof(selector));
+        var columnName = NameCompatibilityManager.GetColumnName(typeof(TEntity), propertyMemberExpression.Member.Name);
+        return expressionRoot.Table(tableName).AddColumn(columnName);
+    }
+
     /// <summary>
     /// Retrieves expressions for building an entity table
     /// </summary>
diff --git a/src/Libraries/Nop.Data/Migrations/UpgradeTo440/DataMigration.cs b/src/Libraries/Nop.Data/Migrations/UpgradeTo440/DataMigration.cs
index c49f4213172..10cd5dc1891 100644
--- a/src/Libraries/Nop.Data/Migrations/UpgradeTo440/DataMigration.cs
+++ b/src/Libraries/Nop.Data/Migrations/UpgradeTo440/DataMigration.cs
@@ -4,6 +4,7 @@
 using Nop.Core.Domain.Logging;
 using Nop.Core.Domain.Security;
 using Nop.Core.Domain.Vendors;
+using Nop.Data.Extensions;
 using Nop.Data.Mapping;
 
 namespace Nop.Data.Migrations.UpgradeTo440;
@@ -108,126 +109,140 @@ public override void Up()
         //</MFA #475>
 
         //issue-3852
-        var tableName = nameof(RewardPointsHistory);
-        var rph = Schema.Table(tableName);
+        var rewardPointsHistoryTableName = NameCompatibilityManager.GetTableName(typeof(RewardPointsHistory));
+        var rph = Schema.Table(rewardPointsHistoryTableName);
         var columnName = "UsedWithOrder_Id";
 
-        if (rph.Column(columnName).Exists())
+        if (Schema.ColumnExist<RewardPointsHistory>(columnName))
         {
             var constraintName = "RewardPointsHistory_UsedWithOrder";
 
             if (rph.Constraint(constraintName).Exists())
-                Delete.UniqueConstraint(constraintName).FromTable(tableName);
+                Delete.UniqueConstraint(constraintName).FromTable(rewardPointsHistoryTableName);
 
-            Delete.Column(columnName).FromTable(tableName);
+            Delete.Column<RewardPointsHistory>(columnName);
         }
 
         //#3353
-        var productAttributeCombinationTableName = NameCompatibilityManager.GetTableName(typeof(ProductAttributeCombination));
 
         //add column
-        if (!Schema.Table(productAttributeCombinationTableName).Column(nameof(ProductAttributeCombination.MinStockQuantity)).Exists())
+        if (!Schema.ColumnExist<ProductAttributeCombination>(t => t.MinStockQuantity))
         {
-            Alter.Table(productAttributeCombinationTableName)
-                .AddColumn(nameof(ProductAttributeCombination.MinStockQuantity)).AsInt32().NotNullable().SetExistingRowsTo(0);
+            Alter.AddColumnFor<ProductAttributeCombination>(t => t.MinStockQuantity)
+                .AsInt32()
+                .NotNullable()
+                .SetExistingRowsTo(0);
         }
 
         //#276 AJAX filters
-        var categoryTableName = NameCompatibilityManager.GetTableName(typeof(Category));
-        var manufacturerTableName = NameCompatibilityManager.GetTableName(typeof(Manufacturer));
-        var vendorTableName = NameCompatibilityManager.GetTableName(typeof(Vendor));
 
         //remove column
         var priceRangesColumnName = "PriceRanges";
 
-        if (Schema.Table(categoryTableName).Column(priceRangesColumnName).Exists())
-            Delete.Column(priceRangesColumnName).FromTable(categoryTableName);
+        if (Schema.ColumnExist<Category>(priceRangesColumnName))
+            Delete.Column<Category>(priceRangesColumnName);
 
-        if (Schema.Table(manufacturerTableName).Column(priceRangesColumnName).Exists())
-            Delete.Column(priceRangesColumnName).FromTable(manufacturerTableName);
+        if (Schema.ColumnExist<Manufacturer>(priceRangesColumnName))
+            Delete.Column<Manufacturer>(priceRangesColumnName);
 
         //add column
-        var priceRangeFilteringColumnName = "PriceRangeFiltering";
-
-        if (!Schema.Table(categoryTableName).Column(priceRangeFilteringColumnName).Exists())
+        if (!Schema.ColumnExist<Category>(t => t.PriceRangeFiltering))
         {
-            Alter.Table(categoryTableName)
-                .AddColumn(priceRangeFilteringColumnName).AsBoolean().NotNullable().SetExistingRowsTo(true);
+            Alter.AddColumnFor<Category>(t => t.PriceRangeFiltering)
+                .AsBoolean()
+                .NotNullable()
+                .SetExistingRowsTo(true);
         }
 
-        if (!Schema.Table(manufacturerTableName).Column(priceRangeFilteringColumnName).Exists())
+        if (!Schema.ColumnExist<Manufacturer>(t => t.PriceRangeFiltering))
         {
-            Alter.Table(manufacturerTableName)
-                .AddColumn(priceRangeFilteringColumnName).AsBoolean().NotNullable().SetExistingRowsTo(true);
+            Alter.AddColumnFor<Manufacturer>(t => t.PriceRangeFiltering)
+                .AsBoolean()
+                .NotNullable()
+                .SetExistingRowsTo(true);
         }
 
-        if (!Schema.Table(vendorTableName).Column(priceRangeFilteringColumnName).Exists())
+        if (!Schema.ColumnExist<Vendor>(t => t.PriceRangeFiltering))
         {
-            Alter.Table(vendorTableName)
-                .AddColumn(priceRangeFilteringColumnName).AsBoolean().NotNullable().SetExistingRowsTo(true);
+            Alter.AddColumnFor<Vendor>(t => t.PriceRangeFiltering)
+                .AsBoolean()
+                .NotNullable()
+                .SetExistingRowsTo(true);
         }
 
         //add column
-        var priceFromColumnName = "PriceFrom";
-
-        if (!Schema.Table(categoryTableName).Column(priceFromColumnName).Exists())
+        if (!Schema.ColumnExist<Category>(t => t.PriceFrom))
         {
-            Alter.Table(categoryTableName)
-                .AddColumn(priceFromColumnName).AsDecimal().NotNullable().SetExistingRowsTo(0);
+            Alter.AddColumnFor<Category>(t => t.PriceFrom)
+                .AsDecimal()
+                .NotNullable()
+                .SetExistingRowsTo(0);
         }
 
-        if (!Schema.Table(manufacturerTableName).Column(priceFromColumnName).Exists())
+        if (!Schema.ColumnExist<Manufacturer>(t => t.PriceFrom))
         {
-            Alter.Table(manufacturerTableName)
-                .AddColumn(priceFromColumnName).AsDecimal().NotNullable().SetExistingRowsTo(0);
+            Alter.AddColumnFor<Manufacturer>(t => t.PriceFrom)
+                .AsDecimal()
+                .NotNullable()
+                .SetExistingRowsTo(0);
         }
 
-        if (!Schema.Table(vendorTableName).Column(priceFromColumnName).Exists())
+        if (!Schema.ColumnExist<Vendor>(t => t.PriceFrom))
         {
-            Alter.Table(vendorTableName)
-                .AddColumn(priceFromColumnName).AsDecimal().NotNullable().SetExistingRowsTo(0);
+            Alter.AddColumnFor<Vendor>(t => t.PriceFrom)
+                .AsDecimal()
+                .NotNullable()
+                .SetExistingRowsTo(0);
         }
 
         //add column
-        var priceToColumnName = "PriceTo";
-
-        if (!Schema.Table(categoryTableName).Column(priceToColumnName).Exists())
+        if (!Schema.ColumnExist<Category>(t => t.PriceTo))
         {
-            Alter.Table(categoryTableName)
-                .AddColumn(priceToColumnName).AsDecimal().NotNullable().SetExistingRowsTo(10000);
+            Alter.AddColumnFor<Category>(t => t.PriceTo)
+                .AsDecimal()
+                .NotNullable()
+                .SetExistingRowsTo(10000);
         }
 
-        if (!Schema.Table(manufacturerTableName).Column(priceToColumnName).Exists())
+        if (!Schema.ColumnExist<Manufacturer>(t => t.PriceTo))
         {
-            Alter.Table(manufacturerTableName)
-                .AddColumn(priceToColumnName).AsDecimal().NotNullable().SetExistingRowsTo(10000);
+            Alter.AddColumnFor<Manufacturer>(t => t.PriceTo)
+                .AsDecimal()
+                .NotNullable()
+                .SetExistingRowsTo(10000);
         }
 
-        if (!Schema.Table(vendorTableName).Column(priceToColumnName).Exists())
+        if (!Schema.ColumnExist<Vendor>(t => t.PriceTo))
         {
-            Alter.Table(vendorTableName)
-                .AddColumn(priceToColumnName).AsDecimal().NotNullable().SetExistingRowsTo(10000);
+            Alter.AddColumnFor<Vendor>(t => t.PriceTo)
+                .AsDecimal()
+                .NotNullable()
+                .SetExistingRowsTo(10000);
         }
 
         //add column
-        var manuallyPriceRangeColumnName = "ManuallyPriceRange";
-
-        if (!Schema.Table(categoryTableName).Column(manuallyPriceRangeColumnName).Exists())
+        if (!Schema.ColumnExist<Category>(t => t.ManuallyPriceRange))
         {
-            Alter.Table(categoryTableName)
-                .AddColumn(manuallyPriceRangeColumnName).AsBoolean().NotNullable().SetExistingRowsTo(false);
+            Alter.AddColumnFor<Category>(t => t.ManuallyPriceRange)
+                .AsBoolean()
+                .NotNullable()
+                .SetExistingRowsTo(false);
         }
 
-        if (!Schema.Table(manufacturerTableName).Column(manuallyPriceRangeColumnName).Exists())
+        if (!Schema.ColumnExist<Manufacturer>(t => t.ManuallyPriceRange))
         {
-            Alter.Table(manufacturerTableName)
-                .AddColumn(manuallyPriceRangeColumnName).AsBoolean().NotNullable().SetExistingRowsTo(false);
+            Alter.AddColumnFor<Manufacturer>(t => t.ManuallyPriceRange)
+                .AsBoolean()
+                .NotNullable()
+                .SetExistingRowsTo(false);
         }
 
-        if (!Schema.Table(vendorTableName).Column(manuallyPriceRangeColumnName).Exists())
+        if (!Schema.ColumnExist<Vendor>(t => t.ManuallyPriceRange))
         {
-            Alter.Table(vendorTableName)
-                .AddColumn(manuallyPriceRangeColumnName).AsBoolean().NotNullable().SetExistingRowsTo(false);
+            Alter.AddColumnFor<Vendor>(t => t.ManuallyPriceRange)
+                .AsBoolean()
+                .NotNullable()
+                .SetExistingRowsTo(false);
         }
     }
 
diff --git a/src/Libraries/Nop.Data/Migrations/UpgradeTo440/SpecificationAttributeGroupingMigration.cs b/src/Libraries/Nop.Data/Migrations/UpgradeTo440/SpecificationAttributeGroupingMigration.cs
index 4f6c404c706..1b65061b6f0 100644
--- a/src/Libraries/Nop.Data/Migrations/UpgradeTo440/SpecificationAttributeGroupingMigration.cs
+++ b/src/Libraries/Nop.Data/Migrations/UpgradeTo440/SpecificationAttributeGroupingMigration.cs
@@ -1,7 +1,6 @@
 using FluentMigrator;
 using Nop.Core.Domain.Catalog;
 using Nop.Data.Extensions;
-using Nop.Data.Mapping;
 
 namespace Nop.Data.Migrations.UpgradeTo440;
 
@@ -15,14 +14,16 @@ public class SpecificationAttributeGroupingMigration : ForwardOnlyMigration
     /// </summary>
     public override void Up()
     {
-        if (!Schema.Table(NameCompatibilityManager.GetTableName(typeof(SpecificationAttributeGroup))).Exists())
+        if (!Schema.TableExist<SpecificationAttributeGroup>())
             Create.TableFor<SpecificationAttributeGroup>();
 
-        if (!Schema.Table(NameCompatibilityManager.GetTableName(typeof(SpecificationAttribute))).Column(nameof(SpecificationAttribute.SpecificationAttributeGroupId)).Exists())
+        if (!Schema.ColumnExist<SpecificationAttribute>(t => t.SpecificationAttributeGroupId))
         {
             //add new column
-            Alter.Table(NameCompatibilityManager.GetTableName(typeof(SpecificationAttribute)))
-                .AddColumn(nameof(SpecificationAttribute.SpecificationAttributeGroupId)).AsInt32().Nullable().ForeignKey<SpecificationAttributeGroup>();
+            Alter.AddColumnFor<SpecificationAttribute>(t => t.SpecificationAttributeGroupId)
+                .AsInt32()
+                .Nullable()
+                .ForeignKey<SpecificationAttributeGroup>();
         }
     }
 
diff --git a/src/Libraries/Nop.Data/Migrations/UpgradeTo450/DataMigration.cs b/src/Libraries/Nop.Data/Migrations/UpgradeTo450/DataMigration.cs
index 252a302e194..c52cc0f57d0 100644
--- a/src/Libraries/Nop.Data/Migrations/UpgradeTo450/DataMigration.cs
+++ b/src/Libraries/Nop.Data/Migrations/UpgradeTo450/DataMigration.cs
@@ -5,7 +5,7 @@
 using Nop.Core.Domain.ScheduleTasks;
 using Nop.Core.Domain.Security;
 using Nop.Core.Domain.Shipping;
-using Nop.Data.Mapping;
+using Nop.Data.Extensions;
 
 namespace Nop.Data.Migrations.UpgradeTo450;
 
@@ -25,13 +25,12 @@ public DataMigration(INopDataProvider dataProvider)
     public override void Up()
     {
         // add column
-        var shipmentTableName = nameof(Shipment);
-        var collectedDateUtcColumnName = "ReadyForPickupDateUtc";
 
-        if (!Schema.Table(shipmentTableName).Column(collectedDateUtcColumnName).Exists())
+        if (!Schema.ColumnExist<Shipment>(t => t.ReadyForPickupDateUtc))
         {
-            Alter.Table(shipmentTableName)
-                .AddColumn(collectedDateUtcColumnName).AsDateTime2().Nullable();
+            Alter.AddColumnFor<Shipment>(t => t.ReadyForPickupDateUtc)
+                .AsDateTime2()
+                .Nullable();
         }
 
         // add message template
@@ -49,17 +48,19 @@ public override void Up()
             );
         }
         //#5547
-        var scheduleTaskTableName = NameCompatibilityManager.GetTableName(typeof(ScheduleTask));
 
         //add column
-        if (!Schema.Table(scheduleTaskTableName).Column(nameof(ScheduleTask.LastEnabledUtc)).Exists())
+        if (!Schema.ColumnExist<ScheduleTask>(t => t.LastEnabledUtc))
         {
-            Alter.Table(scheduleTaskTableName)
-                .AddColumn(nameof(ScheduleTask.LastEnabledUtc)).AsDateTime2().Nullable();
+            Alter.AddColumnFor<ScheduleTask>(t => t.LastEnabledUtc)
+                .AsDateTime2()
+                .Nullable();
         }
         else
         {
-            Alter.Table(scheduleTaskTableName).AlterColumn(nameof(ScheduleTask.LastEnabledUtc)).AsDateTime2().Nullable();
+            Alter.AlterColumnFor<ScheduleTask>(t => t.LastEnabledUtc)
+                .AsDateTime2()
+                .Nullable();
         }
 
         //#5939
@@ -89,13 +90,13 @@ public override void Up()
         }
 
         //add column
-        var returnRequestTableName = NameCompatibilityManager.GetTableName(typeof(ReturnRequest));
-        var returnedQuantityColumnName = "ReturnedQuantity";
 
-        if (!Schema.Table(returnRequestTableName).Column(returnedQuantityColumnName).Exists())
+        if (!Schema.ColumnExist<ReturnRequest>(t => t.ReturnedQuantity))
         {
-            Alter.Table(returnRequestTableName)
-                .AddColumn(returnedQuantityColumnName).AsInt32().NotNullable().SetExistingRowsTo(0);
+            Alter.AddColumnFor<ReturnRequest>(t => t.ReturnedQuantity)
+                .AsInt32()
+                .NotNullable()
+                .SetExistingRowsTo(0);
         }
 
         //#6053
diff --git a/src/Libraries/Nop.Data/Migrations/UpgradeTo460/MySqlDateTimeWithPrecisionMigration.cs b/src/Libraries/Nop.Data/Migrations/UpgradeTo460/MySqlDateTimeWithPrecisionMigration.cs
index a74667753c6..7de00874564 100644
--- a/src/Libraries/Nop.Data/Migrations/UpgradeTo460/MySqlDateTimeWithPrecisionMigration.cs
+++ b/src/Libraries/Nop.Data/Migrations/UpgradeTo460/MySqlDateTimeWithPrecisionMigration.cs
@@ -15,7 +15,7 @@
 using Nop.Core.Domain.ScheduleTasks;
 using Nop.Core.Domain.Shipping;
 using Nop.Core.Domain.Vendors;
-using Nop.Data.Mapping;
+using Nop.Data.Extensions;
 
 namespace Nop.Data.Migrations.UpgradeTo460;
 
@@ -30,313 +30,310 @@ public override void Up()
         if (dataSettings.DataProvider != DataProviderType.MySql)
             return;
 
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ActivityLog)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(ActivityLog), nameof(ActivityLog.CreatedOnUtc)))
+        Alter.AlterColumnFor<Address>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Address)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Address), nameof(Address.CreatedOnUtc)))
-            .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(BackInStockSubscription)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(BackInStockSubscription), nameof(BackInStockSubscription.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<BackInStockSubscription>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(BlogComment)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(BlogComment), nameof(BlogComment.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<BlogComment>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(BlogPost)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(BlogPost), nameof(BlogPost.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<BlogPost>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(BlogPost)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(BlogPost), nameof(BlogPost.EndDateUtc)))
+
+        Alter.AlterColumnFor<BlogPost>(t => t.EndDateUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(BlogPost)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(BlogPost), nameof(BlogPost.StartDateUtc)))
+
+        Alter.AlterColumnFor<BlogPost>(t => t.StartDateUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Campaign)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Campaign), nameof(Campaign.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<Campaign>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Campaign)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Campaign), nameof(Campaign.DontSendBeforeDateUtc)))
+
+        Alter.AlterColumnFor<Campaign>(t => t.DontSendBeforeDateUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Category)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Category), nameof(Category.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<Category>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Category)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Category), nameof(Category.UpdatedOnUtc)))
+
+        Alter.AlterColumnFor<Category>(t => t.UpdatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Currency)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Currency), nameof(Currency.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<Currency>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Currency)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Currency), nameof(Currency.UpdatedOnUtc)))
+
+        Alter.AlterColumnFor<Currency>(t => t.UpdatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Customer)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Customer), nameof(Customer.CannotLoginUntilDateUtc)))
+
+        Alter.AlterColumnFor<Customer>(t => t.CannotLoginUntilDateUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Customer)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Customer), nameof(Customer.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<Customer>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Customer)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Customer), nameof(Customer.DateOfBirth)))
+
+        Alter.AlterColumnFor<Customer>(t => t.DateOfBirth)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Customer)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Customer), nameof(Customer.LastActivityDateUtc)))
+
+        Alter.AlterColumnFor<Customer>(t => t.LastActivityDateUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Customer)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Customer), nameof(Customer.LastLoginDateUtc)))
+
+        Alter.AlterColumnFor<Customer>(t => t.LastLoginDateUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(CustomerPassword)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(CustomerPassword), nameof(CustomerPassword.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<CustomerPassword>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Discount)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Discount), nameof(Discount.EndDateUtc)))
+
+        Alter.AlterColumnFor<Discount>(t => t.EndDateUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Discount)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Discount), nameof(Discount.StartDateUtc)))
+
+        Alter.AlterColumnFor<Discount>(t => t.StartDateUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(DiscountUsageHistory)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(DiscountUsageHistory), nameof(DiscountUsageHistory.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<DiscountUsageHistory>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Forum)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Forum), nameof(Forum.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<Forum>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Forum)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Forum), nameof(Forum.LastPostTime)))
+
+        Alter.AlterColumnFor<Forum>(t => t.LastPostTime)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Forum)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Forum), nameof(Forum.UpdatedOnUtc)))
+
+        Alter.AlterColumnFor<Forum>(t => t.UpdatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ForumGroup)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(ForumGroup), nameof(ForumGroup.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<ForumGroup>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ForumGroup)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(ForumGroup), nameof(ForumGroup.UpdatedOnUtc)))
+
+        Alter.AlterColumnFor<ForumGroup>(t => t.UpdatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ForumPost)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(ForumPost), nameof(ForumPost.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<ForumPost>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ForumPost)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(ForumPost), nameof(ForumPost.UpdatedOnUtc)))
+
+        Alter.AlterColumnFor<ForumPost>(t => t.UpdatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ForumPostVote)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(ForumPostVote), nameof(ForumPostVote.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<ForumPostVote>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(PrivateMessage)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(PrivateMessage), nameof(PrivateMessage.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<PrivateMessage>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ForumSubscription)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(ForumSubscription), nameof(ForumSubscription.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<ForumSubscription>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ForumTopic)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(ForumTopic), nameof(ForumTopic.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<ForumTopic>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ForumTopic)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(ForumTopic), nameof(ForumTopic.LastPostTime)))
+
+        Alter.AlterColumnFor<ForumTopic>(t => t.LastPostTime)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ForumTopic)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(ForumTopic), nameof(ForumTopic.UpdatedOnUtc)))
+
+        Alter.AlterColumnFor<ForumTopic>(t => t.UpdatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(GdprLog)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(GdprLog), nameof(GdprLog.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<GdprLog>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(GenericAttribute)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(GenericAttribute), nameof(GenericAttribute.CreatedOrUpdatedDateUTC)))
+
+        Alter.AlterColumnFor<GenericAttribute>(t => t.CreatedOrUpdatedDateUTC)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(GiftCard)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(GiftCard), nameof(GiftCard.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<GiftCard>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(GiftCardUsageHistory)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(GiftCardUsageHistory), nameof(GiftCardUsageHistory.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<GiftCardUsageHistory>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Log)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Log), nameof(Log.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<Log>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Manufacturer)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Manufacturer), nameof(Manufacturer.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<Manufacturer>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Manufacturer)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Manufacturer), nameof(Manufacturer.UpdatedOnUtc)))
+
+        Alter.AlterColumnFor<Manufacturer>(t => t.UpdatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(MigrationVersionInfo)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(MigrationVersionInfo), nameof(MigrationVersionInfo.AppliedOn)))
+
+        Alter.AlterColumnFor<MigrationVersionInfo>(t => t.AppliedOn)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(NewsItem)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(NewsItem), nameof(NewsItem.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<NewsItem>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(NewsItem)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(NewsItem), nameof(NewsItem.EndDateUtc)))
+
+        Alter.AlterColumnFor<NewsItem>(t => t.EndDateUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(NewsItem)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(NewsItem), nameof(NewsItem.StartDateUtc)))
+
+        Alter.AlterColumnFor<NewsItem>(t => t.StartDateUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(NewsComment)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(NewsComment), nameof(NewsComment.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<NewsComment>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(NewsLetterSubscription)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(NewsLetterSubscription), nameof(NewsLetterSubscription.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<NewsLetterSubscription>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Order)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Order), nameof(Order.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<Order>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Order)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Order), nameof(Order.PaidDateUtc)))
+
+        Alter.AlterColumnFor<Order>(t => t.PaidDateUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(OrderItem)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(OrderItem), nameof(OrderItem.RentalEndDateUtc)))
+
+        Alter.AlterColumnFor<OrderItem>(t => t.RentalEndDateUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(OrderItem)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(OrderItem), nameof(OrderItem.RentalStartDateUtc)))
+
+        Alter.AlterColumnFor<OrderItem>(t => t.RentalStartDateUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(OrderNote)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(OrderNote), nameof(OrderNote.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<OrderNote>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Poll)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Poll), nameof(Poll.EndDateUtc)))
+
+        Alter.AlterColumnFor<Poll>(t => t.EndDateUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Poll)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Poll), nameof(Poll.StartDateUtc)))
+
+        Alter.AlterColumnFor<Poll>(t => t.StartDateUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(PollVotingRecord)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(PollVotingRecord), nameof(PollVotingRecord.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<PollVotingRecord>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Product)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Product), nameof(Product.AvailableEndDateTimeUtc)))
+
+        Alter.AlterColumnFor<Product>(t => t.AvailableEndDateTimeUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Product)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Product), nameof(Product.AvailableStartDateTimeUtc)))
+
+        Alter.AlterColumnFor<Product>(t => t.AvailableStartDateTimeUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Product)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Product), nameof(Product.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<Product>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Product)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Product), nameof(Product.MarkAsNewEndDateTimeUtc)))
+
+        Alter.AlterColumnFor<Product>(t => t.MarkAsNewEndDateTimeUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Product)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Product), nameof(Product.MarkAsNewStartDateTimeUtc)))
+
+        Alter.AlterColumnFor<Product>(t => t.MarkAsNewStartDateTimeUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Product)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Product), nameof(Product.PreOrderAvailabilityStartDateTimeUtc)))
+
+        Alter.AlterColumnFor<Product>(t => t.PreOrderAvailabilityStartDateTimeUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Product)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Product), nameof(Product.UpdatedOnUtc)))
+
+        Alter.AlterColumnFor<Product>(t => t.UpdatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ProductReview)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(ProductReview), nameof(ProductReview.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<ProductReview>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(QueuedEmail)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(QueuedEmail), nameof(QueuedEmail.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<QueuedEmail>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(QueuedEmail)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(QueuedEmail), nameof(QueuedEmail.DontSendBeforeDateUtc)))
+
+        Alter.AlterColumnFor<QueuedEmail>(t => t.DontSendBeforeDateUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(QueuedEmail)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(QueuedEmail), nameof(QueuedEmail.SentOnUtc)))
+
+        Alter.AlterColumnFor<QueuedEmail>(t => t.SentOnUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(RecurringPayment)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(RecurringPayment), nameof(RecurringPayment.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<RecurringPayment>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(RecurringPayment)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(RecurringPayment), nameof(RecurringPayment.StartDateUtc)))
+
+        Alter.AlterColumnFor<RecurringPayment>(t => t.StartDateUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(RecurringPaymentHistory)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(RecurringPaymentHistory), nameof(RecurringPaymentHistory.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<RecurringPaymentHistory>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ReturnRequest)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(ReturnRequest), nameof(ReturnRequest.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<ReturnRequest>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ReturnRequest)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(ReturnRequest), nameof(ReturnRequest.UpdatedOnUtc)))
+
+        Alter.AlterColumnFor<ReturnRequest>(t => t.UpdatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(RewardPointsHistory)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(RewardPointsHistory), nameof(RewardPointsHistory.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<RewardPointsHistory>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(RewardPointsHistory)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(RewardPointsHistory), nameof(RewardPointsHistory.EndDateUtc)))
+
+        Alter.AlterColumnFor<RewardPointsHistory>(t => t.EndDateUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ScheduleTask)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(ScheduleTask), nameof(ScheduleTask.LastEnabledUtc)))
+
+        Alter.AlterColumnFor<ScheduleTask>(t => t.LastEnabledUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ScheduleTask)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(ScheduleTask), nameof(ScheduleTask.LastEndUtc)))
+
+        Alter.AlterColumnFor<ScheduleTask>(t => t.LastEndUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ScheduleTask)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(ScheduleTask), nameof(ScheduleTask.LastStartUtc)))
+
+        Alter.AlterColumnFor<ScheduleTask>(t => t.LastStartUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ScheduleTask)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(ScheduleTask), nameof(ScheduleTask.LastSuccessUtc)))
+
+        Alter.AlterColumnFor<ScheduleTask>(t => t.LastSuccessUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Shipment)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Shipment), nameof(Shipment.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<Shipment>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Shipment)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Shipment), nameof(Shipment.DeliveryDateUtc)))
+
+        Alter.AlterColumnFor<Shipment>(t => t.DeliveryDateUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Shipment)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Shipment), nameof(Shipment.ReadyForPickupDateUtc)))
+
+        Alter.AlterColumnFor<Shipment>(t => t.ReadyForPickupDateUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(Shipment)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(Shipment), nameof(Shipment.ShippedDateUtc)))
+
+        Alter.AlterColumnFor<Shipment>(t => t.ShippedDateUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ShoppingCartItem)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(ShoppingCartItem), nameof(ShoppingCartItem.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<ShoppingCartItem>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ShoppingCartItem)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(ShoppingCartItem), nameof(ShoppingCartItem.RentalEndDateUtc)))
+
+        Alter.AlterColumnFor<ShoppingCartItem>(t => t.RentalEndDateUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ShoppingCartItem)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(ShoppingCartItem), nameof(ShoppingCartItem.RentalStartDateUtc)))
+
+        Alter.AlterColumnFor<ShoppingCartItem>(t => t.RentalStartDateUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ShoppingCartItem)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(ShoppingCartItem), nameof(ShoppingCartItem.UpdatedOnUtc)))
+
+        Alter.AlterColumnFor<ShoppingCartItem>(t => t.UpdatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(StockQuantityHistory)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(StockQuantityHistory), nameof(StockQuantityHistory.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<StockQuantityHistory>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(TierPrice)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(TierPrice), nameof(TierPrice.EndDateTimeUtc)))
+
+        Alter.AlterColumnFor<TierPrice>(t => t.EndDateTimeUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(TierPrice)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(TierPrice), nameof(TierPrice.StartDateTimeUtc)))
+
+        Alter.AlterColumnFor<TierPrice>(t => t.StartDateTimeUtc)
             .AsCustom("datetime(6)")
             .Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(VendorNote)))
-            .AlterColumn(NameCompatibilityManager.GetColumnName(typeof(VendorNote), nameof(VendorNote.CreatedOnUtc)))
+
+        Alter.AlterColumnFor<VendorNote>(t => t.CreatedOnUtc)
             .AsCustom("datetime(6)");
+
     }
 }
\ No newline at end of file
diff --git a/src/Libraries/Nop.Data/Migrations/UpgradeTo460/SchemaMigration.cs b/src/Libraries/Nop.Data/Migrations/UpgradeTo460/SchemaMigration.cs
index 57334e2e3ce..4ef49995da0 100644
--- a/src/Libraries/Nop.Data/Migrations/UpgradeTo460/SchemaMigration.cs
+++ b/src/Libraries/Nop.Data/Migrations/UpgradeTo460/SchemaMigration.cs
@@ -18,144 +18,71 @@ public class SchemaMigration : ForwardOnlyMigration
     public override void Up()
     {
         // add column
-        var customerTableName = nameof(Customer);
-
-        var firstNameCustomerColumnName = nameof(Customer.FirstName);
-        var lastNameCustomerColumnName = nameof(Customer.LastName);
-        var genderCustomerColumnName = nameof(Customer.Gender);
-        var dobCustomerColumnName = nameof(Customer.DateOfBirth);
-        var companyCustomerColumnName = nameof(Customer.Company);
-        var address1CustomerColumnName = nameof(Customer.StreetAddress);
-        var address2CustomerColumnName = nameof(Customer.StreetAddress2);
-        var zipCustomerColumnName = nameof(Customer.ZipPostalCode);
-        var cityCustomerColumnName = nameof(Customer.City);
-        var countyCustomerColumnName = nameof(Customer.County);
-        var countryIdCustomerColumnName = nameof(Customer.CountryId);
-        var stateIdCustomerColumnName = nameof(Customer.StateProvinceId);
-        var phoneCustomerColumnName = nameof(Customer.Phone);
-        var faxCustomerColumnName = nameof(Customer.Fax);
-        var vatNumberCustomerColumnName = nameof(Customer.VatNumber);
-        var vatNumberStatusIdCustomerColumnName = nameof(Customer.VatNumberStatusId);
-        var timeZoneIdCustomerColumnName = nameof(Customer.TimeZoneId);
-        var attributeXmlCustomerColumnName = nameof(Customer.CustomCustomerAttributesXML);
-        var currencyIdCustomerColumnName = nameof(Customer.CurrencyId);
-        var languageIdCustomerColumnName = nameof(Customer.LanguageId);
-        var taxDisplayTypeIdCustomerColumnName = nameof(Customer.TaxDisplayTypeId);
-
-        if (!Schema.Table(customerTableName).Column(firstNameCustomerColumnName).Exists())
-        {
-            Alter.Table(customerTableName)
-                .AddColumn(firstNameCustomerColumnName).AsString(1000).Nullable();
-        }
-        if (!Schema.Table(customerTableName).Column(lastNameCustomerColumnName).Exists())
-        {
-            Alter.Table(customerTableName)
-                .AddColumn(lastNameCustomerColumnName).AsString(1000).Nullable();
-        }
-        if (!Schema.Table(customerTableName).Column(genderCustomerColumnName).Exists())
-        {
-            Alter.Table(customerTableName)
-                .AddColumn(genderCustomerColumnName).AsString(1000).Nullable();
-        }
-        if (!Schema.Table(customerTableName).Column(dobCustomerColumnName).Exists())
-        {
-            Alter.Table(customerTableName)
-                .AddColumn(dobCustomerColumnName).AsDateTime2().Nullable();
-        }
-        if (!Schema.Table(customerTableName).Column(companyCustomerColumnName).Exists())
-        {
-            Alter.Table(customerTableName)
-                .AddColumn(companyCustomerColumnName).AsString(1000).Nullable();
-        }
-        if (!Schema.Table(customerTableName).Column(address1CustomerColumnName).Exists())
-        {
-            Alter.Table(customerTableName)
-                .AddColumn(address1CustomerColumnName).AsString(1000).Nullable();
-        }
-        if (!Schema.Table(customerTableName).Column(address2CustomerColumnName).Exists())
-        {
-            Alter.Table(customerTableName)
-                .AddColumn(address2CustomerColumnName).AsString(1000).Nullable();
-        }
-        if (!Schema.Table(customerTableName).Column(zipCustomerColumnName).Exists())
-        {
-            Alter.Table(customerTableName)
-                .AddColumn(zipCustomerColumnName).AsString(1000).Nullable();
-        }
-        if (!Schema.Table(customerTableName).Column(cityCustomerColumnName).Exists())
-        {
-            Alter.Table(customerTableName)
-                .AddColumn(cityCustomerColumnName).AsString(1000).Nullable();
-        }
-        if (!Schema.Table(customerTableName).Column(countyCustomerColumnName).Exists())
-        {
-            Alter.Table(customerTableName)
-                .AddColumn(countyCustomerColumnName).AsString(1000).Nullable();
-        }
-        if (!Schema.Table(customerTableName).Column(countryIdCustomerColumnName).Exists())
-        {
-            Alter.Table(customerTableName)
-                .AddColumn(countryIdCustomerColumnName).AsInt32().NotNullable().SetExistingRowsTo(0);
-        }
-        if (!Schema.Table(customerTableName).Column(stateIdCustomerColumnName).Exists())
-        {
-            Alter.Table(customerTableName)
-                .AddColumn(stateIdCustomerColumnName).AsInt32().NotNullable().SetExistingRowsTo(0);
-        }
-        if (!Schema.Table(customerTableName).Column(phoneCustomerColumnName).Exists())
-        {
-            Alter.Table(customerTableName)
-                .AddColumn(phoneCustomerColumnName).AsString(1000).Nullable();
-        }
-        if (!Schema.Table(customerTableName).Column(faxCustomerColumnName).Exists())
-        {
-            Alter.Table(customerTableName)
-                .AddColumn(faxCustomerColumnName).AsString(1000).Nullable();
-        }
-        if (!Schema.Table(customerTableName).Column(vatNumberCustomerColumnName).Exists())
-        {
-            Alter.Table(customerTableName)
-                .AddColumn(vatNumberCustomerColumnName).AsString(1000).Nullable();
-        }
-        if (!Schema.Table(customerTableName).Column(vatNumberStatusIdCustomerColumnName).Exists())
-        {
-            Alter.Table(customerTableName)
-                .AddColumn(vatNumberStatusIdCustomerColumnName).AsInt32().NotNullable().SetExistingRowsTo((int)VatNumberStatus.Unknown);
-        }
-        if (!Schema.Table(customerTableName).Column(timeZoneIdCustomerColumnName).Exists())
-        {
-            Alter.Table(customerTableName)
-                .AddColumn(timeZoneIdCustomerColumnName).AsString(1000).Nullable();
-        }
-        if (!Schema.Table(customerTableName).Column(attributeXmlCustomerColumnName).Exists())
-        {
-            Alter.Table(customerTableName)
-                .AddColumn(attributeXmlCustomerColumnName).AsString(int.MaxValue).Nullable();
-        }
-        if (!Schema.Table(customerTableName).Column(currencyIdCustomerColumnName).Exists())
-        {
-            Alter.Table(customerTableName)
-                .AddColumn(currencyIdCustomerColumnName).AsInt32().ForeignKey<Currency>(onDelete: Rule.SetNull).Nullable();
-        }
-        if (!Schema.Table(customerTableName).Column(languageIdCustomerColumnName).Exists())
-        {
-            Alter.Table(customerTableName)
-                .AddColumn(languageIdCustomerColumnName).AsInt32().ForeignKey<Language>(onDelete: Rule.SetNull).Nullable();
-        }
-        if (!Schema.Table(customerTableName).Column(taxDisplayTypeIdCustomerColumnName).Exists())
-        {
-            Alter.Table(customerTableName)
-                .AddColumn(taxDisplayTypeIdCustomerColumnName).AsInt32().Nullable();
-        }
-
-        //5705
-        var discountTableName = nameof(Discount);
-        var isActiveDiscountColumnName = nameof(Discount.IsActive);
-
-        if (!Schema.Table(discountTableName).Column(isActiveDiscountColumnName).Exists())
-        {
-            Alter.Table(discountTableName)
-                .AddColumn(isActiveDiscountColumnName).AsBoolean().NotNullable().SetExistingRowsTo(true);
-        }
+        if (!Schema.ColumnExist<Customer>(t => t.FirstName))
+            Alter.AddColumnFor<Customer>(t => t.FirstName).AsString(1000).Nullable();
+
+        if (!Schema.ColumnExist<Customer>(t => t.LastName))
+            Alter.AddColumnFor<Customer>(t => t.LastName).AsString(1000).Nullable();
+
+        if (!Schema.ColumnExist<Customer>(t => t.Gender))
+            Alter.AddColumnFor<Customer>(t => t.Gender).AsString(1000).Nullable();
+
+        if (!Schema.ColumnExist<Customer>(t => t.DateOfBirth))
+            Alter.AddColumnFor<Customer>(t => t.DateOfBirth).AsDateTime2().Nullable();
+
+        if (!Schema.ColumnExist<Customer>(t => t.Company))
+            Alter.AddColumnFor<Customer>(t => t.Company).AsString(1000).Nullable();
+
+        if (!Schema.ColumnExist<Customer>(t => t.StreetAddress))
+            Alter.AddColumnFor<Customer>(t => t.StreetAddress).AsString(1000).Nullable();
+
+        if (!Schema.ColumnExist<Customer>(t => t.StreetAddress2))
+            Alter.AddColumnFor<Customer>(t => t.StreetAddress2).AsString(1000).Nullable();
+
+        if (!Schema.ColumnExist<Customer>(t => t.ZipPostalCode))
+            Alter.AddColumnFor<Customer>(t => t.ZipPostalCode).AsString(1000).Nullable();
+
+        if (!Schema.ColumnExist<Customer>(t => t.City))
+            Alter.AddColumnFor<Customer>(t => t.City).AsString(1000).Nullable();
+
+        if (!Schema.ColumnExist<Customer>(t => t.County))
+            Alter.AddColumnFor<Customer>(t => t.County).AsString(1000).Nullable();
+
+        if (!Schema.ColumnExist<Customer>(t => t.CountryId))
+            Alter.AddColumnFor<Customer>(t => t.CountryId).AsInt32().NotNullable().SetExistingRowsTo(0);
+
+        if (!Schema.ColumnExist<Customer>(t => t.StateProvinceId))
+            Alter.AddColumnFor<Customer>(t => t.StateProvinceId).AsInt32().NotNullable().SetExistingRowsTo(0);
+
+        if (!Schema.ColumnExist<Customer>(t => t.Phone))
+            Alter.AddColumnFor<Customer>(t => t.Phone).AsString(1000).Nullable();
+
+        if (!Schema.ColumnExist<Customer>(t => t.Fax))
+            Alter.AddColumnFor<Customer>(t => t.Fax).AsString(1000).Nullable();
+
+        if (!Schema.ColumnExist<Customer>(t => t.VatNumber))
+            Alter.AddColumnFor<Customer>(t => t.VatNumber).AsString(1000).Nullable();
+
+        if (!Schema.ColumnExist<Customer>(t => t.VatNumberStatusId))
+            Alter.AddColumnFor<Customer>(t => t.VatNumberStatusId).AsInt32().NotNullable().SetExistingRowsTo((int)VatNumberStatus.Unknown);
+
+        if (!Schema.ColumnExist<Customer>(t => t.TimeZoneId))
+            Alter.AddColumnFor<Customer>(t => t.TimeZoneId).AsString(1000).Nullable();
+
+        if (!Schema.ColumnExist<Customer>(t => t.CustomCustomerAttributesXML))
+            Alter.AddColumnFor<Customer>(t => t.CustomCustomerAttributesXML).AsString(int.MaxValue).Nullable();
+
+        if (!Schema.ColumnExist<Customer>(t => t.CurrencyId))
+            Alter.AddColumnFor<Customer>(t => t.CurrencyId).AsInt32().ForeignKey<Currency>(onDelete: Rule.SetNull).Nullable();
+
+        if (!Schema.ColumnExist<Customer>(t => t.LanguageId))
+            Alter.AddColumnFor<Customer>(t => t.LanguageId).AsInt32().ForeignKey<Language>(onDelete: Rule.SetNull).Nullable();
+
+        if (!Schema.ColumnExist<Customer>(t => t.TaxDisplayTypeId))
+            Alter.AddColumnFor<Customer>(t => t.TaxDisplayTypeId).AsInt32().Nullable();
+
+        // Discount table
+        if (!Schema.ColumnExist<Discount>(t => t.IsActive))
+            Alter.AddColumnFor<Discount>(t => t.IsActive).AsBoolean().NotNullable().SetExistingRowsTo(true);
     }
 }
\ No newline at end of file
diff --git a/src/Libraries/Nop.Data/Migrations/UpgradeTo460/StoreMigration.cs b/src/Libraries/Nop.Data/Migrations/UpgradeTo460/StoreMigration.cs
index f4678d80d5c..3b6ba15f5de 100644
--- a/src/Libraries/Nop.Data/Migrations/UpgradeTo460/StoreMigration.cs
+++ b/src/Libraries/Nop.Data/Migrations/UpgradeTo460/StoreMigration.cs
@@ -1,5 +1,6 @@
 using FluentMigrator;
 using Nop.Core.Domain.Stores;
+using Nop.Data.Extensions;
 
 namespace Nop.Data.Migrations.UpgradeTo460;
 
@@ -8,49 +9,38 @@ public class StoreMigration : ForwardOnlyMigration
 {
     public override void Up()
     {
-        if (!Schema.Table(nameof(Store)).Column(nameof(Store.Deleted)).Exists())
-        {
+        if (!Schema.ColumnExist<Store>(t => t.Deleted))
             //add new column
-            Alter.Table(nameof(Store))
-                .AddColumn(nameof(Store.Deleted)).AsBoolean().WithDefaultValue(false);
+            Alter.AddColumnFor<Store>(t => t.Deleted).AsBoolean().WithDefaultValue(false);
 
-            Alter.Table(nameof(Store))
-                .AlterColumn(nameof(Store.Deleted)).AsBoolean();
-        }
-
-        if (!Schema.Table(nameof(Store)).Column(nameof(Store.DefaultTitle)).Exists())
+        if (!Schema.ColumnExist<Store>(t => t.DefaultTitle))
             //add new column
-            Alter.Table(nameof(Store))
-                .AddColumn(nameof(Store.DefaultTitle)).AsString(int.MaxValue).Nullable();
+            Alter.AddColumnFor<Store>(t => t.DefaultTitle).AsString(int.MaxValue).Nullable();
         else
-            Alter.Table(nameof(Store)).AlterColumn(nameof(Store.DefaultTitle)).AsString(int.MaxValue).Nullable();
+            Alter.AlterColumnFor<Store>(t => t.DefaultTitle).AsString(int.MaxValue).Nullable();
 
-        if (!Schema.Table(nameof(Store)).Column(nameof(Store.DefaultMetaDescription)).Exists())
+        if (!Schema.ColumnExist<Store>(t => t.DefaultMetaDescription))
             //add new column
-            Alter.Table(nameof(Store))
-                .AddColumn(nameof(Store.DefaultMetaDescription)).AsString(int.MaxValue).Nullable();
+            Alter.AddColumnFor<Store>(t => t.DefaultMetaDescription).AsString(int.MaxValue).Nullable();
         else
-            Alter.Table(nameof(Store)).AlterColumn(nameof(Store.DefaultMetaDescription)).AsString(int.MaxValue).Nullable();
+            Alter.AlterColumnFor<Store>(t => t.DefaultMetaDescription).AsString(int.MaxValue).Nullable();
 
-        if (!Schema.Table(nameof(Store)).Column(nameof(Store.DefaultMetaKeywords)).Exists())
+        if (!Schema.ColumnExist<Store>(t => t.DefaultMetaKeywords))
             //add new column
-            Alter.Table(nameof(Store))
-                .AddColumn(nameof(Store.DefaultMetaKeywords)).AsString(int.MaxValue).Nullable();
+            Alter.AddColumnFor<Store>(t => t.DefaultMetaKeywords).AsString(int.MaxValue).Nullable();
         else
-            Alter.Table(nameof(Store)).AlterColumn(nameof(Store.DefaultMetaKeywords)).AsString(int.MaxValue).Nullable();
+            Alter.AlterColumnFor<Store>(t => t.DefaultMetaKeywords).AsString(int.MaxValue).Nullable();
 
-        if (!Schema.Table(nameof(Store)).Column(nameof(Store.HomepageDescription)).Exists())
+        if (!Schema.ColumnExist<Store>(t => t.HomepageDescription))
             //add new column
-            Alter.Table(nameof(Store))
-                .AddColumn(nameof(Store.HomepageDescription)).AsString(int.MaxValue).Nullable();
+            Alter.AddColumnFor<Store>(t => t.HomepageDescription).AsString(int.MaxValue).Nullable();
         else
-            Alter.Table(nameof(Store)).AlterColumn(nameof(Store.HomepageDescription)).AsString(int.MaxValue).Nullable();
+            Alter.AlterColumnFor<Store>(t => t.HomepageDescription).AsString(int.MaxValue).Nullable();
 
-        if (!Schema.Table(nameof(Store)).Column(nameof(Store.HomepageTitle)).Exists())
+        if (!Schema.ColumnExist<Store>(t => t.HomepageTitle))
             //add new column
-            Alter.Table(nameof(Store))
-                .AddColumn(nameof(Store.HomepageTitle)).AsString(int.MaxValue).Nullable();
+            Alter.AddColumnFor<Store>(t => t.HomepageTitle).AsString(int.MaxValue).Nullable();
         else
-            Alter.Table(nameof(Store)).AlterColumn(nameof(Store.HomepageTitle)).AsString(int.MaxValue).Nullable();
+            Alter.AlterColumnFor<Store>(t => t.HomepageTitle).AsString(int.MaxValue).Nullable();
     }
 }
\ No newline at end of file
diff --git a/src/Libraries/Nop.Data/Migrations/UpgradeTo460/VideoMigration.cs b/src/Libraries/Nop.Data/Migrations/UpgradeTo460/VideoMigration.cs
index c90184f4aac..92c09f46015 100644
--- a/src/Libraries/Nop.Data/Migrations/UpgradeTo460/VideoMigration.cs
+++ b/src/Libraries/Nop.Data/Migrations/UpgradeTo460/VideoMigration.cs
@@ -2,7 +2,6 @@
 using Nop.Core.Domain.Catalog;
 using Nop.Core.Domain.Media;
 using Nop.Data.Extensions;
-using Nop.Data.Mapping;
 
 namespace Nop.Data.Migrations.UpgradeTo460;
 
@@ -14,10 +13,10 @@ public class VideoMigration : ForwardOnlyMigration
     /// </summary>
     public override void Up()
     {
-        if (!Schema.Table(NameCompatibilityManager.GetTableName(typeof(Video))).Exists())
+        if (!Schema.TableExist<Video>())
             Create.TableFor<Video>();
 
-        if (!Schema.Table(NameCompatibilityManager.GetTableName(typeof(ProductVideo))).Exists())
+        if (!Schema.TableExist<ProductVideo>())
             Create.TableFor<ProductVideo>();
     }
 }
\ No newline at end of file
diff --git a/src/Libraries/Nop.Data/Migrations/UpgradeTo470/AddIndexesMigration.cs b/src/Libraries/Nop.Data/Migrations/UpgradeTo470/AddIndexesMigration.cs
index 4ab42930b58..91f03243ea7 100644
--- a/src/Libraries/Nop.Data/Migrations/UpgradeTo470/AddIndexesMigration.cs
+++ b/src/Libraries/Nop.Data/Migrations/UpgradeTo470/AddIndexesMigration.cs
@@ -7,6 +7,7 @@
 using Nop.Core.Domain.News;
 using Nop.Core.Domain.Orders;
 using Nop.Core.Domain.Polls;
+using Nop.Data.Extensions;
 using Nop.Data.Mapping;
 
 namespace Nop.Data.Migrations.UpgradeTo470;
@@ -21,140 +22,176 @@ public override void Up()
     {
         const string databaseType = "sqlserver";
 
-        if (!Schema.Table(nameof(ActivityLog)).Index("IX_ActivityLog_CustomerId").Exists())
+        if (!Schema.TableFor<ActivityLog>().Index("IX_ActivityLog_CustomerId").Exists())
+        {
             IfDatabase(databaseType).Create.Index("IX_ActivityLog_CustomerId").OnTable(nameof(ActivityLog))
                 .OnColumn(nameof(ActivityLog.CustomerId)).Ascending()
                 .WithOptions().NonClustered();
+        }
 
-        if (!Schema.Table(NameCompatibilityManager.GetTableName(typeof(CustomerCustomerRoleMapping)))
-                .Index("IX_CustomerCustomerRoleMapping_CustomerId").Exists())
+        if (!Schema.TableFor<CustomerCustomerRoleMapping>().Index("IX_CustomerCustomerRoleMapping_CustomerId").Exists())
+        {
             IfDatabase(databaseType).Create.Index("IX_CustomerCustomerRoleMapping_CustomerId")
                 .OnTable(NameCompatibilityManager.GetTableName(typeof(CustomerCustomerRoleMapping)))
                 .OnColumn(NameCompatibilityManager.GetColumnName(typeof(CustomerCustomerRoleMapping),
                     nameof(CustomerCustomerRoleMapping.CustomerId))).Ascending()
                 .WithOptions().NonClustered();
+        }
 
-        if (!Schema.Table(NameCompatibilityManager.GetTableName(typeof(ForumTopic)))
-                .Index("IX_ForumTopic_CustomerId").Exists())
+        if (!Schema.TableFor<ForumTopic>().Index("IX_ForumTopic_CustomerId").Exists())
+        {
             IfDatabase(databaseType).Create.Index("IX_ForumTopic_CustomerId")
                 .OnTable(NameCompatibilityManager.GetTableName(typeof(ForumTopic)))
                 .OnColumn(nameof(ForumTopic.CustomerId)).Ascending()
                 .WithOptions().NonClustered();
+        }
 
-        if (!Schema.Table(NameCompatibilityManager.GetTableName(typeof(ForumPost))).Index("IX_ForumPost_CustomerId")
-                .Exists())
+        if (!Schema.TableFor<ForumPost>().Index("IX_ForumPost_CustomerId").Exists())
+        {
             IfDatabase(databaseType).Create.Index("IX_ForumPost_CustomerId")
                 .OnTable(NameCompatibilityManager.GetTableName(typeof(ForumPost)))
                 .OnColumn(nameof(ForumPost.CustomerId)).Ascending()
                 .WithOptions().NonClustered();
+        }
 
-        if (!Schema.Table(nameof(CustomerPassword)).Index("IX_CustomerPassword_CustomerId").Exists())
+        if (!Schema.TableFor<CustomerPassword>().Index("IX_CustomerPassword_CustomerId").Exists())
+        {
             IfDatabase(databaseType).Create.Index("IX_CustomerPassword_CustomerId")
                 .OnTable(nameof(CustomerPassword))
                 .OnColumn(nameof(CustomerPassword.CustomerId)).Ascending()
                 .WithOptions().NonClustered();
+        }
 
-        if (!Schema.Table(nameof(ExternalAuthenticationRecord)).Index("IX_ExternalAuthenticationRecord_CustomerId")
-                .Exists())
+        if (!Schema.TableFor<ExternalAuthenticationRecord>().Index("IX_ExternalAuthenticationRecord_CustomerId").Exists())
+        {
             IfDatabase(databaseType).Create.Index("IX_ExternalAuthenticationRecord_CustomerId")
                 .OnTable(nameof(ExternalAuthenticationRecord))
                 .OnColumn(nameof(ExternalAuthenticationRecord.CustomerId)).Ascending()
                 .WithOptions().NonClustered();
+        }
 
-        if (!Schema.Table(NameCompatibilityManager.GetTableName(typeof(PrivateMessage)))
-                .Index("IX_PrivateMessage_FromCustomerId").Exists())
+        if (!Schema.TableFor<PrivateMessage>().Index("IX_PrivateMessage_FromCustomerId").Exists())
+        {
             IfDatabase(databaseType).Create.Index("IX_PrivateMessage_FromCustomerId")
                 .OnTable(NameCompatibilityManager.GetTableName(typeof(PrivateMessage)))
                 .OnColumn(nameof(PrivateMessage.FromCustomerId)).Ascending()
                 .WithOptions().NonClustered();
+        }
 
-        if (!Schema.Table(NameCompatibilityManager.GetTableName(typeof(PrivateMessage)))
-                .Index("IX_PrivateMessage_ToCustomerId").Exists())
+        if (!Schema.TableFor<PrivateMessage>().Index("IX_PrivateMessage_ToCustomerId").Exists())
+        {
             IfDatabase(databaseType).Create.Index("IX_PrivateMessage_ToCustomerId")
                 .OnTable(NameCompatibilityManager.GetTableName(typeof(PrivateMessage)))
                 .OnColumn(nameof(PrivateMessage.ToCustomerId)).Ascending()
                 .WithOptions().NonClustered();
+        }
 
-        if (!Schema.Table(NameCompatibilityManager.GetTableName(typeof(ForumSubscription)))
-                .Index("IX_ForumSubscription_CustomerId").Exists())
+        if (!Schema.TableFor<ForumSubscription>().Index("IX_ForumSubscription_CustomerId").Exists())
+        {
             IfDatabase(databaseType).Create.Index("IX_ForumSubscription_CustomerId")
                 .OnTable(NameCompatibilityManager.GetTableName(typeof(ForumSubscription)))
                 .OnColumn(nameof(ForumSubscription.CustomerId)).Ascending()
                 .WithOptions().NonClustered();
+        }
 
-        if (!Schema.Table(nameof(PollVotingRecord)).Index("IX_PollVotingRecord_CustomerId").Exists())
+        if (!Schema.TableFor<PollVotingRecord>().Index("IX_PollVotingRecord_CustomerId").Exists())
+        {
             IfDatabase(databaseType).Create.Index("IX_PollVotingRecord_CustomerId")
                 .OnTable(nameof(PollVotingRecord))
                 .OnColumn(nameof(PollVotingRecord.CustomerId)).Ascending()
                 .WithOptions().NonClustered();
+        }
 
-        if (!Schema.Table(nameof(Order)).Index("IX_Order_CustomerId").Exists())
+        if (!Schema.TableFor<Order>().Index("IX_Order_CustomerId").Exists())
+        {
             IfDatabase(databaseType).Create.Index("IX_Order_CustomerId").OnTable(nameof(Order))
                 .OnColumn(nameof(Order.CustomerId)).Ascending()
                 .WithOptions().NonClustered();
+        }
 
-        if (!Schema.Table(nameof(Log)).Index("IX_Log_CustomerId").Exists())
+        if (!Schema.TableFor<Log>().Index("IX_Log_CustomerId").Exists())
+        {
             IfDatabase(databaseType).Create.Index("IX_Log_CustomerId").OnTable(nameof(Log))
                 .OnColumn(nameof(Log.CustomerId)).Ascending()
                 .WithOptions().NonClustered();
+        }
 
-        if (!Schema.Table(nameof(BlogComment)).Index("IX_BlogComment_CustomerId").Exists())
+        if (!Schema.TableFor<BlogComment>().Index("IX_BlogComment_CustomerId").Exists())
+        {
             IfDatabase(databaseType).Create.Index("IX_BlogComment_CustomerId").OnTable(nameof(BlogComment))
                 .OnColumn(nameof(BlogComment.CustomerId)).Ascending()
                 .WithOptions().NonClustered();
+        }
 
-        if (!Schema.Table(nameof(BackInStockSubscription)).Index("IX_BackInStockSubscription_CustomerId").Exists())
+        if (!Schema.TableFor<BackInStockSubscription>().Index("IX_BackInStockSubscription_CustomerId").Exists())
+        {
             IfDatabase(databaseType).Create.Index("IX_BackInStockSubscription_CustomerId")
                 .OnTable(nameof(BackInStockSubscription))
                 .OnColumn(nameof(BackInStockSubscription.CustomerId)).Ascending()
                 .WithOptions().NonClustered();
+        }
 
-        if (!Schema.Table(nameof(ReturnRequest)).Index("IX_ReturnRequest_CustomerId").Exists())
+        if (!Schema.TableFor<ReturnRequest>().Index("IX_ReturnRequest_CustomerId").Exists())
+        {
             IfDatabase(databaseType).Create.Index("IX_ReturnRequest_CustomerId").OnTable(nameof(ReturnRequest))
                 .OnColumn(nameof(ReturnRequest.CustomerId)).Ascending()
                 .WithOptions().NonClustered();
+        }
 
-        if (!Schema.Table(nameof(RewardPointsHistory)).Index("IX_RewardPointsHistory_CustomerId").Exists())
+        if (!Schema.TableFor<RewardPointsHistory>().Index("IX_RewardPointsHistory_CustomerId").Exists())
+        {
             IfDatabase(databaseType).Create.Index("IX_RewardPointsHistory_CustomerId")
                 .OnTable(nameof(RewardPointsHistory))
                 .OnColumn(nameof(RewardPointsHistory.CustomerId)).Ascending()
                 .WithOptions().NonClustered();
+        }
 
-        if (!Schema.Table(nameof(NewsComment)).Index("IX_NewsComment_CustomerId").Exists())
+        if (!Schema.TableFor<NewsComment>().Index("IX_NewsComment_CustomerId").Exists())
+        {
             IfDatabase(databaseType).Create.Index("IX_NewsComment_CustomerId").OnTable(nameof(NewsComment))
                 .OnColumn(nameof(NewsComment.CustomerId)).Ascending()
                 .WithOptions().NonClustered();
+        }
 
-        if (!Schema.Table(NameCompatibilityManager.GetTableName(typeof(CustomerAddressMapping)))
+        if (!Schema.TableFor<CustomerAddressMapping>()
                 .Index("IX_CustomerAddressMapping_CustomerId").Exists())
+        {
             IfDatabase(databaseType).Create.Index("IX_CustomerAddressMapping_CustomerId")
                 .OnTable(NameCompatibilityManager.GetTableName(typeof(CustomerAddressMapping)))
                 .OnColumn(NameCompatibilityManager.GetColumnName(typeof(CustomerAddressMapping),
                     nameof(CustomerAddressMapping.CustomerId))).Ascending()
                 .WithOptions().NonClustered();
+        }
 
-        if (!Schema.Table(nameof(ShoppingCartItem)).Index("IX_ShoppingCartItem_CustomerId").Exists())
+        if (!Schema.TableFor<ShoppingCartItem>().Index("IX_ShoppingCartItem_CustomerId").Exists())
+        {
             IfDatabase(databaseType).Create.Index("IX_ShoppingCartItem_CustomerId")
                 .OnTable(nameof(ShoppingCartItem))
                 .OnColumn(nameof(ShoppingCartItem.CustomerId)).Ascending()
                 .WithOptions().NonClustered();
+        }
 
-        if (!Schema.Table(nameof(ProductReview)).Index("IX_ProductReview_CustomerId").Exists())
+        if (!Schema.TableFor<ProductReview>().Index("IX_ProductReview_CustomerId").Exists())
+        {
             IfDatabase(databaseType).Create.Index("IX_ProductReview_CustomerId").OnTable(nameof(ProductReview))
                 .OnColumn(nameof(ProductReview.CustomerId)).Ascending()
                 .WithOptions().NonClustered();
+        }
 
-        if (!Schema.Table(nameof(Product)).Index("IX_Product_Name").Exists())
+        if (!Schema.TableFor<Product>().Index("IX_Product_Name").Exists())
+        {
             Create.Index("IX_Product_Name")
                 .OnTable(nameof(Product))
                 .OnColumn(nameof(Product.Name)).Ascending()
                 .WithOptions().NonClustered();
+        }
 
-        if (!Schema.Table(NameCompatibilityManager.GetTableName(typeof(ForumTopic))).Index("IX_Forums_Topic_Subject").Exists())
+        if (!Schema.TableFor<ForumTopic>().Index("IX_Forums_Topic_Subject").Exists())
+        {
             Create.Index("IX_Forums_Topic_Subject")
                 .OnTable(NameCompatibilityManager.GetTableName(typeof(ForumTopic)))
                 .OnColumn(nameof(ForumTopic.Subject)).Ascending()
                 .WithOptions().NonClustered();
-
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Libraries/Nop.Data/Migrations/UpgradeTo470/DataMigration.cs b/src/Libraries/Nop.Data/Migrations/UpgradeTo470/DataMigration.cs
index a560984f850..d17fcc0441a 100644
--- a/src/Libraries/Nop.Data/Migrations/UpgradeTo470/DataMigration.cs
+++ b/src/Libraries/Nop.Data/Migrations/UpgradeTo470/DataMigration.cs
@@ -6,7 +6,7 @@
 using Nop.Core.Domain.Media;
 using Nop.Core.Domain.Messages;
 using Nop.Core.Domain.Security;
-using Nop.Data.Mapping;
+using Nop.Data.Extensions;
 
 namespace Nop.Data.Migrations.UpgradeTo470;
 
@@ -146,12 +146,11 @@ join p in _dataProvider.GetTable<Picture>() on c.PictureId equals p.Id
         }
 
         //#6890
-        var productTableName = NameCompatibilityManager.GetTableName(typeof(Product));
 
         //remove column
         var isTelecommunicationsOrBroadcastingOrElectronicServicesColumnName = "IsTelecommunicationsOrBroadcastingOrElectronicServices";
-        if (Schema.Table(productTableName).Column(isTelecommunicationsOrBroadcastingOrElectronicServicesColumnName).Exists())
-            Delete.Column(isTelecommunicationsOrBroadcastingOrElectronicServicesColumnName).FromTable(productTableName);
+        if (Schema.ColumnExist<Product>(isTelecommunicationsOrBroadcastingOrElectronicServicesColumnName))
+            Delete.Column<Product>(isTelecommunicationsOrBroadcastingOrElectronicServicesColumnName);
 
         //New message template
         if (!_dataProvider.GetTable<MessageTemplate>().Any(st => string.Compare(st.Name, MessageTemplateSystemNames.DELETE_CUSTOMER_REQUEST_STORE_OWNER_NOTIFICATION, StringComparison.InvariantCultureIgnoreCase) == 0))
@@ -168,10 +167,9 @@ join p in _dataProvider.GetTable<Picture>() on c.PictureId equals p.Id
         }
 
         //#7031
-        var emailAccountTableName = nameof(EmailAccount);
         var credentialsColumnName = "UseDefaultCredentials";
 
-        if (Schema.Table(emailAccountTableName).Column(credentialsColumnName).Exists())
+        if (Schema.ColumnExist<EmailAccount>(credentialsColumnName))
         {
             var emailAccounts = _dataProvider.GetTable<EmailAccount>().ToList();
             foreach (var item in emailAccounts)
@@ -183,13 +181,11 @@ join p in _dataProvider.GetTable<Picture>() on c.PictureId equals p.Id
             _dataProvider.UpdateEntities(emailAccounts);
 
             //remove column
-            Delete.Column(credentialsColumnName).FromTable(emailAccountTableName);
+            Delete.Column<EmailAccount>(credentialsColumnName);
         }
 
         //#6978
-        var newsLetterSubscriptionTableName = nameof(NewsLetterSubscription);
-        var languageIdColumnName = nameof(NewsLetterSubscription.LanguageId);
-        if (Schema.Table(newsLetterSubscriptionTableName).Column(languageIdColumnName).Exists())
+        if (Schema.ColumnExist<NewsLetterSubscription>(t => t.LanguageId))
         {
             var defaultLanguageId = _dataProvider.GetTable<Language>().FirstOrDefault()?.Id ?? 0;
 
diff --git a/src/Libraries/Nop.Data/Migrations/UpgradeTo470/SchemaMigration.cs b/src/Libraries/Nop.Data/Migrations/UpgradeTo470/SchemaMigration.cs
index 4f67f55562d..e41238cff13 100644
--- a/src/Libraries/Nop.Data/Migrations/UpgradeTo470/SchemaMigration.cs
+++ b/src/Libraries/Nop.Data/Migrations/UpgradeTo470/SchemaMigration.cs
@@ -6,7 +6,6 @@
 using Nop.Core.Domain.Messages;
 using Nop.Core.Domain.Orders;
 using Nop.Data.Extensions;
-using Nop.Data.Mapping;
 
 namespace Nop.Data.Migrations.UpgradeTo470;
 
@@ -19,88 +18,121 @@ public class SchemaMigration : ForwardOnlyMigration
     public override void Up()
     {
         //#6167
-        var messageTemplateTableName = nameof(MessageTemplate);
-        var allowDirectReplyColumnName = nameof(MessageTemplate.AllowDirectReply);
 
         //add column
-        if (!Schema.Table(messageTemplateTableName).Column(allowDirectReplyColumnName).Exists())
-            Alter.Table(messageTemplateTableName)
-                .AddColumn(allowDirectReplyColumnName).AsBoolean().NotNullable().SetExistingRowsTo(false);
+        if (!Schema.ColumnExist<MessageTemplate>(t => t.AllowDirectReply))
+        {
+            Alter.AlterColumnFor<MessageTemplate>(t => t.AllowDirectReply)
+                .AsBoolean()
+                .NotNullable()
+                .SetExistingRowsTo(false);
+        }
 
         //1934
-        if (!Schema.Table(nameof(ProductAttributeCombinationPicture)).Exists())
+        if (!Schema.TableExist<ProductAttributeCombinationPicture>())
             Create.TableFor<ProductAttributeCombinationPicture>();
 
-        if (!Schema.Table(nameof(ProductAttributeValuePicture)).Exists())
+        if (!Schema.TableExist<ProductAttributeValuePicture>())
             Create.TableFor<ProductAttributeValuePicture>();
 
-        var productTableName = nameof(Product);
-        var displayAttributeCombinationImagesOnlyColumnName = nameof(Product.DisplayAttributeCombinationImagesOnly);
-
-        if (!Schema.Table(productTableName).Column(displayAttributeCombinationImagesOnlyColumnName).Exists())
-            Alter.Table(productTableName)
-                .AddColumn(displayAttributeCombinationImagesOnlyColumnName).AsBoolean().NotNullable().SetExistingRowsTo(false);
+        if (!Schema.ColumnExist<Product>(t => t.DisplayAttributeCombinationImagesOnly))
+        {
+            Alter.AddColumnFor<Product>(t => t.DisplayAttributeCombinationImagesOnly)
+                .AsBoolean()
+                .NotNullable()
+                .SetExistingRowsTo(false);
+        }
 
         //#6710
-        var productAttributeCombinationTableName = nameof(ProductAttributeCombination);
-        var pac = Schema.Table(productAttributeCombinationTableName);
-        var columnName = "PictureId";
         var description = "The field is not used since 4.70 and is left only for the update process use the ProductAttributeCombinationPicture instead";
 
-        if (pac.Column(columnName).Exists())
-            Alter.Table(productAttributeCombinationTableName)
-                .AlterColumn(columnName).AsInt32().Nullable().WithColumnDescription(description);
+        if (Schema.ColumnExist<ProductAttributeCombination>(t => t.PictureId))
+        {
+            Alter.AlterColumnFor<ProductAttributeCombination>(t => t.PictureId)
+                .AsInt32()
+                .Nullable()
+                .WithColumnDescription(description);
+        }
         else
-            Alter.Table(productAttributeCombinationTableName)
-                .AddColumn(columnName).AsInt32().Nullable().SetExistingRowsTo(null).WithColumnDescription(description);
-
-        var productAttributeValueTableName = nameof(ProductAttributeValue);
-        var pav = Schema.Table(productAttributeValueTableName);
-
-        if (pav.Column(columnName).Exists())
-            Alter.Table(productAttributeValueTableName)
-                .AlterColumn(columnName).AsInt32().Nullable().WithColumnDescription(description);
+        {
+            Alter.AddColumnFor<ProductAttributeCombination>(t => t.PictureId)
+                .AsInt32()
+                .Nullable()
+                .SetExistingRowsTo(null)
+                .WithColumnDescription(description);
+        }
+
+        if (Schema.ColumnExist<ProductAttributeValue>(t => t.PictureId))
+        {
+            Alter.AlterColumnFor<ProductAttributeValue>(t => t.PictureId)
+                .AsInt32()
+                .Nullable()
+                .WithColumnDescription(description);
+        }
         else
-            Alter.Table(productAttributeValueTableName)
-                .AddColumn(columnName).AsInt32().Nullable().SetExistingRowsTo(null).WithColumnDescription(description);
+        {
+            Alter.AddColumnFor<ProductAttributeValue>(t => t.PictureId)
+                .AsInt32()
+                .Nullable()
+                .SetExistingRowsTo(null)
+                .WithColumnDescription(description);
+        }
 
         // 6771
-        Alter.Table(nameof(Customer)).AlterColumn(nameof(Customer.LastIpAddress)).AsString(100).Nullable();
-        Alter.Table(NameCompatibilityManager.GetTableName(typeof(ForumPost))).AlterColumn(nameof(ForumPost.IPAddress)).AsString(100).Nullable();
-        Alter.Table(nameof(ActivityLog)).AlterColumn(nameof(ActivityLog.IpAddress)).AsString(100).Nullable();
-        Alter.Table(nameof(Log)).AlterColumn(nameof(Log.IpAddress)).AsString(100).Nullable();
-        Alter.Table(nameof(Order)).AlterColumn(nameof(Order.CustomerIp)).AsString(100).Nullable();
+        Alter.AlterColumnFor<Customer>(t => t.LastIpAddress).AsString(100).Nullable();
+        Alter.AlterColumnFor<ForumPost>(t => t.IPAddress).AsString(100).Nullable();
+        Alter.AlterColumnFor<ActivityLog>(t => t.IpAddress).AsString(100).Nullable();
+        Alter.AlterColumnFor<Log>(t => t.IpAddress).AsString(100).Nullable();
+        Alter.AlterColumnFor<Order>(t => t.CustomerIp).AsString(100).Nullable();
 
         //#6958
         //add column
-        var emailAccountTableName = nameof(EmailAccount);
-        var maxNumberOfEmailsColumnName = nameof(EmailAccount.MaxNumberOfEmails);
 
-        if (!Schema.Table(emailAccountTableName).Column(maxNumberOfEmailsColumnName).Exists())
-            Alter.Table(emailAccountTableName)
-                .AddColumn(maxNumberOfEmailsColumnName).AsInt32().NotNullable().SetExistingRowsTo(50);
+        if (!Schema.ColumnExist<EmailAccount>(t => t.MaxNumberOfEmails))
+        {
+            Alter.AddColumnFor<EmailAccount>(t => t.MaxNumberOfEmails)
+                .AsInt32()
+                .NotNullable()
+                .SetExistingRowsTo(50);
+        }
 
         //#7031
-        if (!Schema.Table(emailAccountTableName).Column(nameof(EmailAccount.EmailAuthenticationMethodId)).Exists())
-            Alter.Table(emailAccountTableName)
-                .AddColumn(nameof(EmailAccount.EmailAuthenticationMethodId)).AsInt32().NotNullable().SetExistingRowsTo(0);
-
-        if (!Schema.Table(emailAccountTableName).Column(nameof(EmailAccount.ClientId)).Exists())
-            Alter.Table(emailAccountTableName)
-                .AddColumn(nameof(EmailAccount.ClientId)).AsString().Nullable();
-
-        if (!Schema.Table(emailAccountTableName).Column(nameof(EmailAccount.ClientSecret)).Exists())
-            Alter.Table(emailAccountTableName)
-                .AddColumn(nameof(EmailAccount.ClientSecret)).AsString().Nullable();
-
-        if (!Schema.Table(emailAccountTableName).Column(nameof(EmailAccount.TenantId)).Exists())
-            Alter.Table(emailAccountTableName)
-                .AddColumn(nameof(EmailAccount.TenantId)).AsString().Nullable();
+        if (!Schema.ColumnExist<EmailAccount>(t => t.EmailAuthenticationMethodId))
+        {
+            Alter.AddColumnFor<EmailAccount>(t => t.EmailAuthenticationMethodId)
+                .AsInt32()
+                .NotNullable()
+                .SetExistingRowsTo(0);
+        }
+
+        if (!Schema.ColumnExist<EmailAccount>(t => t.ClientId))
+        {
+            Alter.AddColumnFor<EmailAccount>(t => t.ClientId)
+                .AsString()
+                .Nullable();
+        }
+
+        if (!Schema.ColumnExist<EmailAccount>(t => t.ClientSecret))
+        {
+            Alter.AddColumnFor<EmailAccount>(t => t.ClientSecret)
+                .AsString()
+                .Nullable();
+        }
+
+        if (!Schema.ColumnExist<EmailAccount>(t => t.TenantId))
+        {
+            Alter.AddColumnFor<EmailAccount>(t => t.TenantId)
+                .AsString()
+                .Nullable();
+        }
 
         //#6978
-        var newsLetterSubscriptionTableName = nameof(NewsLetterSubscription);
-        if (!Schema.Table(newsLetterSubscriptionTableName).Column(nameof(NewsLetterSubscription.LanguageId)).Exists())
-            Alter.Table(newsLetterSubscriptionTableName)
-                .AddColumn(nameof(NewsLetterSubscription.LanguageId)).AsInt32().NotNullable().SetExistingRowsTo(1);
+        if (!Schema.ColumnExist<NewsLetterSubscription>(t => t.LanguageId))
+        {
+            Alter.AddColumnFor<NewsLetterSubscription>(t => t.LanguageId)
+                .AsInt32()
+                .NotNullable()
+                .SetExistingRowsTo(1);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Libraries/Nop.Data/Migrations/UpgradeTo480/AddIndexesMigration.cs b/src/Libraries/Nop.Data/Migrations/UpgradeTo480/AddIndexesMigration.cs
index 9814dc5bcad..5b2bae825a5 100644
--- a/src/Libraries/Nop.Data/Migrations/UpgradeTo480/AddIndexesMigration.cs
+++ b/src/Libraries/Nop.Data/Migrations/UpgradeTo480/AddIndexesMigration.cs
@@ -2,6 +2,7 @@
 using Nop.Core.Domain.Customers;
 using Nop.Core.Domain.Orders;
 using Nop.Core.Domain.Topics;
+using Nop.Data.Extensions;
 
 namespace Nop.Data.Migrations.UpgradeTo480;
 
@@ -20,15 +21,17 @@ public AddIndexesMigration(INopDataProvider dataProvider)
     /// </summary>
     public override void Up()
     {
-        if (!Schema.Table(nameof(Customer)).Index("IX_Customer_Deleted").Exists())
+        if (!Schema.TableFor<Customer>().Index("IX_Customer_Deleted").Exists())
+        {
             Create.Index("IX_Customer_Deleted")
                 .OnTable(nameof(Customer))
                 .OnColumn(nameof(Customer.Deleted)).Ascending()
                 .WithOptions().NonClustered();
+        }
 
         //#7377
-        if (!Schema.Table(nameof(Order)).Index("AK_Order_OrderGuid").Exists() &&
-            !Schema.Table(nameof(Order)).Constraint("AK_Order_OrderGuid").Exists())
+        if (!Schema.TableFor<Order>().Index("AK_Order_OrderGuid").Exists() &&
+            !Schema.TableFor<Order>().Constraint("AK_Order_OrderGuid").Exists())
         {
             var orders = _dataProvider.GetTable<Order>().GroupBy(p => p.OrderGuid, p => p)
                 .Where(p => p.Count() > 1)
@@ -49,7 +52,7 @@ public override void Up()
         }
 
         //#7296
-        if (!Schema.Table(nameof(Topic)).Index("IX_Topic_SystemName").Exists())
+        if (!Schema.TableFor<Topic>().Index("IX_Topic_SystemName").Exists())
             Create.Index("IX_Topic_SystemName")
                 .OnTable(nameof(Topic))
                 .OnColumn(nameof(Topic.SystemName)).Ascending()
diff --git a/src/Libraries/Nop.Data/Migrations/UpgradeTo480/SchemaMigration.cs b/src/Libraries/Nop.Data/Migrations/UpgradeTo480/SchemaMigration.cs
index 2d773d0ff97..307fbd4c2b9 100644
--- a/src/Libraries/Nop.Data/Migrations/UpgradeTo480/SchemaMigration.cs
+++ b/src/Libraries/Nop.Data/Migrations/UpgradeTo480/SchemaMigration.cs
@@ -18,68 +18,60 @@ public class SchemaMigration : ForwardOnlyMigration
     public override void Up()
     {
         //#7187
-        var ptoductTableName = nameof(Product);
         var hasTierPricesColumnName = "HasTierPrices";
-        if (Schema.Table(ptoductTableName).Column(hasTierPricesColumnName).Exists())
-            Delete.Column(hasTierPricesColumnName).FromTable(ptoductTableName);
+        if (Schema.ColumnExist<Product>(hasTierPricesColumnName))
+            Delete.Column<Product>(hasTierPricesColumnName);
 
         //#7188
         var hasDiscountsAppliedColumnName = "HasDiscountsApplied";
-        if (Schema.Table(ptoductTableName).Column(hasDiscountsAppliedColumnName).Exists())
-            Delete.Column(hasDiscountsAppliedColumnName).FromTable(ptoductTableName);
+        if (Schema.ColumnExist<Product>(hasDiscountsAppliedColumnName))
+            Delete.Column<Product>(hasDiscountsAppliedColumnName);
 
         //#7242
-        var categoryTableName = nameof(Category);
-        var restrictFromVendorsColumnName = nameof(Category.RestrictFromVendors);
 
-        if (!Schema.Table(categoryTableName).Column(restrictFromVendorsColumnName).Exists())
+        if (!Schema.ColumnExist<Category>(t => t.RestrictFromVendors))
         {
-            Alter.Table(categoryTableName)
-                .AddColumn(restrictFromVendorsColumnName)
+            Alter.AddColumnFor<Category>(t => t.RestrictFromVendors)
                 .AsBoolean()
                 .NotNullable()
                 .WithDefaultValue(false);
         }
 
         //#7281
-        var customerTableName = nameof(Customer);
-        var mustChangePasswordColumnName = nameof(Customer.MustChangePassword);
 
-        if (!Schema.Table(customerTableName).Column(mustChangePasswordColumnName).Exists())
+        if (!Schema.ColumnExist<Customer>(t => t.MustChangePassword))
         {
-            Alter.Table(customerTableName)
-                .AddColumn(mustChangePasswordColumnName)
+            Alter.AddColumnFor<Customer>(t => t.MustChangePassword)
                 .AsBoolean()
                 .NotNullable()
                 .WithDefaultValue(false);
         }
 
         //#7294
-        var topicTableName = nameof(Topic);
-        var topicSystemNameColumnName = nameof(Topic.SystemName);
 
-        if (!Schema.Table(topicTableName).Index("IX_Topic_SystemName").Exists())
+        if (!Schema.TableFor<Topic>().Index("IX_Topic_SystemName").Exists())
         {
-            Alter.Table(topicTableName)
-                .AlterColumn(topicSystemNameColumnName)
+            Alter.AlterColumnFor<Topic>(t => t.SystemName)
                 .AsString(400)
                 .Nullable();
         }
 
         //#7241
-        var discountTableName = nameof(Discount);
-        var vendorIdDiscountColumnName = nameof(Discount.VendorId);
 
-        if (!Schema.Table(discountTableName).Column(vendorIdDiscountColumnName).Exists())
+        if (!Schema.ColumnExist<Discount>(t => t.VendorId))
         {
-            Alter.Table(discountTableName)
-                .AddColumn(vendorIdDiscountColumnName).AsInt32().ForeignKey<Vendor>(onDelete: Rule.SetNull).Nullable();
+            Alter.AddColumnFor<Discount>(t => t.VendorId)
+                .AsInt32()
+                .ForeignKey<Vendor>(onDelete: Rule.SetNull)
+                .Nullable();
         }
 
         //#7243
-        var vendorTableName = nameof(Vendor);
-        var pmCustomerIdColumnName = nameof(Vendor.PmCustomerId);
-        if (!Schema.Table(vendorTableName).Column(pmCustomerIdColumnName).Exists())
-            Alter.Table(vendorTableName).AddColumn(pmCustomerIdColumnName).AsInt32().Nullable();
+        if (!Schema.ColumnExist<Vendor>(t => t.PmCustomerId))
+        {
+            Alter.AddColumnFor<Vendor>(t => t.PmCustomerId)
+                .AsInt32()
+                .Nullable();
+        }
     }
 }
diff --git a/src/Libraries/Nop.Data/Migrations/UpgradeTo490/AddIndexesMigration.cs b/src/Libraries/Nop.Data/Migrations/UpgradeTo490/AddIndexesMigration.cs
index 6c8ac36e41c..8249d427a67 100644
--- a/src/Libraries/Nop.Data/Migrations/UpgradeTo490/AddIndexesMigration.cs
+++ b/src/Libraries/Nop.Data/Migrations/UpgradeTo490/AddIndexesMigration.cs
@@ -2,6 +2,7 @@
 using FluentMigrator.SqlServer;
 using Nop.Core.Domain.Catalog;
 using Nop.Core.Domain.Topics;
+using Nop.Data.Extensions;
 using Nop.Data.Mapping;
 
 namespace Nop.Data.Migrations.UpgradeTo490;
@@ -15,28 +16,31 @@ public class AddIndexesMigration : ForwardOnlyMigration
     public override void Up()
     {
         //#7296
-        var topicTableName = nameof(Topic);
-        var topicEndDateColumnName = nameof(Topic.AvailableEndDateTimeUtc);
-        var topicStartDateColumnName = nameof(Topic.AvailableStartDateTimeUtc);
+        var topicTableName = NameCompatibilityManager.GetTableName(typeof(Topic));
+        var topicEndDateColumnName = NameCompatibilityManager.GetColumnName(typeof(Topic), nameof(Topic.AvailableEndDateTimeUtc));
+        var topicStartDateColumnName = NameCompatibilityManager.GetColumnName(typeof(Topic), nameof(Topic.AvailableStartDateTimeUtc));
+        ;
         var topicAvailableDatesIndexName = "IX_Topic_Availability";
-        if (!Schema.Table(topicTableName).Index(topicAvailableDatesIndexName).Exists())
+        if (!Schema.TableFor<Topic>().Index(topicAvailableDatesIndexName).Exists())
+        {
             Create.Index(topicAvailableDatesIndexName)
                 .OnTable(topicTableName)
                 .OnColumn(topicEndDateColumnName).Descending()
                 .OnColumn(topicStartDateColumnName).Descending()
                 .WithOptions().NonClustered();
+        }
 
         //#7676
         const string databaseType = "sqlserver";
 
-        var productTableName = nameof(Product);
-        var nameColumnName = nameof(Product.Name);
-        var skuColumnName = nameof(Product.Sku);
-        var manufacturerPartNumberColumnName = nameof(Product.ManufacturerPartNumber);
-        var idColumnName = nameof(Product.Id);
-        var deletedColumnName = nameof(Product.Deleted);
+        var productTableName = NameCompatibilityManager.GetTableName(typeof(Product));
+        var nameColumnName = NameCompatibilityManager.GetColumnName(typeof(Product), nameof(Product.Name));
+        var skuColumnName = NameCompatibilityManager.GetColumnName(typeof(Product), nameof(Product.Sku));
+        var manufacturerPartNumberColumnName = NameCompatibilityManager.GetColumnName(typeof(Product), nameof(Product.ManufacturerPartNumber));
+        var idColumnName = NameCompatibilityManager.GetColumnName(typeof(Product), nameof(Product.Id));
+        var deletedColumnName = NameCompatibilityManager.GetColumnName(typeof(Product), nameof(Product.Deleted));
         var productSearchIndexName = "IX_Product_Search";
-        if (!Schema.Table(productTableName).Index(productSearchIndexName).Exists())
+        if (!Schema.TableFor<Product>().Index(productSearchIndexName).Exists())
             IfDatabase(databaseType).Create.Index(productSearchIndexName)
                 .OnTable(productTableName)
                 .OnColumn(nameColumnName).Ascending()
@@ -46,63 +50,73 @@ public override void Up()
                 .WithOptions().NonClustered()
                 .Include(idColumnName);
 
-        var productAttributeCombinationTableName = nameof(ProductAttributeCombination);
-        skuColumnName = nameof(ProductAttributeCombination.Sku);
-        var productIdColumnName = nameof(ProductAttributeCombination.ProductId);
+        var productAttributeCombinationTableName = NameCompatibilityManager.GetTableName(typeof(ProductAttributeCombination));
+        skuColumnName = NameCompatibilityManager.GetColumnName(typeof(ProductAttributeCombination), nameof(ProductAttributeCombination.Sku));
+        var productIdColumnName = NameCompatibilityManager.GetColumnName(typeof(ProductAttributeCombination), nameof(ProductAttributeCombination.ProductId));
         var productAttributeCombinationSkuIndexName = "IX_ProductAttributeCombination_Sku";
-        if (!Schema.Table(productAttributeCombinationTableName).Index(productAttributeCombinationSkuIndexName).Exists())
+        if (!Schema.TableFor<ProductAttributeCombination>().Index(productAttributeCombinationSkuIndexName).Exists())
+        {
             Create.Index(productAttributeCombinationSkuIndexName)
                 .OnTable(productAttributeCombinationTableName)
                 .OnColumn(skuColumnName).Ascending()
                 .WithOptions().NonClustered()
                 .Include(productIdColumnName);
+        }
 
-        var categoryTableName = nameof(Category);
-        nameColumnName = nameof(Category.Name);
-        deletedColumnName = nameof(Category.Deleted);
-        idColumnName = nameof(Category.Id);
+        var categoryTableName = NameCompatibilityManager.GetTableName(typeof(Category));
+        nameColumnName = NameCompatibilityManager.GetColumnName(typeof(Category), nameof(Category.Name));
+        deletedColumnName = NameCompatibilityManager.GetColumnName(typeof(Category), nameof(Category.Deleted));
+        idColumnName = NameCompatibilityManager.GetColumnName(typeof(Category), nameof(Category.Id));
         var categoryNameDeletedIndexName = "IX_Category_Name_Deleted";
-        if (!Schema.Table(categoryTableName).Index(categoryNameDeletedIndexName).Exists())
+        if (!Schema.TableFor<Category>().Index(categoryNameDeletedIndexName).Exists())
+        {
             Create.Index(categoryNameDeletedIndexName)
                 .OnTable(categoryTableName)
                 .OnColumn(nameColumnName).Ascending()
                 .OnColumn(deletedColumnName).Ascending()
                 .WithOptions().NonClustered()
                 .Include(idColumnName);
+        }
 
-        var manufacturerTableName = nameof(Manufacturer);
-        nameColumnName = nameof(Manufacturer.Name);
-        deletedColumnName = nameof(Manufacturer.Deleted);
-        idColumnName = nameof(Manufacturer.Id);
+        var manufacturerTableName = NameCompatibilityManager.GetTableName(typeof(Manufacturer));
+        nameColumnName = NameCompatibilityManager.GetColumnName(typeof(Manufacturer), nameof(Manufacturer.Name));
+        deletedColumnName = NameCompatibilityManager.GetColumnName(typeof(Manufacturer), nameof(Manufacturer.Deleted));
+        idColumnName = NameCompatibilityManager.GetColumnName(typeof(Manufacturer), nameof(Manufacturer.Id));
         var manufacturerNameDeletedIndexName = "IX_Manufacturer_Name_Deleted";
-        if (!Schema.Table(manufacturerTableName).Index(manufacturerNameDeletedIndexName).Exists())
+        if (!Schema.TableFor<Manufacturer>().Index(manufacturerNameDeletedIndexName).Exists())
+        {
             Create.Index(manufacturerNameDeletedIndexName)
                 .OnTable(manufacturerTableName)
                 .OnColumn(nameColumnName).Ascending()
                 .OnColumn(deletedColumnName).Ascending()
                 .WithOptions().NonClustered()
                 .Include(idColumnName);
+        }
 
         var productCategoryTableName = NameCompatibilityManager.GetTableName(typeof(ProductCategory));
-        var categoryIdColumnName = nameof(ProductCategory.CategoryId);
-        productIdColumnName = nameof(ProductCategory.ProductId);
+        var categoryIdColumnName = NameCompatibilityManager.GetColumnName(typeof(ProductCategory), nameof(ProductCategory.CategoryId));
+        productIdColumnName = NameCompatibilityManager.GetColumnName(typeof(ProductCategory), nameof(ProductCategory.ProductId));
         var productCategoryMappingIndexName = "IX_ProductCategoryMapping_CategoryId";
-        if (!Schema.Table(productCategoryTableName).Index(productCategoryMappingIndexName).Exists())
+        if (!Schema.TableFor<ProductCategory>().Index(productCategoryMappingIndexName).Exists())
+        {
             Create.Index(productCategoryMappingIndexName)
                 .OnTable(productCategoryTableName)
                 .OnColumn(categoryIdColumnName).Ascending()
                 .WithOptions().NonClustered()
                 .Include(productIdColumnName);
+        }
 
         var productManufacturerTableName = NameCompatibilityManager.GetTableName(typeof(ProductManufacturer));
-        var manufacturerIdColumnName = nameof(ProductManufacturer.ManufacturerId);
-        productIdColumnName = nameof(ProductManufacturer.ProductId);
+        var manufacturerIdColumnName = NameCompatibilityManager.GetColumnName(typeof(ProductManufacturer), nameof(ProductManufacturer.ManufacturerId));
+        productIdColumnName = NameCompatibilityManager.GetColumnName(typeof(ProductManufacturer), nameof(ProductManufacturer.ProductId));
         var productManufacturerMappingIndexName = "IX_ProductManufacturerMapping_ManufacturerId";
-        if (!Schema.Table(productManufacturerTableName).Index(productManufacturerMappingIndexName).Exists())
+        if (!Schema.TableFor<ProductManufacturer>().Index(productManufacturerMappingIndexName).Exists())
+        {
             Create.Index(productManufacturerMappingIndexName)
                 .OnTable(productManufacturerTableName)
                 .OnColumn(manufacturerIdColumnName).Ascending()
                 .WithOptions().NonClustered()
                 .Include(productIdColumnName);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Libraries/Nop.Data/Migrations/UpgradeTo490/DataMigration.cs b/src/Libraries/Nop.Data/Migrations/UpgradeTo490/DataMigration.cs
index 143ebd69171..8604b6b640f 100644
--- a/src/Libraries/Nop.Data/Migrations/UpgradeTo490/DataMigration.cs
+++ b/src/Libraries/Nop.Data/Migrations/UpgradeTo490/DataMigration.cs
@@ -2,6 +2,7 @@
 using LinqToDB;
 using Nop.Core.Domain.Logging;
 using Nop.Core.Domain.Messages;
+using Nop.Data.Extensions;
 
 namespace Nop.Data.Migrations.UpgradeTo490;
 
@@ -68,9 +69,8 @@ public override void Up()
         }
 
         //alter columns
-        Alter.Table(nameof(NewsLetterSubscription))
-            .AlterColumn(nameof(NewsLetterSubscription.TypeId)).AsInt32().NotNullable();
-        
+        Alter.AddColumnFor<NewsLetterSubscription>(t => t.TypeId).AsInt32().NotNullable();
+
         if (!activityLogTypeTable.Any(alt => string.Compare(alt.SystemKeyword, "AddSubscriptionType", StringComparison.InvariantCultureIgnoreCase) == 0))
         {
             _dataProvider.InsertEntity(
@@ -187,7 +187,7 @@ public override void Up()
                 }
             );
         }
-        
+
         if (!activityLogTypeTable.Any(alt => string.Compare(alt.SystemKeyword, "ExportFilterLevelValues", StringComparison.InvariantCultureIgnoreCase) == 0))
         {
             _dataProvider.InsertEntity(
diff --git a/src/Libraries/Nop.Data/Migrations/UpgradeTo490/FilterLevelMigration.cs b/src/Libraries/Nop.Data/Migrations/UpgradeTo490/FilterLevelMigration.cs
index d82cc969cf7..0f8df04209f 100644
--- a/src/Libraries/Nop.Data/Migrations/UpgradeTo490/FilterLevelMigration.cs
+++ b/src/Libraries/Nop.Data/Migrations/UpgradeTo490/FilterLevelMigration.cs
@@ -12,10 +12,10 @@ public class FilterLevelMigration : ForwardOnlyMigration
     /// </summary>
     public override void Up()
     {
-        if (!Schema.Table(nameof(FilterLevelValue)).Exists())
+        if (!Schema.TableExist<FilterLevelValue>())
             Create.TableFor<FilterLevelValue>();
 
-        if (!Schema.Table(nameof(FilterLevelValueProductMapping)).Exists())
+        if (!Schema.TableExist<FilterLevelValueProductMapping>())
             Create.TableFor<FilterLevelValueProductMapping>();
     }
 }
diff --git a/src/Libraries/Nop.Data/Migrations/UpgradeTo490/MultipleWishlistMigration.cs b/src/Libraries/Nop.Data/Migrations/UpgradeTo490/MultipleWishlistMigration.cs
index 9863c350674..592fdd37439 100644
--- a/src/Libraries/Nop.Data/Migrations/UpgradeTo490/MultipleWishlistMigration.cs
+++ b/src/Libraries/Nop.Data/Migrations/UpgradeTo490/MultipleWishlistMigration.cs
@@ -14,12 +14,17 @@ public class MultipleWishlistMigration : ForwardOnlyMigration
     /// </summary>
     public override void Up()
     {
-        if (!Schema.Table(nameof(CustomWishlist)).Exists())
+        if (!Schema.TableExist<CustomWishlist>())
             Create.TableFor<CustomWishlist>();
 
         //add new column
-        if (!Schema.Table(nameof(ShoppingCartItem)).Column(nameof(ShoppingCartItem.CustomWishlistId)).Exists())
-            Alter.Table(nameof(ShoppingCartItem)).AddColumn(nameof(ShoppingCartItem.CustomWishlistId)).AsInt32().Nullable().ForeignKey<CustomWishlist>();
+        if (!Schema.ColumnExist<ShoppingCartItem>(t => t.CustomWishlistId))
+        {
+            Alter.AddColumnFor<ShoppingCartItem>(t => t.CustomWishlistId)
+                .AsInt32()
+                .Nullable()
+                .ForeignKey<CustomWishlist>();
+        }
     }
 
     #endregion
diff --git a/src/Libraries/Nop.Data/Migrations/UpgradeTo490/NewsLetterSubscriptionMigration.cs b/src/Libraries/Nop.Data/Migrations/UpgradeTo490/NewsLetterSubscriptionMigration.cs
index 1b89b1a5780..4e48ddf6fac 100644
--- a/src/Libraries/Nop.Data/Migrations/UpgradeTo490/NewsLetterSubscriptionMigration.cs
+++ b/src/Libraries/Nop.Data/Migrations/UpgradeTo490/NewsLetterSubscriptionMigration.cs
@@ -12,21 +12,25 @@ public class NewsLetterSubscriptionMigration : ForwardOnlyMigration
     /// </summary>
     public override void Up()
     {
-        if (!Schema.Table(nameof(NewsLetterSubscriptionType)).Exists())
+        if (!Schema.TableExist<NewsLetterSubscriptionType>())
             Create.TableFor<NewsLetterSubscriptionType>();
 
-        if (!Schema.Table(nameof(NewsLetterSubscription)).Column(nameof(NewsLetterSubscription.TypeId)).Exists())
+        if (!Schema.ColumnExist<NewsLetterSubscription>(t => t.TypeId))
         {
             //add new column
-            Alter.Table(nameof(NewsLetterSubscription))
-                .AddColumn(nameof(NewsLetterSubscription.TypeId)).AsInt32().ForeignKey<NewsLetterSubscriptionType>().Nullable();
+            Alter.AddColumnFor<NewsLetterSubscription>(t => t.TypeId)
+                .AsInt32()
+                .ForeignKey<NewsLetterSubscriptionType>()
+                .Nullable();
         }
 
-        if (!Schema.Table(nameof(Campaign)).Column(nameof(Campaign.NewsLetterSubscriptionTypeId)).Exists())
+        if (!Schema.ColumnExist<Campaign>(t => t.NewsLetterSubscriptionTypeId))
         {
             //add new column
-            Alter.Table(nameof(Campaign))
-                .AddColumn(nameof(Campaign.NewsLetterSubscriptionTypeId)).AsInt32().NotNullable().SetExistingRowsTo(0);
+            Alter.AddColumnFor<Campaign>(t => t.NewsLetterSubscriptionTypeId)
+                .AsInt32()
+                .NotNullable()
+                .SetExistingRowsTo(0);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Libraries/Nop.Data/Migrations/UpgradeTo490/SchemaMigration.cs b/src/Libraries/Nop.Data/Migrations/UpgradeTo490/SchemaMigration.cs
index 3e12547f59e..4e9af08a18d 100644
--- a/src/Libraries/Nop.Data/Migrations/UpgradeTo490/SchemaMigration.cs
+++ b/src/Libraries/Nop.Data/Migrations/UpgradeTo490/SchemaMigration.cs
@@ -15,89 +15,86 @@ public class SchemaMigration : ForwardOnlyMigration
     public override void Up()
     {
         //#7387
-        var productTableName = nameof(Product);
-
-        var ageVerificationColumnName = nameof(Product.AgeVerification);
-        if (!Schema.Table(productTableName).Column(ageVerificationColumnName).Exists())
+        if (!Schema.ColumnExist<Product>(t => t.AgeVerification))
         {
-            Alter.Table(productTableName)
-                .AddColumn(ageVerificationColumnName)
+            Alter.AddColumnFor<Product>(t => t.AgeVerification)
                 .AsBoolean()
                 .NotNullable()
                 .WithDefaultValue(false);
         }
 
-        var minimumAgeToPurchaseColumnName = nameof(Product.MinimumAgeToPurchase);
-        if (!Schema.Table(productTableName).Column(minimumAgeToPurchaseColumnName).Exists())
+        if (!Schema.ColumnExist<Product>(t => t.MinimumAgeToPurchase))
         {
-            Alter.Table(productTableName)
-                .AddColumn(minimumAgeToPurchaseColumnName)
+            Alter.AddColumnFor<Product>(t => t.MinimumAgeToPurchase)
                 .AsInt32()
                 .NotNullable()
                 .WithDefaultValue(0);
         }
 
         //#7294
-        var topicTableName = nameof(Topic);
-        var topicAvailableEndDateColumnName = nameof(Topic.AvailableEndDateTimeUtc);
-        var topicAvailableStartDateColumnName = nameof(Topic.AvailableStartDateTimeUtc);
 
-        if (!Schema.Table(topicTableName).Column(topicAvailableEndDateColumnName).Exists())
+        if (!Schema.ColumnExist<Topic>(t => t.AvailableEndDateTimeUtc))
         {
-            Alter.Table(topicTableName)
-                .AddColumn(topicAvailableEndDateColumnName)
+            Alter.AddColumnFor<Topic>(t => t.AvailableEndDateTimeUtc)
                 .AsDateTime()
                 .Nullable();
         }
 
-        if (!Schema.Table(topicTableName).Column(topicAvailableStartDateColumnName).Exists())
+        if (!Schema.ColumnExist<Topic>(t => t.AvailableStartDateTimeUtc))
         {
-            Alter.Table(topicTableName)
-                .AddColumn(topicAvailableStartDateColumnName)
+            Alter.AddColumnFor<Topic>(t => t.AvailableStartDateTimeUtc)
                 .AsDateTime()
                 .Nullable();
         }
 
         //#873
-        var productTagTableName = nameof(ProductTag);
 
-        if (!Schema.Table(productTagTableName).Column(nameof(ProductTag.MetaDescription)).Exists())
-            Alter.Table(productTagTableName).AddColumn(nameof(ProductTag.MetaDescription)).AsString().Nullable();
+        if (!Schema.ColumnExist<ProductTag>(t => t.MetaDescription))
+        {
+            Alter.AddColumnFor<ProductTag>(t => t.MetaDescription)
+                .AsString()
+                .Nullable();
+        }
 
-        if (!Schema.Table(productTagTableName).Column(nameof(ProductTag.MetaKeywords)).Exists())
-            Alter.Table(productTagTableName).AddColumn(nameof(ProductTag.MetaKeywords)).AsString(400).Nullable();
+        if (!Schema.ColumnExist<ProductTag>(t => t.MetaKeywords))
+        {
+            Alter.AddColumnFor<ProductTag>(t => t.MetaKeywords)
+                .AsString(400)
+                .Nullable();
+        }
 
-        if (!Schema.Table(productTagTableName).Column(nameof(ProductTag.MetaTitle)).Exists())
-            Alter.Table(productTagTableName).AddColumn(nameof(ProductTag.MetaTitle)).AsString(400).Nullable();
+        if (!Schema.ColumnExist<ProductTag>(t => t.MetaTitle))
+        {
+            Alter.AddColumnFor<ProductTag>(t => t.MetaTitle)
+                .AsString(400)
+                .Nullable();
+        }
 
         //#7390
-        if (!Schema.Table(nameof(Menu)).Exists())
+        if (!Schema.TableExist<Menu>())
             Create.TableFor<Menu>();
 
-        if (!Schema.Table(nameof(MenuItem)).Exists())
+        if (!Schema.TableExist<Menu>())
             Create.TableFor<MenuItem>();
 
         var footerColumn1ColumnName = "IncludeInFooterColumn1";
-        if (Schema.Table(topicTableName).Column(footerColumn1ColumnName).Exists())
-            Delete.Column(footerColumn1ColumnName).FromTable(topicTableName);
+        if (Schema.ColumnExist<Topic>(footerColumn1ColumnName))
+            Delete.Column<Topic>(footerColumn1ColumnName);
 
         var footerColumn2ColumnName = "IncludeInFooterColumn2";
-        if (Schema.Table(topicTableName).Column(footerColumn2ColumnName).Exists())
-            Delete.Column(footerColumn2ColumnName).FromTable(topicTableName);
+        if (Schema.ColumnExist<Topic>(footerColumn2ColumnName))
+            Delete.Column<Topic>(footerColumn2ColumnName);
 
         var footerColumn3ColumnName = "IncludeInFooterColumn3";
-        if (Schema.Table(topicTableName).Column(footerColumn3ColumnName).Exists())
-            Delete.Column(footerColumn3ColumnName).FromTable(topicTableName);
+        if (Schema.ColumnExist<Topic>(footerColumn3ColumnName))
+            Delete.Column<Topic>(footerColumn3ColumnName);
 
         var includeTopicInTopMenuColumnName = "IncludeInTopMenu";
-        if (Schema.Table(topicTableName).Column(includeTopicInTopMenuColumnName).Exists())
-            Delete.Column(includeTopicInTopMenuColumnName).FromTable(topicTableName);
+        if (Schema.ColumnExist<Topic>(includeTopicInTopMenuColumnName))
+            Delete.Column(includeTopicInTopMenuColumnName);
 
-        var categoryTableName = nameof(Category);
         var includeCategoryInTopMenuColumnName = "IncludeInTopMenu";
-        if (Schema.Table(categoryTableName).Column(includeCategoryInTopMenuColumnName).Exists())
-            Delete.Column(includeCategoryInTopMenuColumnName).FromTable(categoryTableName);
-
-
+        if (Schema.ColumnExist<Category>(includeCategoryInTopMenuColumnName))
+            Delete.Column<Category>(includeCategoryInTopMenuColumnName);
     }
 }