diff --git a/Libraries/Nop.Core/BaseEntity.cs b/Libraries/Nop.Core/BaseEntity.cs
index c84e093..aa60a11 100644
--- a/Libraries/Nop.Core/BaseEntity.cs
+++ b/Libraries/Nop.Core/BaseEntity.cs
@@ -1,12 +1,12 @@
-namespace Nop.Core;
+//namespace Nop.Core;
 
-/// <summary>
-/// Represents the base class for entities
-/// </summary>
-public abstract partial class BaseEntity
-{
-    /// <summary>
-    /// Gets or sets the entity identifier
-    /// </summary>
-    public int Id { get; set; }
-}
\ No newline at end of file
+///// <summary>
+///// Represents the base class for entities
+///// </summary>
+//public abstract partial class BaseEntity
+//{
+//    /// <summary>
+//    /// Gets or sets the entity identifier
+//    /// </summary>
+//    public int Id { get; set; }
+//}
\ No newline at end of file
diff --git a/Libraries/Nop.Core/Domain/Catalog/Product.cs b/Libraries/Nop.Core/Domain/Catalog/Product.cs
index 8301cfe..9611cef 100644
--- a/Libraries/Nop.Core/Domain/Catalog/Product.cs
+++ b/Libraries/Nop.Core/Domain/Catalog/Product.cs
@@ -277,7 +277,7 @@ public partial class Product : BaseEntity, ILocalizedEntity, ISlugSupported, IAc
     /// <summary>
     /// Gets or sets the tax category identifier
     /// </summary>
-    public int TaxCategoryId { get; set; }        
+    public int TaxCategoryId { get; set; }
 
     /// <summary>
     /// Gets or sets a value indicating how to manage inventory
diff --git a/Libraries/Nop.Core/Domain/Common/GenericAttribute.cs b/Libraries/Nop.Core/Domain/Common/GenericAttribute.cs
index ff0b6cb..befa334 100644
--- a/Libraries/Nop.Core/Domain/Common/GenericAttribute.cs
+++ b/Libraries/Nop.Core/Domain/Common/GenericAttribute.cs
@@ -1,37 +1,37 @@
-namespace Nop.Core.Domain.Common;
+//namespace Nop.Core.Domain.Common;
 
-/// <summary>
-/// Represents a generic attribute
-/// </summary>
-public partial class GenericAttribute : BaseEntity
-{
-    /// <summary>
-    /// Gets or sets the entity identifier
-    /// </summary>
-    public int EntityId { get; set; }
+///// <summary>
+///// Represents a generic attribute
+///// </summary>
+//public partial class GenericAttribute : BaseEntity
+//{
+//    /// <summary>
+//    /// Gets or sets the entity identifier
+//    /// </summary>
+//    public int EntityId { get; set; }
 
-    /// <summary>
-    /// Gets or sets the key group
-    /// </summary>
-    public string KeyGroup { get; set; }
+//    /// <summary>
+//    /// Gets or sets the key group
+//    /// </summary>
+//    public string KeyGroup { get; set; }
 
-    /// <summary>
-    /// Gets or sets the key
-    /// </summary>
-    public string Key { get; set; }
+//    /// <summary>
+//    /// Gets or sets the key
+//    /// </summary>
+//    public string Key { get; set; }
 
-    /// <summary>
-    /// Gets or sets the value
-    /// </summary>
-    public string Value { get; set; }
+//    /// <summary>
+//    /// Gets or sets the value
+//    /// </summary>
+//    public string Value { get; set; }
 
-    /// <summary>
-    /// Gets or sets the store identifier
-    /// </summary>
-    public int StoreId { get; set; }
+//    /// <summary>
+//    /// Gets or sets the store identifier
+//    /// </summary>
+//    public int StoreId { get; set; }
 
-    /// <summary>
-    /// Gets or sets the created or updated date
-    /// </summary>
-    public DateTime? CreatedOrUpdatedDateUTC { get; set; }
-}
\ No newline at end of file
+//    /// <summary>
+//    /// Gets or sets the created or updated date
+//    /// </summary>
+//    public DateTime? CreatedOrUpdatedDateUTC { get; set; }
+//}
\ No newline at end of file
diff --git a/Libraries/Nop.Core/Domain/Common/ISoftDeletedEntity.cs b/Libraries/Nop.Core/Domain/Common/ISoftDeletedEntity.cs
index 2682f56..bbc9d74 100644
--- a/Libraries/Nop.Core/Domain/Common/ISoftDeletedEntity.cs
+++ b/Libraries/Nop.Core/Domain/Common/ISoftDeletedEntity.cs
@@ -3,10 +3,10 @@
 /// <summary>
 /// Represents a soft-deleted (without actually deleting from storage) entity
 /// </summary>
-public partial interface ISoftDeletedEntity
-{
-    /// <summary>
-    /// Gets or sets a value indicating whether the entity has been deleted
-    /// </summary>
-    bool Deleted { get; set; }
-}
\ No newline at end of file
+//public partial interface ISoftDeletedEntity
+//{
+//    /// <summary>
+//    /// Gets or sets a value indicating whether the entity has been deleted
+//    /// </summary>
+//    bool Deleted { get; set; }
+//}
\ No newline at end of file
diff --git a/Libraries/Nop.Core/Domain/Customers/Customer.cs b/Libraries/Nop.Core/Domain/Customers/Customer.cs
index 90cfa3a..fd5be59 100644
--- a/Libraries/Nop.Core/Domain/Customers/Customer.cs
+++ b/Libraries/Nop.Core/Domain/Customers/Customer.cs
@@ -1,267 +1,267 @@
-using Nop.Core.Domain.Common;
-using Nop.Core.Domain.Tax;
+//using Nop.Core.Domain.Common;
+//using Nop.Core.Domain.Tax;
 
-namespace Nop.Core.Domain.Customers;
+//namespace Nop.Core.Domain.Customers;
 
-/// <summary>
-/// Represents a customer
-/// </summary>
-public partial class Customer : BaseEntity, ISoftDeletedEntity
-{
-    public Customer()
-    {
-        CustomerGuid = Guid.NewGuid();
-    }
+///// <summary>
+///// Represents a customer
+///// </summary>
+//public partial class Customer : BaseEntity, ISoftDeletedEntity
+//{
+//    public Customer()
+//    {
+//        CustomerGuid = Guid.NewGuid();
+//    }
 
-    /// <summary>
-    /// Gets or sets the customer GUID
-    /// </summary>
-    public Guid CustomerGuid { get; set; }
+//    /// <summary>
+//    /// Gets or sets the customer GUID
+//    /// </summary>
+//    public Guid CustomerGuid { get; set; }
 
-    /// <summary>
-    /// Gets or sets the username
-    /// </summary>
-    public string Username { get; set; }
+//    /// <summary>
+//    /// Gets or sets the username
+//    /// </summary>
+//    public string Username { get; set; }
 
-    /// <summary>
-    /// Gets or sets the email
-    /// </summary>
-    public string Email { get; set; }
+//    /// <summary>
+//    /// Gets or sets the email
+//    /// </summary>
+//    public string Email { get; set; }
 
-    /// <summary>
-    /// Gets or sets the first name
-    /// </summary>
-    public string FirstName { get; set; }
+//    /// <summary>
+//    /// Gets or sets the first name
+//    /// </summary>
+//    public string FirstName { get; set; }
 
-    /// <summary>
-    /// Gets or sets the last name
-    /// </summary>
-    public string LastName { get; set; }
+//    /// <summary>
+//    /// Gets or sets the last name
+//    /// </summary>
+//    public string LastName { get; set; }
 
-    /// <summary>
-    /// Gets or sets the gender
-    /// </summary>
-    public string Gender { get; set; }
+//    /// <summary>
+//    /// Gets or sets the gender
+//    /// </summary>
+//    public string Gender { get; set; }
 
-    /// <summary>
-    /// Gets or sets the date of birth
-    /// </summary>
-    public DateTime? DateOfBirth { get; set; }
+//    /// <summary>
+//    /// Gets or sets the date of birth
+//    /// </summary>
+//    public DateTime? DateOfBirth { get; set; }
 
-    /// <summary>
-    /// Gets or sets the company
-    /// </summary>
-    public string Company { get; set; }
+//    /// <summary>
+//    /// Gets or sets the company
+//    /// </summary>
+//    public string Company { get; set; }
 
-    /// <summary>
-    /// Gets or sets the street address
-    /// </summary>
-    public string StreetAddress { get; set; }
+//    /// <summary>
+//    /// Gets or sets the street address
+//    /// </summary>
+//    public string StreetAddress { get; set; }
 
-    /// <summary>
-    /// Gets or sets the street address 2
-    /// </summary>
-    public string StreetAddress2 { get; set; }
+//    /// <summary>
+//    /// Gets or sets the street address 2
+//    /// </summary>
+//    public string StreetAddress2 { get; set; }
 
-    /// <summary>
-    /// Gets or sets the zip
-    /// </summary>
-    public string ZipPostalCode { get; set; }
+//    /// <summary>
+//    /// Gets or sets the zip
+//    /// </summary>
+//    public string ZipPostalCode { get; set; }
 
-    /// <summary>
-    /// Gets or sets the city
-    /// </summary>
-    public string City { get; set; }
+//    /// <summary>
+//    /// Gets or sets the city
+//    /// </summary>
+//    public string City { get; set; }
 
-    /// <summary>
-    /// Gets or sets the county
-    /// </summary>
-    public string County { get; set; }
+//    /// <summary>
+//    /// Gets or sets the county
+//    /// </summary>
+//    public string County { get; set; }
 
-    /// <summary>
-    /// Gets or sets the country id
-    /// </summary>
-    public int CountryId { get; set; }
+//    /// <summary>
+//    /// Gets or sets the country id
+//    /// </summary>
+//    public int CountryId { get; set; }
 
-    /// <summary>
-    /// Gets or sets the state province id
-    /// </summary>
-    public int StateProvinceId { get; set; }
+//    /// <summary>
+//    /// Gets or sets the state province id
+//    /// </summary>
+//    public int StateProvinceId { get; set; }
 
-    /// <summary>
-    /// Gets or sets the phone number
-    /// </summary>
-    public string Phone { get; set; }
+//    /// <summary>
+//    /// Gets or sets the phone number
+//    /// </summary>
+//    public string Phone { get; set; }
 
-    /// <summary>
-    /// Gets or sets the fax
-    /// </summary>
-    public string Fax { get; set; }
+//    /// <summary>
+//    /// Gets or sets the fax
+//    /// </summary>
+//    public string Fax { get; set; }
 
-    /// <summary>
-    /// Gets or sets the vat number
-    /// </summary>
-    public string VatNumber { get; set; }
+//    /// <summary>
+//    /// Gets or sets the vat number
+//    /// </summary>
+//    public string VatNumber { get; set; }
 
-    /// <summary>
-    /// Gets or sets the vat number status id
-    /// </summary>
-    public int VatNumberStatusId { get; set; }
+//    /// <summary>
+//    /// Gets or sets the vat number status id
+//    /// </summary>
+//    public int VatNumberStatusId { get; set; }
 
-    /// <summary>
-    /// Gets or sets the time zone id
-    /// </summary>
-    public string TimeZoneId { get; set; }
+//    /// <summary>
+//    /// Gets or sets the time zone id
+//    /// </summary>
+//    public string TimeZoneId { get; set; }
 
-    /// <summary>
-    /// Gets or sets the custom attributes
-    /// </summary>
-    public string CustomCustomerAttributesXML { get; set; }
+//    /// <summary>
+//    /// Gets or sets the custom attributes
+//    /// </summary>
+//    public string CustomCustomerAttributesXML { get; set; }
 
-    /// <summary>
-    /// Gets or sets the currency id
-    /// </summary>
-    public int? CurrencyId { get; set; }
+//    /// <summary>
+//    /// Gets or sets the currency id
+//    /// </summary>
+//    public int? CurrencyId { get; set; }
 
-    /// <summary>
-    /// Gets or sets the language id
-    /// </summary>
-    public int? LanguageId { get; set; }
+//    /// <summary>
+//    /// Gets or sets the language id
+//    /// </summary>
+//    public int? LanguageId { get; set; }
 
-    /// <summary>
-    /// Gets or sets the tax display type id
-    /// </summary>
-    public int? TaxDisplayTypeId { get; set; }
+//    /// <summary>
+//    /// Gets or sets the tax display type id
+//    /// </summary>
+//    public int? TaxDisplayTypeId { get; set; }
 
-    /// <summary>
-    /// Gets or sets the email that should be re-validated. Used in scenarios when a customer is already registered and wants to change an email address.
-    /// </summary>
-    public string EmailToRevalidate { get; set; }
+//    /// <summary>
+//    /// Gets or sets the email that should be re-validated. Used in scenarios when a customer is already registered and wants to change an email address.
+//    /// </summary>
+//    public string EmailToRevalidate { get; set; }
 
-    /// <summary>
-    /// Gets or sets the admin comment
-    /// </summary>
-    public string AdminComment { get; set; }
+//    /// <summary>
+//    /// Gets or sets the admin comment
+//    /// </summary>
+//    public string AdminComment { get; set; }
 
-    /// <summary>
-    /// Gets or sets a value indicating whether the customer is tax exempt
-    /// </summary>
-    public bool IsTaxExempt { get; set; }
+//    /// <summary>
+//    /// Gets or sets a value indicating whether the customer is tax exempt
+//    /// </summary>
+//    public bool IsTaxExempt { get; set; }
 
-    /// <summary>
-    /// Gets or sets the affiliate identifier
-    /// </summary>
-    public int AffiliateId { get; set; }
+//    /// <summary>
+//    /// Gets or sets the affiliate identifier
+//    /// </summary>
+//    public int AffiliateId { get; set; }
 
-    /// <summary>
-    /// Gets or sets the vendor identifier with which this customer is associated (manager)
-    /// </summary>
-    public int VendorId { get; set; }
+//    /// <summary>
+//    /// Gets or sets the vendor identifier with which this customer is associated (manager)
+//    /// </summary>
+//    public int VendorId { get; set; }
 
-    /// <summary>
-    /// Gets or sets a value indicating whether this customer has some products in the shopping cart
-    /// <remarks>The same as if we run ShoppingCartItems.Count > 0
-    /// We use this property for performance optimization:
-    /// if this property is set to false, then we do not need to load "ShoppingCartItems" navigation property for each page load
-    /// It's used only in a couple of places in the presentation layer
-    /// </remarks>
-    /// </summary>
-    public bool HasShoppingCartItems { get; set; }
+//    /// <summary>
+//    /// Gets or sets a value indicating whether this customer has some products in the shopping cart
+//    /// <remarks>The same as if we run ShoppingCartItems.Count > 0
+//    /// We use this property for performance optimization:
+//    /// if this property is set to false, then we do not need to load "ShoppingCartItems" navigation property for each page load
+//    /// It's used only in a couple of places in the presentation layer
+//    /// </remarks>
+//    /// </summary>
+//    public bool HasShoppingCartItems { get; set; }
 
-    /// <summary>
-    /// Gets or sets a value indicating whether the customer is required to re-login
-    /// </summary>
-    public bool RequireReLogin { get; set; }
+//    /// <summary>
+//    /// Gets or sets a value indicating whether the customer is required to re-login
+//    /// </summary>
+//    public bool RequireReLogin { get; set; }
 
-    /// <summary>
-    /// Gets or sets a value indicating number of failed login attempts (wrong password)
-    /// </summary>
-    public int FailedLoginAttempts { get; set; }
+//    /// <summary>
+//    /// Gets or sets a value indicating number of failed login attempts (wrong password)
+//    /// </summary>
+//    public int FailedLoginAttempts { get; set; }
 
-    /// <summary>
-    /// Gets or sets the date and time until which a customer cannot login (locked out)
-    /// </summary>
-    public DateTime? CannotLoginUntilDateUtc { get; set; }
+//    /// <summary>
+//    /// Gets or sets the date and time until which a customer cannot login (locked out)
+//    /// </summary>
+//    public DateTime? CannotLoginUntilDateUtc { get; set; }
 
-    /// <summary>
-    /// Gets or sets a value indicating whether the customer is active
-    /// </summary>
-    public bool Active { get; set; }
+//    /// <summary>
+//    /// Gets or sets a value indicating whether the customer is active
+//    /// </summary>
+//    public bool Active { get; set; }
 
-    /// <summary>
-    /// Gets or sets a value indicating whether the customer has been deleted
-    /// </summary>
-    public bool Deleted { get; set; }
+//    /// <summary>
+//    /// Gets or sets a value indicating whether the customer has been deleted
+//    /// </summary>
+//    public bool Deleted { get; set; }
 
-    /// <summary>
-    /// Gets or sets a value indicating whether the customer account is system
-    /// </summary>
-    public bool IsSystemAccount { get; set; }
+//    /// <summary>
+//    /// Gets or sets a value indicating whether the customer account is system
+//    /// </summary>
+//    public bool IsSystemAccount { get; set; }
 
-    /// <summary>
-    /// Gets or sets the customer system name
-    /// </summary>
-    public string SystemName { get; set; }
+//    /// <summary>
+//    /// Gets or sets the customer system name
+//    /// </summary>
+//    public string SystemName { get; set; }
 
-    /// <summary>
-    /// Gets or sets the last IP address
-    /// </summary>
-    public string LastIpAddress { get; set; }
+//    /// <summary>
+//    /// Gets or sets the last IP address
+//    /// </summary>
+//    public string LastIpAddress { get; set; }
 
-    /// <summary>
-    /// Gets or sets the date and time of entity creation
-    /// </summary>
-    public DateTime CreatedOnUtc { get; set; }
+//    /// <summary>
+//    /// Gets or sets the date and time of entity creation
+//    /// </summary>
+//    public DateTime CreatedOnUtc { get; set; }
 
-    /// <summary>
-    /// Gets or sets the date and time of last login
-    /// </summary>
-    public DateTime? LastLoginDateUtc { get; set; }
+//    /// <summary>
+//    /// Gets or sets the date and time of last login
+//    /// </summary>
+//    public DateTime? LastLoginDateUtc { get; set; }
 
-    /// <summary>
-    /// Gets or sets the date and time of last activity
-    /// </summary>
-    public DateTime LastActivityDateUtc { get; set; }
+//    /// <summary>
+//    /// Gets or sets the date and time of last activity
+//    /// </summary>
+//    public DateTime LastActivityDateUtc { get; set; }
 
-    /// <summary>
-    ///  Gets or sets the store identifier in which customer registered
-    /// </summary>
-    public int RegisteredInStoreId { get; set; }
+//    /// <summary>
+//    ///  Gets or sets the store identifier in which customer registered
+//    /// </summary>
+//    public int RegisteredInStoreId { get; set; }
 
-    /// <summary>
-    /// Gets or sets the billing address identifier
-    /// </summary>
-    public int? BillingAddressId { get; set; }
+//    /// <summary>
+//    /// Gets or sets the billing address identifier
+//    /// </summary>
+//    public int? BillingAddressId { get; set; }
 
-    /// <summary>
-    /// Gets or sets a value indicating whether the customer is required to change password
-    /// </summary>
-    public bool MustChangePassword { get; set; }
+//    /// <summary>
+//    /// Gets or sets a value indicating whether the customer is required to change password
+//    /// </summary>
+//    public bool MustChangePassword { get; set; }
 
-    /// <summary>
-    /// Gets or sets the shipping address identifier
-    /// </summary>
-    public int? ShippingAddressId { get; set; }
+//    /// <summary>
+//    /// Gets or sets the shipping address identifier
+//    /// </summary>
+//    public int? ShippingAddressId { get; set; }
 
-    #region Custom properties
+//    #region Custom properties
 
-    /// <summary>
-    /// Gets or sets the vat number status
-    /// </summary>
-    public VatNumberStatus VatNumberStatus
-    {
-        get => (VatNumberStatus)VatNumberStatusId;
-        set => VatNumberStatusId = (int)value;
-    }
+//    /// <summary>
+//    /// Gets or sets the vat number status
+//    /// </summary>
+//    public VatNumberStatus VatNumberStatus
+//    {
+//        get => (VatNumberStatus)VatNumberStatusId;
+//        set => VatNumberStatusId = (int)value;
+//    }
 
-    /// <summary>
-    /// Gets or sets the tax display type
-    /// </summary>
-    public TaxDisplayType? TaxDisplayType
-    {
-        get => TaxDisplayTypeId.HasValue ? (TaxDisplayType)TaxDisplayTypeId : null;
-        set => TaxDisplayTypeId = value.HasValue ? (int)value : null;
-    }
+//    /// <summary>
+//    /// Gets or sets the tax display type
+//    /// </summary>
+//    public TaxDisplayType? TaxDisplayType
+//    {
+//        get => TaxDisplayTypeId.HasValue ? (TaxDisplayType)TaxDisplayTypeId : null;
+//        set => TaxDisplayTypeId = value.HasValue ? (int)value : null;
+//    }
 
-    #endregion
-}
\ No newline at end of file
+//    #endregion
+//}
\ No newline at end of file
diff --git a/Libraries/Nop.Core/Domain/Customers/CustomerRole.cs b/Libraries/Nop.Core/Domain/Customers/CustomerRole.cs
index 3ea2215..a989cd5 100644
--- a/Libraries/Nop.Core/Domain/Customers/CustomerRole.cs
+++ b/Libraries/Nop.Core/Domain/Customers/CustomerRole.cs
@@ -1,58 +1,58 @@
-namespace Nop.Core.Domain.Customers;
+//namespace Nop.Core.Domain.Customers;
 
-/// <summary>
-/// Represents a customer role
-/// </summary>
-public partial class CustomerRole : BaseEntity
-{
-    /// <summary>
-    /// Gets or sets the customer role name
-    /// </summary>
-    public string Name { get; set; }
+///// <summary>
+///// Represents a customer role
+///// </summary>
+//public partial class CustomerRole : BaseEntity
+//{
+//    /// <summary>
+//    /// Gets or sets the customer role name
+//    /// </summary>
+//    public string Name { get; set; }
 
-    /// <summary>
-    /// Gets or sets a value indicating whether the customer role is marked as free shipping
-    /// </summary>
-    public bool FreeShipping { get; set; }
+//    /// <summary>
+//    /// Gets or sets a value indicating whether the customer role is marked as free shipping
+//    /// </summary>
+//    public bool FreeShipping { get; set; }
 
-    /// <summary>
-    /// Gets or sets a value indicating whether the customer role is marked as tax exempt
-    /// </summary>
-    public bool TaxExempt { get; set; }
+//    /// <summary>
+//    /// Gets or sets a value indicating whether the customer role is marked as tax exempt
+//    /// </summary>
+//    public bool TaxExempt { get; set; }
 
-    /// <summary>
-    /// Gets or sets a value indicating whether the customer role is active
-    /// </summary>
-    public bool Active { get; set; }
+//    /// <summary>
+//    /// Gets or sets a value indicating whether the customer role is active
+//    /// </summary>
+//    public bool Active { get; set; }
 
-    /// <summary>
-    /// Gets or sets a value indicating whether the customer role is system
-    /// </summary>
-    public bool IsSystemRole { get; set; }
+//    /// <summary>
+//    /// Gets or sets a value indicating whether the customer role is system
+//    /// </summary>
+//    public bool IsSystemRole { get; set; }
 
-    /// <summary>
-    /// Gets or sets the customer role system name
-    /// </summary>
-    public string SystemName { get; set; }
+//    /// <summary>
+//    /// Gets or sets the customer role system name
+//    /// </summary>
+//    public string SystemName { get; set; }
 
-    /// <summary>
-    /// Gets or sets a value indicating whether the customers must change passwords after a specified time
-    /// </summary>
-    public bool EnablePasswordLifetime { get; set; }
+//    /// <summary>
+//    /// Gets or sets a value indicating whether the customers must change passwords after a specified time
+//    /// </summary>
+//    public bool EnablePasswordLifetime { get; set; }
 
-    /// <summary>
-    /// Gets or sets a value indicating whether the customers of this role have other tax display type chosen instead of the default one
-    /// </summary>
-    public bool OverrideTaxDisplayType { get; set; }
+//    /// <summary>
+//    /// Gets or sets a value indicating whether the customers of this role have other tax display type chosen instead of the default one
+//    /// </summary>
+//    public bool OverrideTaxDisplayType { get; set; }
 
-    /// <summary>
-    /// Gets or sets identifier of the default tax display type (used only with "OverrideTaxDisplayType" enabled)
-    /// </summary>
-    public int DefaultTaxDisplayTypeId { get; set; }
+//    /// <summary>
+//    /// Gets or sets identifier of the default tax display type (used only with "OverrideTaxDisplayType" enabled)
+//    /// </summary>
+//    public int DefaultTaxDisplayTypeId { get; set; }
 
-    /// <summary>
-    /// Gets or sets a product identifier that is required by this customer role. 
-    /// A customer is added to this customer role once a specified product is purchased.
-    /// </summary>
-    public int PurchasedWithProductId { get; set; }
-}
\ No newline at end of file
+//    /// <summary>
+//    /// Gets or sets a product identifier that is required by this customer role. 
+//    /// A customer is added to this customer role once a specified product is purchased.
+//    /// </summary>
+//    public int PurchasedWithProductId { get; set; }
+//}
\ No newline at end of file
diff --git a/Libraries/Nop.Core/Domain/Discounts/DiscountMapping.cs b/Libraries/Nop.Core/Domain/Discounts/DiscountMapping.cs
index 87e530d..2d048bc 100644
--- a/Libraries/Nop.Core/Domain/Discounts/DiscountMapping.cs
+++ b/Libraries/Nop.Core/Domain/Discounts/DiscountMapping.cs
@@ -1,19 +1,19 @@
-namespace Nop.Core.Domain.Discounts;
+//namespace Nop.Core.Domain.Discounts;
 
-public abstract partial class DiscountMapping : BaseEntity
-{
-    /// <summary>
-    /// Gets the entity identifier
-    /// </summary>
-    public new int Id { get; }
+//public abstract partial class DiscountMapping : BaseEntity
+//{
+//    /// <summary>
+//    /// Gets the entity identifier
+//    /// </summary>
+//    public new int Id { get; }
 
-    /// <summary>
-    /// Gets or sets the discount identifier
-    /// </summary>
-    public int DiscountId { get; set; }
+//    /// <summary>
+//    /// Gets or sets the discount identifier
+//    /// </summary>
+//    public int DiscountId { get; set; }
 
-    /// <summary>
-    /// Gets or sets the entity identifier
-    /// </summary>
-    public abstract int EntityId { get; set; }
-}
\ No newline at end of file
+//    /// <summary>
+//    /// Gets or sets the entity identifier
+//    /// </summary>
+//    public abstract int EntityId { get; set; }
+//}
\ No newline at end of file
diff --git a/Libraries/Nop.Core/Domain/Discounts/DiscountProductMapping.cs b/Libraries/Nop.Core/Domain/Discounts/DiscountProductMapping.cs
index d7bcaf8..34d5c6f 100644
--- a/Libraries/Nop.Core/Domain/Discounts/DiscountProductMapping.cs
+++ b/Libraries/Nop.Core/Domain/Discounts/DiscountProductMapping.cs
@@ -1,12 +1,12 @@
-namespace Nop.Core.Domain.Discounts;
+//namespace Nop.Core.Domain.Discounts;
 
-/// <summary>
-/// Represents a discount-product mapping class
-/// </summary>
-public partial class DiscountProductMapping : DiscountMapping
-{
-    /// <summary>
-    /// Gets or sets the product identifier
-    /// </summary>
-    public override int EntityId { get; set; }
-}
\ No newline at end of file
+///// <summary>
+///// Represents a discount-product mapping class
+///// </summary>
+//public partial class DiscountProductMapping : DiscountMapping
+//{
+//    /// <summary>
+//    /// Gets or sets the product identifier
+//    /// </summary>
+//    public override int EntityId { get; set; }
+//}
\ No newline at end of file
diff --git a/Libraries/Nop.Core/Domain/Discounts/IDiscountSupported.cs b/Libraries/Nop.Core/Domain/Discounts/IDiscountSupported.cs
index 7378c44..3fc6d03 100644
--- a/Libraries/Nop.Core/Domain/Discounts/IDiscountSupported.cs
+++ b/Libraries/Nop.Core/Domain/Discounts/IDiscountSupported.cs
@@ -1,9 +1,9 @@
-namespace Nop.Core.Domain.Discounts;
+//namespace Nop.Core.Domain.Discounts;
 
-/// <summary>
-/// Represents an entity which supports discounts
-/// </summary>
-public partial interface IDiscountSupported<T> where T : DiscountMapping
-{
-    int Id { get; set; }
-}
\ No newline at end of file
+///// <summary>
+///// Represents an entity which supports discounts
+///// </summary>
+//public partial interface IDiscountSupported<T> where T : DiscountMapping
+//{
+//    int Id { get; set; }
+//}
\ No newline at end of file
diff --git a/Libraries/Nop.Core/Domain/Localization/ILocalizedEntity.cs b/Libraries/Nop.Core/Domain/Localization/ILocalizedEntity.cs
index 472e48e..3df2a74 100644
--- a/Libraries/Nop.Core/Domain/Localization/ILocalizedEntity.cs
+++ b/Libraries/Nop.Core/Domain/Localization/ILocalizedEntity.cs
@@ -1,8 +1,8 @@
-namespace Nop.Core.Domain.Localization;
+//namespace Nop.Core.Domain.Localization;
 
-/// <summary>
-/// Represents a localized entity
-/// </summary>
-public partial interface ILocalizedEntity
-{
-}
\ No newline at end of file
+///// <summary>
+///// Represents a localized entity
+///// </summary>
+//public partial interface ILocalizedEntity
+//{
+//}
\ No newline at end of file
diff --git a/Libraries/Nop.Core/Domain/Orders/Order.cs b/Libraries/Nop.Core/Domain/Orders/Order.cs
index d076057..e769335 100644
--- a/Libraries/Nop.Core/Domain/Orders/Order.cs
+++ b/Libraries/Nop.Core/Domain/Orders/Order.cs
@@ -1,336 +1,336 @@
-using Nop.Core.Domain.Common;
-using Nop.Core.Domain.Payments;
-using Nop.Core.Domain.Shipping;
-using Nop.Core.Domain.Tax;
-
-namespace Nop.Core.Domain.Orders;
-
-/// <summary>
-/// Represents an order
-/// </summary>
-public partial class Order : BaseEntity, ISoftDeletedEntity
-{
-    #region Properties
-
-    /// <summary>
-    /// Gets or sets the order identifier
-    /// </summary>
-    public Guid OrderGuid { get; set; }
-
-    /// <summary>
-    /// Gets or sets the store identifier
-    /// </summary>
-    public int StoreId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the customer identifier
-    /// </summary>
-    public int CustomerId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the billing address identifier
-    /// </summary>
-    public int BillingAddressId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the shipping address identifier
-    /// </summary>
-    public int? ShippingAddressId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the pickup address identifier
-    /// </summary>
-    public int? PickupAddressId { get; set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether a customer chose "pick up in store" shipping option
-    /// </summary>
-    public bool PickupInStore { get; set; }
-
-    /// <summary>
-    /// Gets or sets an order status identifier
-    /// </summary>
-    public int OrderStatusId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the shipping status identifier
-    /// </summary>
-    public int ShippingStatusId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the payment status identifier
-    /// </summary>
-    public int PaymentStatusId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the payment method system name
-    /// </summary>
-    public string PaymentMethodSystemName { get; set; }
-
-    /// <summary>
-    /// Gets or sets the customer currency code (at the moment of order placing)
-    /// </summary>
-    public string CustomerCurrencyCode { get; set; }
-
-    /// <summary>
-    /// Gets or sets the currency rate
-    /// </summary>
-    public decimal CurrencyRate { get; set; }
-
-    /// <summary>
-    /// Gets or sets the customer tax display type identifier
-    /// </summary>
-    public int CustomerTaxDisplayTypeId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the VAT number (the European Union Value Added Tax)
-    /// </summary>
-    public string VatNumber { get; set; }
-
-    /// <summary>
-    /// Gets or sets the order subtotal (include tax)
-    /// </summary>
-    public decimal OrderSubtotalInclTax { get; set; }
-
-    /// <summary>
-    /// Gets or sets the order subtotal (exclude tax)
-    /// </summary>
-    public decimal OrderSubtotalExclTax { get; set; }
-
-    /// <summary>
-    /// Gets or sets the order subtotal discount (include tax)
-    /// </summary>
-    public decimal OrderSubTotalDiscountInclTax { get; set; }
-
-    /// <summary>
-    /// Gets or sets the order subtotal discount (exclude tax)
-    /// </summary>
-    public decimal OrderSubTotalDiscountExclTax { get; set; }
-
-    /// <summary>
-    /// Gets or sets the order shipping (include tax)
-    /// </summary>
-    public decimal OrderShippingInclTax { get; set; }
-
-    /// <summary>
-    /// Gets or sets the order shipping (exclude tax)
-    /// </summary>
-    public decimal OrderShippingExclTax { get; set; }
-
-    /// <summary>
-    /// Gets or sets the payment method additional fee (incl tax)
-    /// </summary>
-    public decimal PaymentMethodAdditionalFeeInclTax { get; set; }
-
-    /// <summary>
-    /// Gets or sets the payment method additional fee (exclude tax)
-    /// </summary>
-    public decimal PaymentMethodAdditionalFeeExclTax { get; set; }
-
-    /// <summary>
-    /// Gets or sets the tax rates
-    /// </summary>
-    public string TaxRates { get; set; }
-
-    /// <summary>
-    /// Gets or sets the order tax
-    /// </summary>
-    public decimal OrderTax { get; set; }
-
-    /// <summary>
-    /// Gets or sets the order discount (applied to order total)
-    /// </summary>
-    public decimal OrderDiscount { get; set; }
-
-    /// <summary>
-    /// Gets or sets the order total
-    /// </summary>
-    public decimal OrderTotal { get; set; }
-
-    /// <summary>
-    /// Gets or sets the refunded amount
-    /// </summary>
-    public decimal RefundedAmount { get; set; }
-
-    /// <summary>
-    /// Gets or sets the reward points history entry identifier when reward points were earned (gained) for placing this order
-    /// </summary>
-    public int? RewardPointsHistoryEntryId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the checkout attribute description
-    /// </summary>
-    public string CheckoutAttributeDescription { get; set; }
-
-    /// <summary>
-    /// Gets or sets the checkout attributes in XML format
-    /// </summary>
-    public string CheckoutAttributesXml { get; set; }
-
-    /// <summary>
-    /// Gets or sets the customer language identifier
-    /// </summary>
-    public int CustomerLanguageId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the affiliate identifier
-    /// </summary>
-    public int AffiliateId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the customer IP address
-    /// </summary>
-    public string CustomerIp { get; set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether storing of credit card number is allowed
-    /// </summary>
-    public bool AllowStoringCreditCardNumber { get; set; }
-
-    /// <summary>
-    /// Gets or sets the card type
-    /// </summary>
-    public string CardType { get; set; }
-
-    /// <summary>
-    /// Gets or sets the card name
-    /// </summary>
-    public string CardName { get; set; }
-
-    /// <summary>
-    /// Gets or sets the card number
-    /// </summary>
-    public string CardNumber { get; set; }
-
-    /// <summary>
-    /// Gets or sets the masked credit card number
-    /// </summary>
-    public string MaskedCreditCardNumber { get; set; }
-
-    /// <summary>
-    /// Gets or sets the card CVV2
-    /// </summary>
-    public string CardCvv2 { get; set; }
-
-    /// <summary>
-    /// Gets or sets the card expiration month
-    /// </summary>
-    public string CardExpirationMonth { get; set; }
-
-    /// <summary>
-    /// Gets or sets the card expiration year
-    /// </summary>
-    public string CardExpirationYear { get; set; }
-
-    /// <summary>
-    /// Gets or sets the authorization transaction identifier
-    /// </summary>
-    public string AuthorizationTransactionId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the authorization transaction code
-    /// </summary>
-    public string AuthorizationTransactionCode { get; set; }
-
-    /// <summary>
-    /// Gets or sets the authorization transaction result
-    /// </summary>
-    public string AuthorizationTransactionResult { get; set; }
-
-    /// <summary>
-    /// Gets or sets the capture transaction identifier
-    /// </summary>
-    public string CaptureTransactionId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the capture transaction result
-    /// </summary>
-    public string CaptureTransactionResult { get; set; }
-
-    /// <summary>
-    /// Gets or sets the subscription transaction identifier
-    /// </summary>
-    public string SubscriptionTransactionId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the paid date and time
-    /// </summary>
-    public DateTime? PaidDateUtc { get; set; }
-
-    /// <summary>
-    /// Gets or sets the shipping method
-    /// </summary>
-    public string ShippingMethod { get; set; }
-
-    /// <summary>
-    /// Gets or sets the shipping rate computation method identifier or the pickup point provider identifier (if PickupInStore is true)
-    /// </summary>
-    public string ShippingRateComputationMethodSystemName { get; set; }
-
-    /// <summary>
-    /// Gets or sets the serialized CustomValues (values from ProcessPaymentRequest)
-    /// </summary>
-    public string CustomValuesXml { get; set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether the entity has been deleted
-    /// </summary>
-    public bool Deleted { get; set; }
-
-    /// <summary>
-    /// Gets or sets the date and time of order creation
-    /// </summary>
-    public DateTime CreatedOnUtc { get; set; }
-
-    /// <summary>
-    /// Gets or sets the custom order number without prefix
-    /// </summary>
-    public string CustomOrderNumber { get; set; }
-
-    /// <summary>
-    /// Gets or sets the reward points history record (spent by a customer when placing this order)
-    /// </summary>
-    public virtual int? RedeemedRewardPointsEntryId { get; set; }
-
-    #endregion
-
-    #region Custom properties
-
-    /// <summary>
-    /// Gets or sets the order status
-    /// </summary>
-    public OrderStatus OrderStatus
-    {
-        get => (OrderStatus)OrderStatusId;
-        set => OrderStatusId = (int)value;
-    }
-
-    /// <summary>
-    /// Gets or sets the payment status
-    /// </summary>
-    public PaymentStatus PaymentStatus
-    {
-        get => (PaymentStatus)PaymentStatusId;
-        set => PaymentStatusId = (int)value;
-    }
-
-    /// <summary>
-    /// Gets or sets the shipping status
-    /// </summary>
-    public ShippingStatus ShippingStatus
-    {
-        get => (ShippingStatus)ShippingStatusId;
-        set => ShippingStatusId = (int)value;
-    }
-
-    /// <summary>
-    /// Gets or sets the customer tax display type
-    /// </summary>
-    public TaxDisplayType CustomerTaxDisplayType
-    {
-        get => (TaxDisplayType)CustomerTaxDisplayTypeId;
-        set => CustomerTaxDisplayTypeId = (int)value;
-    }
-
-    #endregion
-}
\ No newline at end of file
+//using Nop.Core.Domain.Common;
+//using Nop.Core.Domain.Payments;
+//using Nop.Core.Domain.Shipping;
+//using Nop.Core.Domain.Tax;
+
+//namespace Nop.Core.Domain.Orders;
+
+///// <summary>
+///// Represents an order
+///// </summary>
+//public partial class Order : BaseEntity, ISoftDeletedEntity
+//{
+//    #region Properties
+
+//    /// <summary>
+//    /// Gets or sets the order identifier
+//    /// </summary>
+//    public Guid OrderGuid { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the store identifier
+//    /// </summary>
+//    public int StoreId { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the customer identifier
+//    /// </summary>
+//    public int CustomerId { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the billing address identifier
+//    /// </summary>
+//    public int BillingAddressId { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the shipping address identifier
+//    /// </summary>
+//    public int? ShippingAddressId { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the pickup address identifier
+//    /// </summary>
+//    public int? PickupAddressId { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets a value indicating whether a customer chose "pick up in store" shipping option
+//    /// </summary>
+//    public bool PickupInStore { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets an order status identifier
+//    /// </summary>
+//    public int OrderStatusId { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the shipping status identifier
+//    /// </summary>
+//    public int ShippingStatusId { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the payment status identifier
+//    /// </summary>
+//    public int PaymentStatusId { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the payment method system name
+//    /// </summary>
+//    public string PaymentMethodSystemName { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the customer currency code (at the moment of order placing)
+//    /// </summary>
+//    public string CustomerCurrencyCode { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the currency rate
+//    /// </summary>
+//    public decimal CurrencyRate { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the customer tax display type identifier
+//    /// </summary>
+//    public int CustomerTaxDisplayTypeId { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the VAT number (the European Union Value Added Tax)
+//    /// </summary>
+//    public string VatNumber { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the order subtotal (include tax)
+//    /// </summary>
+//    public decimal OrderSubtotalInclTax { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the order subtotal (exclude tax)
+//    /// </summary>
+//    public decimal OrderSubtotalExclTax { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the order subtotal discount (include tax)
+//    /// </summary>
+//    public decimal OrderSubTotalDiscountInclTax { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the order subtotal discount (exclude tax)
+//    /// </summary>
+//    public decimal OrderSubTotalDiscountExclTax { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the order shipping (include tax)
+//    /// </summary>
+//    public decimal OrderShippingInclTax { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the order shipping (exclude tax)
+//    /// </summary>
+//    public decimal OrderShippingExclTax { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the payment method additional fee (incl tax)
+//    /// </summary>
+//    public decimal PaymentMethodAdditionalFeeInclTax { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the payment method additional fee (exclude tax)
+//    /// </summary>
+//    public decimal PaymentMethodAdditionalFeeExclTax { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the tax rates
+//    /// </summary>
+//    public string TaxRates { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the order tax
+//    /// </summary>
+//    public decimal OrderTax { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the order discount (applied to order total)
+//    /// </summary>
+//    public decimal OrderDiscount { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the order total
+//    /// </summary>
+//    public decimal OrderTotal { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the refunded amount
+//    /// </summary>
+//    public decimal RefundedAmount { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the reward points history entry identifier when reward points were earned (gained) for placing this order
+//    /// </summary>
+//    public int? RewardPointsHistoryEntryId { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the checkout attribute description
+//    /// </summary>
+//    public string CheckoutAttributeDescription { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the checkout attributes in XML format
+//    /// </summary>
+//    public string CheckoutAttributesXml { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the customer language identifier
+//    /// </summary>
+//    public int CustomerLanguageId { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the affiliate identifier
+//    /// </summary>
+//    public int AffiliateId { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the customer IP address
+//    /// </summary>
+//    public string CustomerIp { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets a value indicating whether storing of credit card number is allowed
+//    /// </summary>
+//    public bool AllowStoringCreditCardNumber { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the card type
+//    /// </summary>
+//    public string CardType { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the card name
+//    /// </summary>
+//    public string CardName { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the card number
+//    /// </summary>
+//    public string CardNumber { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the masked credit card number
+//    /// </summary>
+//    public string MaskedCreditCardNumber { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the card CVV2
+//    /// </summary>
+//    public string CardCvv2 { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the card expiration month
+//    /// </summary>
+//    public string CardExpirationMonth { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the card expiration year
+//    /// </summary>
+//    public string CardExpirationYear { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the authorization transaction identifier
+//    /// </summary>
+//    public string AuthorizationTransactionId { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the authorization transaction code
+//    /// </summary>
+//    public string AuthorizationTransactionCode { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the authorization transaction result
+//    /// </summary>
+//    public string AuthorizationTransactionResult { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the capture transaction identifier
+//    /// </summary>
+//    public string CaptureTransactionId { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the capture transaction result
+//    /// </summary>
+//    public string CaptureTransactionResult { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the subscription transaction identifier
+//    /// </summary>
+//    public string SubscriptionTransactionId { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the paid date and time
+//    /// </summary>
+//    public DateTime? PaidDateUtc { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the shipping method
+//    /// </summary>
+//    public string ShippingMethod { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the shipping rate computation method identifier or the pickup point provider identifier (if PickupInStore is true)
+//    /// </summary>
+//    public string ShippingRateComputationMethodSystemName { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the serialized CustomValues (values from ProcessPaymentRequest)
+//    /// </summary>
+//    public string CustomValuesXml { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets a value indicating whether the entity has been deleted
+//    /// </summary>
+//    public bool Deleted { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the date and time of order creation
+//    /// </summary>
+//    public DateTime CreatedOnUtc { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the custom order number without prefix
+//    /// </summary>
+//    public string CustomOrderNumber { get; set; }
+
+//    /// <summary>
+//    /// Gets or sets the reward points history record (spent by a customer when placing this order)
+//    /// </summary>
+//    public virtual int? RedeemedRewardPointsEntryId { get; set; }
+
+//    #endregion
+
+//    #region Custom properties
+
+//    /// <summary>
+//    /// Gets or sets the order status
+//    /// </summary>
+//    public OrderStatus OrderStatus
+//    {
+//        get => (OrderStatus)OrderStatusId;
+//        set => OrderStatusId = (int)value;
+//    }
+
+//    /// <summary>
+//    /// Gets or sets the payment status
+//    /// </summary>
+//    public PaymentStatus PaymentStatus
+//    {
+//        get => (PaymentStatus)PaymentStatusId;
+//        set => PaymentStatusId = (int)value;
+//    }
+
+//    /// <summary>
+//    /// Gets or sets the shipping status
+//    /// </summary>
+//    public ShippingStatus ShippingStatus
+//    {
+//        get => (ShippingStatus)ShippingStatusId;
+//        set => ShippingStatusId = (int)value;
+//    }
+
+//    /// <summary>
+//    /// Gets or sets the customer tax display type
+//    /// </summary>
+//    public TaxDisplayType CustomerTaxDisplayType
+//    {
+//        get => (TaxDisplayType)CustomerTaxDisplayTypeId;
+//        set => CustomerTaxDisplayTypeId = (int)value;
+//    }
+
+//    #endregion
+//}
\ No newline at end of file
diff --git a/Libraries/Nop.Core/Domain/Orders/OrderItem.cs b/Libraries/Nop.Core/Domain/Orders/OrderItem.cs
index d3824b7..047a340 100644
--- a/Libraries/Nop.Core/Domain/Orders/OrderItem.cs
+++ b/Libraries/Nop.Core/Domain/Orders/OrderItem.cs
@@ -1,103 +1,103 @@
-namespace Nop.Core.Domain.Orders;
+//namespace Nop.Core.Domain.Orders;
 
-/// <summary>
-/// Represents an order item
-/// </summary>
-public partial class OrderItem : BaseEntity
-{
-    /// <summary>
-    /// Gets or sets the order item identifier
-    /// </summary>
-    public Guid OrderItemGuid { get; set; }
+///// <summary>
+///// Represents an order item
+///// </summary>
+//public partial class OrderItem : BaseEntity
+//{
+//    /// <summary>
+//    /// Gets or sets the order item identifier
+//    /// </summary>
+//    public Guid OrderItemGuid { get; set; }
 
-    /// <summary>
-    /// Gets or sets the order identifier
-    /// </summary>
-    public int OrderId { get; set; }
+//    /// <summary>
+//    /// Gets or sets the order identifier
+//    /// </summary>
+//    public int OrderId { get; set; }
 
-    /// <summary>
-    /// Gets or sets the product identifier
-    /// </summary>
-    public int ProductId { get; set; }
+//    /// <summary>
+//    /// Gets or sets the product identifier
+//    /// </summary>
+//    public int ProductId { get; set; }
 
-    /// <summary>
-    /// Gets or sets the quantity
-    /// </summary>
-    public int Quantity { get; set; }
+//    /// <summary>
+//    /// Gets or sets the quantity
+//    /// </summary>
+//    public int Quantity { get; set; }
 
-    /// <summary>
-    /// Gets or sets the unit price in primary store currency (include tax)
-    /// </summary>
-    public decimal UnitPriceInclTax { get; set; }
+//    /// <summary>
+//    /// Gets or sets the unit price in primary store currency (include tax)
+//    /// </summary>
+//    public decimal UnitPriceInclTax { get; set; }
 
-    /// <summary>
-    /// Gets or sets the unit price in primary store currency (exclude tax)
-    /// </summary>
-    public decimal UnitPriceExclTax { get; set; }
+//    /// <summary>
+//    /// Gets or sets the unit price in primary store currency (exclude tax)
+//    /// </summary>
+//    public decimal UnitPriceExclTax { get; set; }
 
-    /// <summary>
-    /// Gets or sets the price in primary store currency (include tax)
-    /// </summary>
-    public decimal PriceInclTax { get; set; }
+//    /// <summary>
+//    /// Gets or sets the price in primary store currency (include tax)
+//    /// </summary>
+//    public decimal PriceInclTax { get; set; }
 
-    /// <summary>
-    /// Gets or sets the price in primary store currency (exclude tax)
-    /// </summary>
-    public decimal PriceExclTax { get; set; }
+//    /// <summary>
+//    /// Gets or sets the price in primary store currency (exclude tax)
+//    /// </summary>
+//    public decimal PriceExclTax { get; set; }
 
-    /// <summary>
-    /// Gets or sets the discount amount (include tax)
-    /// </summary>
-    public decimal DiscountAmountInclTax { get; set; }
+//    /// <summary>
+//    /// Gets or sets the discount amount (include tax)
+//    /// </summary>
+//    public decimal DiscountAmountInclTax { get; set; }
 
-    /// <summary>
-    /// Gets or sets the discount amount (exclude tax)
-    /// </summary>
-    public decimal DiscountAmountExclTax { get; set; }
+//    /// <summary>
+//    /// Gets or sets the discount amount (exclude tax)
+//    /// </summary>
+//    public decimal DiscountAmountExclTax { get; set; }
 
-    /// <summary>
-    /// Gets or sets the original cost of this order item (when an order was placed), qty 1
-    /// </summary>
-    public decimal OriginalProductCost { get; set; }
+//    /// <summary>
+//    /// Gets or sets the original cost of this order item (when an order was placed), qty 1
+//    /// </summary>
+//    public decimal OriginalProductCost { get; set; }
 
-    /// <summary>
-    /// Gets or sets the attribute description
-    /// </summary>
-    public string AttributeDescription { get; set; }
+//    /// <summary>
+//    /// Gets or sets the attribute description
+//    /// </summary>
+//    public string AttributeDescription { get; set; }
 
-    /// <summary>
-    /// Gets or sets the product attributes in XML format
-    /// </summary>
-    public string AttributesXml { get; set; }
+//    /// <summary>
+//    /// Gets or sets the product attributes in XML format
+//    /// </summary>
+//    public string AttributesXml { get; set; }
 
-    /// <summary>
-    /// Gets or sets the download count
-    /// </summary>
-    public int DownloadCount { get; set; }
+//    /// <summary>
+//    /// Gets or sets the download count
+//    /// </summary>
+//    public int DownloadCount { get; set; }
 
-    /// <summary>
-    /// Gets or sets a value indicating whether download is activated
-    /// </summary>
-    public bool IsDownloadActivated { get; set; }
+//    /// <summary>
+//    /// Gets or sets a value indicating whether download is activated
+//    /// </summary>
+//    public bool IsDownloadActivated { get; set; }
 
-    /// <summary>
-    /// Gets or sets a license download identifier (in case this is a downloadable product)
-    /// </summary>
-    public int? LicenseDownloadId { get; set; }
+//    /// <summary>
+//    /// Gets or sets a license download identifier (in case this is a downloadable product)
+//    /// </summary>
+//    public int? LicenseDownloadId { get; set; }
 
-    /// <summary>
-    /// Gets or sets the total weight of one item
-    /// It's nullable for compatibility with the previous version of nopCommerce where was no such property
-    /// </summary>
-    public decimal? ItemWeight { get; set; }
+//    /// <summary>
+//    /// Gets or sets the total weight of one item
+//    /// It's nullable for compatibility with the previous version of nopCommerce where was no such property
+//    /// </summary>
+//    public decimal? ItemWeight { get; set; }
 
-    /// <summary>
-    /// Gets or sets the rental product start date (null if it's not a rental product)
-    /// </summary>
-    public DateTime? RentalStartDateUtc { get; set; }
+//    /// <summary>
+//    /// Gets or sets the rental product start date (null if it's not a rental product)
+//    /// </summary>
+//    public DateTime? RentalStartDateUtc { get; set; }
 
-    /// <summary>
-    /// Gets or sets the rental product end date (null if it's not a rental product)
-    /// </summary>
-    public DateTime? RentalEndDateUtc { get; set; }
-}
\ No newline at end of file
+//    /// <summary>
+//    /// Gets or sets the rental product end date (null if it's not a rental product)
+//    /// </summary>
+//    public DateTime? RentalEndDateUtc { get; set; }
+//}
\ No newline at end of file
diff --git a/Libraries/Nop.Core/Domain/Orders/OrderStatus.cs b/Libraries/Nop.Core/Domain/Orders/OrderStatus.cs
index cb7317b..95e7ab4 100644
--- a/Libraries/Nop.Core/Domain/Orders/OrderStatus.cs
+++ b/Libraries/Nop.Core/Domain/Orders/OrderStatus.cs
@@ -1,27 +1,27 @@
-namespace Nop.Core.Domain.Orders;
+//namespace Nop.Core.Domain.Orders;
 
-/// <summary>
-/// Represents an order status enumeration
-/// </summary>
-public enum OrderStatus
-{
-    /// <summary>
-    /// Pending
-    /// </summary>
-    Pending = 10,
+///// <summary>
+///// Represents an order status enumeration
+///// </summary>
+//public enum OrderStatus
+//{
+//    /// <summary>
+//    /// Pending
+//    /// </summary>
+//    Pending = 10,
 
-    /// <summary>
-    /// Processing
-    /// </summary>
-    Processing = 20,
+//    /// <summary>
+//    /// Processing
+//    /// </summary>
+//    Processing = 20,
 
-    /// <summary>
-    /// Complete
-    /// </summary>
-    Complete = 30,
+//    /// <summary>
+//    /// Complete
+//    /// </summary>
+//    Complete = 30,
 
-    /// <summary>
-    /// Cancelled
-    /// </summary>
-    Cancelled = 40
-}
\ No newline at end of file
+//    /// <summary>
+//    /// Cancelled
+//    /// </summary>
+//    Cancelled = 40
+//}
\ No newline at end of file
diff --git a/Libraries/Nop.Core/Domain/Payments/PaymentStatus.cs b/Libraries/Nop.Core/Domain/Payments/PaymentStatus.cs
index 3308df0..01d07ff 100644
--- a/Libraries/Nop.Core/Domain/Payments/PaymentStatus.cs
+++ b/Libraries/Nop.Core/Domain/Payments/PaymentStatus.cs
@@ -1,37 +1,37 @@
-namespace Nop.Core.Domain.Payments;
+//namespace Nop.Core.Domain.Payments;
 
-/// <summary>
-/// Represents a payment status enumeration
-/// </summary>
-public enum PaymentStatus
-{
-    /// <summary>
-    /// Pending
-    /// </summary>
-    Pending = 10,
+///// <summary>
+///// Represents a payment status enumeration
+///// </summary>
+//public enum PaymentStatus
+//{
+//    /// <summary>
+//    /// Pending
+//    /// </summary>
+//    Pending = 10,
 
-    /// <summary>
-    /// Authorized
-    /// </summary>
-    Authorized = 20,
+//    /// <summary>
+//    /// Authorized
+//    /// </summary>
+//    Authorized = 20,
 
-    /// <summary>
-    /// Paid
-    /// </summary>
-    Paid = 30,
+//    /// <summary>
+//    /// Paid
+//    /// </summary>
+//    Paid = 30,
 
-    /// <summary>
-    /// Partially Refunded
-    /// </summary>
-    PartiallyRefunded = 35,
+//    /// <summary>
+//    /// Partially Refunded
+//    /// </summary>
+//    PartiallyRefunded = 35,
 
-    /// <summary>
-    /// Refunded
-    /// </summary>
-    Refunded = 40,
+//    /// <summary>
+//    /// Refunded
+//    /// </summary>
+//    Refunded = 40,
 
-    /// <summary>
-    /// Voided
-    /// </summary>
-    Voided = 50
-}
\ No newline at end of file
+//    /// <summary>
+//    /// Voided
+//    /// </summary>
+//    Voided = 50
+//}
\ No newline at end of file
diff --git a/Libraries/Nop.Core/Domain/Security/IAclSupported.cs b/Libraries/Nop.Core/Domain/Security/IAclSupported.cs
index 2b25f1b..499649e 100644
--- a/Libraries/Nop.Core/Domain/Security/IAclSupported.cs
+++ b/Libraries/Nop.Core/Domain/Security/IAclSupported.cs
@@ -1,12 +1,12 @@
-namespace Nop.Core.Domain.Security;
+//namespace Nop.Core.Domain.Security;
 
-/// <summary>
-/// Represents an entity which supports ACL
-/// </summary>
-public partial interface IAclSupported
-{
-    /// <summary>
-    /// Gets or sets a value indicating whether the entity is subject to ACL
-    /// </summary>
-    bool SubjectToAcl { get; set; }
-}
\ No newline at end of file
+///// <summary>
+///// Represents an entity which supports ACL
+///// </summary>
+//public partial interface IAclSupported
+//{
+//    /// <summary>
+//    /// Gets or sets a value indicating whether the entity is subject to ACL
+//    /// </summary>
+//    bool SubjectToAcl { get; set; }
+//}
\ No newline at end of file
diff --git a/Libraries/Nop.Core/Domain/Seo/ISlugSupported.cs b/Libraries/Nop.Core/Domain/Seo/ISlugSupported.cs
index a095aa5..f3d4c33 100644
--- a/Libraries/Nop.Core/Domain/Seo/ISlugSupported.cs
+++ b/Libraries/Nop.Core/Domain/Seo/ISlugSupported.cs
@@ -1,8 +1,8 @@
-namespace Nop.Core.Domain.Seo;
+//namespace Nop.Core.Domain.Seo;
 
-/// <summary>
-/// Represents an entity which supports slug (SEO friendly one-word URLs)
-/// </summary>
-public partial interface ISlugSupported
-{
-}
\ No newline at end of file
+///// <summary>
+///// Represents an entity which supports slug (SEO friendly one-word URLs)
+///// </summary>
+//public partial interface ISlugSupported
+//{
+//}
\ No newline at end of file
diff --git a/Libraries/Nop.Core/Domain/Shipping/ShippingStatus.cs b/Libraries/Nop.Core/Domain/Shipping/ShippingStatus.cs
index eb18de6..6f88adb 100644
--- a/Libraries/Nop.Core/Domain/Shipping/ShippingStatus.cs
+++ b/Libraries/Nop.Core/Domain/Shipping/ShippingStatus.cs
@@ -1,32 +1,32 @@
-namespace Nop.Core.Domain.Shipping;
+//namespace Nop.Core.Domain.Shipping;
 
-/// <summary>
-/// Represents the shipping status enumeration
-/// </summary>
-public enum ShippingStatus
-{
-    /// <summary>
-    /// Shipping not required
-    /// </summary>
-    ShippingNotRequired = 10,
+///// <summary>
+///// Represents the shipping status enumeration
+///// </summary>
+//public enum ShippingStatus
+//{
+//    /// <summary>
+//    /// Shipping not required
+//    /// </summary>
+//    ShippingNotRequired = 10,
 
-    /// <summary>
-    /// Not yet shipped
-    /// </summary>
-    NotYetShipped = 20,
+//    /// <summary>
+//    /// Not yet shipped
+//    /// </summary>
+//    NotYetShipped = 20,
 
-    /// <summary>
-    /// Partially shipped
-    /// </summary>
-    PartiallyShipped = 25,
+//    /// <summary>
+//    /// Partially shipped
+//    /// </summary>
+//    PartiallyShipped = 25,
 
-    /// <summary>
-    /// Shipped
-    /// </summary>
-    Shipped = 30,
+//    /// <summary>
+//    /// Shipped
+//    /// </summary>
+//    Shipped = 30,
 
-    /// <summary>
-    /// Delivered
-    /// </summary>
-    Delivered = 40
-}
\ No newline at end of file
+//    /// <summary>
+//    /// Delivered
+//    /// </summary>
+//    Delivered = 40
+//}
\ No newline at end of file
diff --git a/Libraries/Nop.Core/Domain/Stores/IStoreMappingSupported.cs b/Libraries/Nop.Core/Domain/Stores/IStoreMappingSupported.cs
index f8d9959..c312fee 100644
--- a/Libraries/Nop.Core/Domain/Stores/IStoreMappingSupported.cs
+++ b/Libraries/Nop.Core/Domain/Stores/IStoreMappingSupported.cs
@@ -1,12 +1,12 @@
-namespace Nop.Core.Domain.Stores;
+//namespace Nop.Core.Domain.Stores;
 
-/// <summary>
-/// Represents an entity which supports store mapping
-/// </summary>
-public partial interface IStoreMappingSupported
-{
-    /// <summary>
-    /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores
-    /// </summary>
-    bool LimitedToStores { get; set; }
-}
\ No newline at end of file
+///// <summary>
+///// Represents an entity which supports store mapping
+///// </summary>
+//public partial interface IStoreMappingSupported
+//{
+//    /// <summary>
+//    /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores
+//    /// </summary>
+//    bool LimitedToStores { get; set; }
+//}
\ No newline at end of file
diff --git a/Libraries/Nop.Core/Domain/Tax/TaxDisplayType.cs b/Libraries/Nop.Core/Domain/Tax/TaxDisplayType.cs
index 9a8abe4..316c93b 100644
--- a/Libraries/Nop.Core/Domain/Tax/TaxDisplayType.cs
+++ b/Libraries/Nop.Core/Domain/Tax/TaxDisplayType.cs
@@ -1,17 +1,17 @@
-namespace Nop.Core.Domain.Tax;
+//namespace Nop.Core.Domain.Tax;
 
-/// <summary>
-/// Represents the tax display type enumeration
-/// </summary>
-public enum TaxDisplayType
-{
-    /// <summary>
-    /// Including tax
-    /// </summary>
-    IncludingTax = 0,
+///// <summary>
+///// Represents the tax display type enumeration
+///// </summary>
+//public enum TaxDisplayType
+//{
+//    /// <summary>
+//    /// Including tax
+//    /// </summary>
+//    IncludingTax = 0,
 
-    /// <summary>
-    /// Excluding tax
-    /// </summary>
-    ExcludingTax = 10
-}
\ No newline at end of file
+//    /// <summary>
+//    /// Excluding tax
+//    /// </summary>
+//    ExcludingTax = 10
+//}
\ No newline at end of file
diff --git a/Libraries/Nop.Core/Domain/Tax/VatNumberStatus.cs b/Libraries/Nop.Core/Domain/Tax/VatNumberStatus.cs
index f65de8e..754c920 100644
--- a/Libraries/Nop.Core/Domain/Tax/VatNumberStatus.cs
+++ b/Libraries/Nop.Core/Domain/Tax/VatNumberStatus.cs
@@ -1,27 +1,27 @@
-namespace Nop.Core.Domain.Tax;
+//namespace Nop.Core.Domain.Tax;
 
-/// <summary>
-/// Represents the VAT number status enumeration
-/// </summary>
-public enum VatNumberStatus
-{
-    /// <summary>
-    /// Unknown
-    /// </summary>
-    Unknown = 0,
+///// <summary>
+///// Represents the VAT number status enumeration
+///// </summary>
+//public enum VatNumberStatus
+//{
+//    /// <summary>
+//    /// Unknown
+//    /// </summary>
+//    Unknown = 0,
 
-    /// <summary>
-    /// Empty
-    /// </summary>
-    Empty = 10,
+//    /// <summary>
+//    /// Empty
+//    /// </summary>
+//    Empty = 10,
 
-    /// <summary>
-    /// Valid
-    /// </summary>
-    Valid = 20,
+//    /// <summary>
+//    /// Valid
+//    /// </summary>
+//    Valid = 20,
 
-    /// <summary>
-    /// Invalid
-    /// </summary>
-    Invalid = 30
-}
\ No newline at end of file
+//    /// <summary>
+//    /// Invalid
+//    /// </summary>
+//    Invalid = 30
+//}
\ No newline at end of file
diff --git a/Libraries/Nop.Core/Nop.Core.csproj b/Libraries/Nop.Core/Nop.Core.csproj
index c6e7ea7..9c36723 100644
--- a/Libraries/Nop.Core/Nop.Core.csproj
+++ b/Libraries/Nop.Core/Nop.Core.csproj
@@ -28,4 +28,8 @@
     <PackageReference Include="System.Linq.Async" Version="6.0.3" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\NopCommerce.Common\4.70\Libraries\Mango.Nop.Core\Mango.Nop.Core.csproj" />
+  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/Libraries/Nop.Data/Nop.Data.csproj b/Libraries/Nop.Data/Nop.Data.csproj
index 947cc12..6861eb3 100644
--- a/Libraries/Nop.Data/Nop.Data.csproj
+++ b/Libraries/Nop.Data/Nop.Data.csproj
@@ -24,6 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\NopCommerce.Common\4.70\Libraries\Mango.Nop.Core\Mango.Nop.Core.csproj" />
     <ProjectReference Include="..\Nop.Core\Nop.Core.csproj" />
   </ItemGroup>
 
diff --git a/Libraries/Nop.Services/Nop.Services.csproj b/Libraries/Nop.Services/Nop.Services.csproj
index 539509e..f14788c 100644
--- a/Libraries/Nop.Services/Nop.Services.csproj
+++ b/Libraries/Nop.Services/Nop.Services.csproj
@@ -29,6 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\NopCommerce.Common\4.70\Libraries\Mango.Nop.Core\Mango.Nop.Core.csproj" />
     <ProjectReference Include="..\Nop.Core\Nop.Core.csproj" />
     <ProjectReference Include="..\Nop.Data\Nop.Data.csproj" />
   </ItemGroup>
diff --git a/Presentation/Nop.Web.Framework/Nop.Web.Framework.csproj b/Presentation/Nop.Web.Framework/Nop.Web.Framework.csproj
index 67ca628..53b54e3 100644
--- a/Presentation/Nop.Web.Framework/Nop.Web.Framework.csproj
+++ b/Presentation/Nop.Web.Framework/Nop.Web.Framework.csproj
@@ -19,6 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\NopCommerce.Common\4.70\Libraries\Mango.Nop.Core\Mango.Nop.Core.csproj" />
     <ProjectReference Include="..\..\Libraries\Nop.Core\Nop.Core.csproj" />
     <ProjectReference Include="..\..\Libraries\Nop.Data\Nop.Data.csproj" />
     <ProjectReference Include="..\..\Libraries\Nop.Services\Nop.Services.csproj" />
diff --git a/Presentation/Nop.Web/Nop.Web.csproj b/Presentation/Nop.Web/Nop.Web.csproj
index c0e2662..014eab6 100644
--- a/Presentation/Nop.Web/Nop.Web.csproj
+++ b/Presentation/Nop.Web/Nop.Web.csproj
@@ -19,6 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\NopCommerce.Common\4.70\Libraries\Mango.Nop.Core\Mango.Nop.Core.csproj" />
     <ProjectReference Include="..\..\Libraries\Nop.Core\Nop.Core.csproj" />
     <ProjectReference Include="..\..\Libraries\Nop.Data\Nop.Data.csproj" />
     <ProjectReference Include="..\..\Libraries\Nop.Services\Nop.Services.csproj" />