diff --git a/Build/linq2db.Default.props b/Build/linq2db.Default.props
index 6e4b65e..c6cdffc 100644
--- a/Build/linq2db.Default.props
+++ b/Build/linq2db.Default.props
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>3.11.0</Version>
+		<Version>3.11.1</Version>
 
 		<Authors>Svyatoslav Danyliv, Igor Tkachev, Dmitry Lukashenko, Ilya Chudin</Authors>
 		<Product>Linq to DB</Product>
diff --git a/Source/LinqToDB.EntityFrameworkCore/EFCoreMetadataReader.cs b/Source/LinqToDB.EntityFrameworkCore/EFCoreMetadataReader.cs
index 84836eb..1af487f 100644
--- a/Source/LinqToDB.EntityFrameworkCore/EFCoreMetadataReader.cs
+++ b/Source/LinqToDB.EntityFrameworkCore/EFCoreMetadataReader.cs
@@ -8,8 +8,10 @@
 using LinqToDB.Expressions;
 using LinqToDB.Reflection;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Query.SqlExpressions;
 using Microsoft.EntityFrameworkCore.Storage;
@@ -22,7 +24,7 @@ namespace LinqToDB.EntityFrameworkCore
 	using Common;
 	using Internal;
 	using SqlQuery;
-	using SqlExpression = Microsoft.EntityFrameworkCore.Query.SqlExpressions.SqlExpression;
+	using SqlExpression = SqlExpression;
 
 	/// <summary>
 	/// LINQ To DB metadata reader for EF.Core model.
@@ -32,13 +34,19 @@ internal class EFCoreMetadataReader : IMetadataReader
 		readonly IModel? _model;
 		private readonly RelationalSqlTranslatingExpressionVisitorDependencies? _dependencies;
 		private readonly IRelationalTypeMappingSource? _mappingSource;
-		private readonly ConcurrentDictionary<MemberInfo, EFCoreExpressionAttribute?> _calculatedExtensions = new ConcurrentDictionary<MemberInfo, EFCoreExpressionAttribute?>();
+		private readonly IMigrationsAnnotationProvider? _annotationProvider;
+		private readonly ConcurrentDictionary<MemberInfo, EFCoreExpressionAttribute?> _calculatedExtensions = new();
 
-		public EFCoreMetadataReader(IModel? model, RelationalSqlTranslatingExpressionVisitorDependencies? dependencies, IRelationalTypeMappingSource? mappingSource)
+		public EFCoreMetadataReader(
+			IModel? model, IInfrastructure<IServiceProvider>? accessor)
 		{
 			_model = model;
-			_dependencies = dependencies;
-			_mappingSource = mappingSource;
+			if (accessor != null)
+			{
+				_dependencies       = accessor.GetService<RelationalSqlTranslatingExpressionVisitorDependencies>();
+				_mappingSource      = accessor.GetService<IRelationalTypeMappingSource>();
+				_annotationProvider = accessor.GetService<IMigrationsAnnotationProvider>();
+			}
 		}
 
 		public T[] GetAttributes<T>(Type type, bool inherit = true) where T : Attribute
@@ -149,7 +157,13 @@ public T[] GetAttributes<T>(Type type, MemberInfo memberInfo, bool inherit = tru
 								                  .FirstOrDefault(v => CompareProperty(v.p, memberInfo))?.index ?? 0;
 						}
 
-						var isIdentity = prop.GetAnnotations()
+						var annotations = prop.GetAnnotations();
+						if (_annotationProvider != null)
+						{
+							annotations = annotations.Concat(_annotationProvider.For(prop));
+						}
+
+						var isIdentity = annotations
 							.Any(a =>
 							{
 								if (a.Name.EndsWith(":ValueGenerationStrategy"))
diff --git a/Source/LinqToDB.EntityFrameworkCore/ILinqToDBForEFTools.cs b/Source/LinqToDB.EntityFrameworkCore/ILinqToDBForEFTools.cs
index 9027aa5..9351b25 100644
--- a/Source/LinqToDB.EntityFrameworkCore/ILinqToDBForEFTools.cs
+++ b/Source/LinqToDB.EntityFrameworkCore/ILinqToDBForEFTools.cs
@@ -1,11 +1,10 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Linq.Expressions;
 
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Query;
-using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Microsoft.Extensions.Logging;
 
@@ -17,7 +16,7 @@ namespace LinqToDB.EntityFrameworkCore
 	using Data;
 
 	/// <summary>
-	/// Interface for EF.Core - LINQ To DB integration bridge.
+	/// Interface for EF Core - LINQ To DB integration bridge.
 	/// </summary>
 	public interface ILinqToDBForEFTools
 	{
@@ -27,76 +26,78 @@ public interface ILinqToDBForEFTools
 		void ClearCaches();
 
 		/// <summary>
-		/// Returns LINQ To DB provider, based on provider data from EF.Core.
+		/// Returns LINQ To DB provider, based on provider data from EF Core.
 		/// </summary>
-		/// <param name="providerInfo">Provider information, extracted from EF.Core.</param>
+		/// <param name="providerInfo">Provider information, extracted from EF Core.</param>
 		/// <param name="connectionInfo">Database connection information.</param>
 		/// <returns>LINQ TO DB provider instance.</returns>
 		IDataProvider? GetDataProvider(EFProviderInfo providerInfo, EFConnectionInfo connectionInfo);
 
 		/// <summary>
-		/// Creates metadata provider for specified EF.Core data model.
+		/// Creates metadata provider for specified EF Core data model. Default implementation uses
+		/// <see cref="EFCoreMetadataReader"/> metadata provider.
 		/// </summary>
-		/// <param name="model">EF.Core data model.</param>
-		/// <param name="dependencies"></param>
-		/// <param name="mappingSource"></param>
-		/// <returns>LINQ To DB metadata provider for specified EF.Core model. Can return <c>null</c>.</returns>
-		IMetadataReader? CreateMetadataReader(IModel? model, RelationalSqlTranslatingExpressionVisitorDependencies? dependencies, IRelationalTypeMappingSource? mappingSource);
+		/// <param name="model">EF Core data model.</param>
+		/// <param name="accessor">EF Core service provider.</param>
+		/// <returns>LINQ To DB metadata provider for specified EF Core model.</returns>
+		IMetadataReader? CreateMetadataReader(
+			IModel? model,
+			IInfrastructure<IServiceProvider>? accessor);
 
 		/// <summary>
-		/// Creates mapping schema using provided EF.Core data model and metadata provider.
+		/// Creates mapping schema using provided EF Core data model and metadata provider.
 		/// </summary>
-		/// <param name="model">EF.Core data model.</param>
+		/// <param name="model">EF Core data model.</param>
 		/// <param name="metadataReader">Additional optional LINQ To DB database metadata provider.</param>
 		/// <param name="convertorSelector">EF Core registry for type conversion.</param>
-		/// <returns>Mapping schema for provided EF.Core model.</returns>
+		/// <returns>Mapping schema for provided EF Core model.</returns>
 		MappingSchema CreateMappingSchema(IModel model, IMetadataReader metadataReader, IValueConverterSelector convertorSelector);
 
 		/// <summary>
-		/// Returns mapping schema using provided EF.Core data model and metadata provider.
+		/// Returns mapping schema using provided EF Core data model and metadata provider.
 		/// </summary>
-		/// <param name="model">EF.Core data model.</param>
+		/// <param name="model">EF Core data model.</param>
 		/// <param name="metadataReader">Additional optional LINQ To DB database metadata provider.</param>
 		/// <param name="convertorSelector">EF Core registry for type conversion.</param>
-		/// <returns>Mapping schema for provided EF.Core model.</returns>
+		/// <returns>Mapping schema for provided EF Core model.</returns>
 		MappingSchema GetMappingSchema(IModel model, IMetadataReader? metadataReader, IValueConverterSelector? convertorSelector);
 
 		/// <summary>
-		/// Returns EF.Core <see cref="IDbContextOptions"/> for specific <see cref="DbContext"/> instance.
+		/// Returns EF Core <see cref="IDbContextOptions"/> for specific <see cref="DbContext"/> instance.
 		/// </summary>
-		/// <param name="context">EF.Core <see cref="DbContext"/> instance.</param>
+		/// <param name="context">EF Core <see cref="DbContext"/> instance.</param>
 		/// <returns><see cref="IDbContextOptions"/> instance.</returns>
 		IDbContextOptions? GetContextOptions(DbContext? context);
 
 		/// <summary>
-		/// Transforms EF.Core expression tree to LINQ To DB expression.
+		/// Transforms EF Core expression tree to LINQ To DB expression.
 		/// </summary>
-		/// <param name="expression">EF.Core expression tree.</param>
+		/// <param name="expression">EF Core expression tree.</param>
 		/// <param name="dc">LINQ To DB <see cref="IDataContext"/> instance.</param>
 		/// <param name="ctx">Optional DbContext instance.</param>
-		/// <param name="model">EF.Core data model instance.</param>
+		/// <param name="model">EF Core data model instance.</param>
 		/// <returns>Transformed expression.</returns>
 		Expression TransformExpression(Expression expression, IDataContext dc, DbContext? ctx, IModel? model);
 
 		/// <summary>
 		/// Extracts <see cref="DbContext"/> instance from <see cref="IQueryable"/> object.
 		/// </summary>
-		/// <param name="query">EF.Core query.</param>
+		/// <param name="query">EF Core query.</param>
 		/// <returns>Current <see cref="DbContext"/> instance.</returns>
 		DbContext? GetCurrentContext(IQueryable query);
 
 		/// <summary>
-		/// Extracts EF.Core connection information object from <see cref="IDbContextOptions"/>.
+		/// Extracts EF Core connection information object from <see cref="IDbContextOptions"/>.
 		/// </summary>
 		/// <param name="options"><see cref="IDbContextOptions"/> instance.</param>
-		/// <returns>EF.Core connection data.</returns>
+		/// <returns>EF Core connection data.</returns>
 		EFConnectionInfo ExtractConnectionInfo(IDbContextOptions? options);
 
 		/// <summary>
-		/// Extracts EF.Core data model instance from <see cref="IDbContextOptions"/>.
+		/// Extracts EF Core data model instance from <see cref="IDbContextOptions"/>.
 		/// </summary>
 		/// <param name="options"><see cref="IDbContextOptions"/> instance.</param>
-		/// <returns>EF.Core data model instance.</returns>
+		/// <returns>EF Core data model instance.</returns>
 		IModel? ExtractModel(IDbContextOptions? options);
 
 		/// <summary>
diff --git a/Source/LinqToDB.EntityFrameworkCore/Internal/LinqToDBForEFQueryProvider.cs b/Source/LinqToDB.EntityFrameworkCore/Internal/LinqToDBForEFQueryProvider.cs
index 2ebc69b..ef6d449 100644
--- a/Source/LinqToDB.EntityFrameworkCore/Internal/LinqToDBForEFQueryProvider.cs
+++ b/Source/LinqToDB.EntityFrameworkCore/Internal/LinqToDBForEFQueryProvider.cs
@@ -83,7 +83,7 @@ public TResult Execute<TResult>(Expression expression)
 			return QueryProvider.Execute<TResult>(expression);
 		}
 
-		private static MethodInfo _executeAsyncMethodInfo =
+		private static readonly MethodInfo _executeAsyncMethodInfo =
 			MemberHelper.MethodOf((IQueryProviderAsync p) => p.ExecuteAsync<int>(null!, default)).GetGenericMethodDefinition();
 
 		/// <summary>
diff --git a/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFTools.cs b/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFTools.cs
index 2057915..3485308 100644
--- a/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFTools.cs
+++ b/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFTools.cs
@@ -12,7 +12,6 @@
 using Microsoft.Extensions.Logging;
 
 using JetBrains.Annotations;
-using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace LinqToDB.EntityFrameworkCore
@@ -28,15 +27,15 @@ namespace LinqToDB.EntityFrameworkCore
 	using Internal;
 
 	/// <summary>
-	/// EF.Core <see cref="DbContext"/> extensions to call LINQ To DB functionality.
+	/// EF Core <see cref="DbContext"/> extensions to call LINQ To DB functionality.
 	/// </summary>
 	[PublicAPI]
 	public static partial class LinqToDBForEFTools
 	{
-		static readonly Lazy<bool> _intialized = new Lazy<bool>(InitializeInternal);
+		static readonly Lazy<bool> _intialized = new(InitializeInternal);
 
 		/// <summary>
-		/// Initializes integration of LINQ To DB with EF.Core.
+		/// Initializes integration of LINQ To DB with EF Core.
 		/// </summary>
 		public static void Initialize()
 		{
@@ -82,7 +81,7 @@ static bool InitializeInternal()
 		static ILinqToDBForEFTools _implementation = null!;
 
 		/// <summary>
-		/// Gets or sets EF.Core to LINQ To DB integration bridge implementation.
+		/// Gets or sets EF Core to LINQ To DB integration bridge implementation.
 		/// </summary>
 		public static ILinqToDBForEFTools Implementation
 		{
@@ -91,11 +90,11 @@ public static ILinqToDBForEFTools Implementation
 			{
 				_implementation = value ?? throw new ArgumentNullException(nameof(value));
 				_metadataReaders.Clear();
-				_defaultMetadataReader = new Lazy<IMetadataReader?>(() => Implementation.CreateMetadataReader(null, null, null));
+				_defaultMetadataReader = new Lazy<IMetadataReader?>(() => Implementation.CreateMetadataReader(null, null));
 			}
 		}
 
-		static readonly ConcurrentDictionary<IModel, IMetadataReader?> _metadataReaders = new ConcurrentDictionary<IModel, IMetadataReader?>();
+		static readonly ConcurrentDictionary<IModel, IMetadataReader?> _metadataReaders = new();
 
 		static Lazy<IMetadataReader?> _defaultMetadataReader = null!;
 
@@ -116,28 +115,26 @@ static LinqToDBForEFTools()
 		}
 
 		/// <summary>
-		/// Creates or return existing metadata provider for provided EF.Core data model. If model is null, empty metadata
+		/// Creates or return existing metadata provider for provided EF Core data model. If model is null, empty metadata
 		/// provider will be returned.
 		/// </summary>
-		/// <param name="model">EF.Core data model instance. Could be <c>null</c>.</param>
-		/// <param name="dependencies"></param>
-		/// <param name="mappingSource"></param>
+		/// <param name="model">EF Core data model instance. Could be <c>null</c>.</param>
+		/// <param name="accessor">EF Core service provider.</param>
 		/// <returns>LINQ To DB metadata provider.</returns>
 		public static IMetadataReader? GetMetadataReader(
 			IModel? model,
-			RelationalSqlTranslatingExpressionVisitorDependencies? dependencies,
-			IRelationalTypeMappingSource? mappingSource)
+			IInfrastructure<IServiceProvider>? accessor)
 		{
 			if (model == null)
 				return _defaultMetadataReader.Value;
 
-			return _metadataReaders.GetOrAdd(model, m => Implementation.CreateMetadataReader(model, dependencies, mappingSource));
+			return _metadataReaders.GetOrAdd(model, m => Implementation.CreateMetadataReader(model, accessor));
 		}
 
 		/// <summary>
-		/// Returns EF.Core <see cref="DbContextOptions"/> for specific <see cref="DbContext"/> instance.
+		/// Returns EF Core <see cref="DbContextOptions"/> for specific <see cref="DbContext"/> instance.
 		/// </summary>
-		/// <param name="context">EF.Core <see cref="DbContext"/> instance.</param>
+		/// <param name="context">EF Core <see cref="DbContext"/> instance.</param>
 		/// <returns><see cref="DbContextOptions"/> instance.</returns>
 		public static IDbContextOptions? GetContextOptions(DbContext context)
 		{
@@ -145,10 +142,10 @@ static LinqToDBForEFTools()
 		}
 
 		/// <summary>
-		/// Returns EF.Core database provider information for specific <see cref="DbContext"/> instance.
+		/// Returns EF Core database provider information for specific <see cref="DbContext"/> instance.
 		/// </summary>
-		/// <param name="context">EF.Core <see cref="DbContext"/> instance.</param>
-		/// <returns>EF.Core provider information.</returns>
+		/// <param name="context">EF Core <see cref="DbContext"/> instance.</param>
+		/// <returns>EF Core provider information.</returns>
 		public static EFProviderInfo GetEFProviderInfo(DbContext context)
 		{
 			var info = new EFProviderInfo
@@ -162,10 +159,10 @@ public static EFProviderInfo GetEFProviderInfo(DbContext context)
 		}
 
 		/// <summary>
-		/// Returns EF.Core database provider information for specific <see cref="DbConnection"/> instance.
+		/// Returns EF Core database provider information for specific <see cref="DbConnection"/> instance.
 		/// </summary>
-		/// <param name="connection">EF.Core <see cref="DbConnection"/> instance.</param>
-		/// <returns>EF.Core provider information.</returns>
+		/// <param name="connection">EF Core <see cref="DbConnection"/> instance.</param>
+		/// <returns>EF Core provider information.</returns>
 		public static EFProviderInfo GetEFProviderInfo(DbConnection connection)
 		{
 			var info = new EFProviderInfo
@@ -179,10 +176,10 @@ public static EFProviderInfo GetEFProviderInfo(DbConnection connection)
 		}
 
 		/// <summary>
-		/// Returns EF.Core database provider information for specific <see cref="DbContextOptions"/> instance.
+		/// Returns EF Core database provider information for specific <see cref="DbContextOptions"/> instance.
 		/// </summary>
-		/// <param name="options">EF.Core <see cref="DbContextOptions"/> instance.</param>
-		/// <returns>EF.Core provider information.</returns>
+		/// <param name="options">EF Core <see cref="DbContextOptions"/> instance.</param>
+		/// <returns>EF Core provider information.</returns>
 		public static EFProviderInfo GetEFProviderInfo(DbContextOptions options)
 		{
 			var info = new EFProviderInfo
@@ -196,9 +193,9 @@ public static EFProviderInfo GetEFProviderInfo(DbContextOptions options)
 		}
 
 		/// <summary>
-		/// Returns LINQ To DB provider, based on provider data from EF.Core.
+		/// Returns LINQ To DB provider, based on provider data from EF Core.
 		/// </summary>
-		/// <param name="info">EF.Core provider information.</param>
+		/// <param name="info">EF Core provider information.</param>
 		/// <param name="connectionInfo">Database connection information.</param>
 		/// <returns>LINQ TO DB provider instance.</returns>
 		public static IDataProvider GetDataProvider(EFProviderInfo info, EFConnectionInfo connectionInfo)
@@ -212,28 +209,27 @@ public static IDataProvider GetDataProvider(EFProviderInfo info, EFConnectionInf
 		}
 
 		/// <summary>
-		/// Creates mapping schema using provided EF.Core data model.
+		/// Creates mapping schema using provided EF Core data model.
 		/// </summary>
-		/// <param name="model">EF.Core data model.</param>
-		/// <param name="convertorSelector">EF Core registry for type conversion.</param>
-		/// <param name="dependencies"></param>
-		/// <param name="mappingSource"></param>
-		/// <returns>Mapping schema for provided EF.Core model.</returns>
-		public static MappingSchema GetMappingSchema(IModel model,
-			IValueConverterSelector? convertorSelector,
-			RelationalSqlTranslatingExpressionVisitorDependencies? dependencies,
-			IRelationalTypeMappingSource? mappingSource)
+		/// <param name="model">EF Core data model.</param>
+		/// <param name="accessor">EF Core service provider.</param>
+		/// <returns>Mapping schema for provided EF Core model.</returns>
+		public static MappingSchema GetMappingSchema(
+			IModel model,
+			IInfrastructure<IServiceProvider>? accessor)
 		{
-			return Implementation.GetMappingSchema(model, GetMetadataReader(model, dependencies, mappingSource), convertorSelector);
+			var converterSelector = accessor?.GetService<IValueConverterSelector>();
+
+			return Implementation.GetMappingSchema(model, GetMetadataReader(model, accessor), converterSelector);
 		}
 
 		/// <summary>
-		/// Transforms EF.Core expression tree to LINQ To DB expression.
+		/// Transforms EF Core expression tree to LINQ To DB expression.
 		/// </summary>
-		/// <param name="expression">EF.Core expression tree.</param>
+		/// <param name="expression">EF Core expression tree.</param>
 		/// <param name="dc">LINQ To DB <see cref="IDataContext"/> instance.</param>
 		/// <param name="ctx">Optional DbContext instance.</param>
-		/// <param name="model">EF.Core data model instance.</param>
+		/// <param name="model">EF Core data model instance.</param>
 		/// <returns>Transformed expression.</returns>
 		public static Expression TransformExpression(Expression expression, IDataContext dc, DbContext? ctx, IModel? model)
 		{
@@ -242,9 +238,9 @@ public static Expression TransformExpression(Expression expression, IDataContext
 
 		/// <summary>
 		/// Creates LINQ To DB <see cref="DataConnection"/> instance, attached to provided
-		/// EF.Core <see cref="DbContext"/> instance connection and transaction.
+		/// EF Core <see cref="DbContext"/> instance connection and transaction.
 		/// </summary>
-		/// <param name="context">EF.Core <see cref="DbContext"/> instance.</param>
+		/// <param name="context">EF Core <see cref="DbContext"/> instance.</param>
 		/// <param name="transaction">Optional transaction instance, to which created connection should be attached.
 		/// If not specified, will use current <see cref="DbContext"/> transaction if it available.</param>
 		/// <returns>LINQ To DB <see cref="DataConnection"/> instance.</returns>
@@ -288,18 +284,15 @@ public static DataConnection CreateLinqToDbConnection(this DbContext context,
 				EnableTracing(dc, logger);
 			}
 
-			var dependencies  = context.GetService<RelationalSqlTranslatingExpressionVisitorDependencies>();
-			var mappingSource = context.GetService<IRelationalTypeMappingSource>();
-			var converters    = context.GetService<IValueConverterSelector>();
-			var mappingSchema = GetMappingSchema(context.Model, converters, dependencies, mappingSource);
+			var mappingSchema = GetMappingSchema(context.Model, context);
 			if (mappingSchema != null)
 				dc.AddMappingSchema(mappingSchema);
 
 			return dc;
 		}
 
-		private static TraceSwitch _defaultTraceSwitch =
-			new TraceSwitch("DataConnection", "DataConnection trace switch", TraceLevel.Info.ToString());
+		private static readonly TraceSwitch _defaultTraceSwitch =
+			new("DataConnection", "DataConnection trace switch", TraceLevel.Info.ToString());
 
 		static void EnableTracing(DataConnection dc, ILogger logger)
 		{
@@ -318,9 +311,9 @@ static void EnableTracing(DataConnection dc, ILogger logger)
 		}
 
 		/// <summary>
-		/// Creates linq2db data context for EF.Core database context.
+		/// Creates linq2db data context for EF Core database context.
 		/// </summary>
-		/// <param name="context">EF.Core database context.</param>
+		/// <param name="context">EF Core database context.</param>
 		/// <param name="transaction">Transaction instance.</param>
 		/// <returns>linq2db data context.</returns>
 		public static IDataContext CreateLinqToDbContext(this DbContext context,
@@ -334,13 +327,10 @@ public static IDataContext CreateLinqToDbContext(this DbContext context,
 
 			transaction = transaction ?? context.Database.CurrentTransaction;
 
-			var connectionInfo = GetConnectionInfo(info);
-			var provider       = GetDataProvider(info, connectionInfo);
-			var dependencies   = context.GetService<RelationalSqlTranslatingExpressionVisitorDependencies>();
-			var mappingSource  = context.GetService<IRelationalTypeMappingSource>();
-			var converters     = context.GetService<IValueConverterSelector>();
-			var mappingSchema  = GetMappingSchema(context.Model, converters, dependencies, mappingSource);
-			var logger         = CreateLogger(info.Options);
+			var connectionInfo     = GetConnectionInfo(info);
+			var provider           = GetDataProvider(info, connectionInfo);
+			var mappingSchema      = GetMappingSchema(context.Model, context);
+			var logger             = CreateLogger(info.Options);
 
 			if (transaction != null)
 			{
@@ -387,9 +377,9 @@ public static IDataContext CreateLinqToDbContext(this DbContext context,
 
 		/// <summary>
 		/// Creates LINQ To DB <see cref="DataConnection"/> instance that creates new database connection using connection
-		/// information from EF.Core <see cref="DbContext"/> instance.
+		/// information from EF Core <see cref="DbContext"/> instance.
 		/// </summary>
-		/// <param name="context">EF.Core <see cref="DbContext"/> instance.</param>
+		/// <param name="context">EF Core <see cref="DbContext"/> instance.</param>
 		/// <returns>LINQ To DB <see cref="DataConnection"/> instance.</returns>
 		public static DataConnection CreateLinq2DbConnectionDetached(this DbContext context)
 		{
@@ -407,10 +397,7 @@ public static DataConnection CreateLinq2DbConnectionDetached(this DbContext cont
 				EnableTracing(dc, logger);
 			}
 
-			var dependencies  = context.GetService<RelationalSqlTranslatingExpressionVisitorDependencies>();
-			var mappingSource = context.GetService<IRelationalTypeMappingSource>();
-			var converters    = context.GetService<IValueConverterSelector>();
-			var mappingSchema = GetMappingSchema(context.Model, converters, dependencies, mappingSource);
+			var mappingSchema = GetMappingSchema(context.Model, context);
 			if (mappingSchema != null)
 				dc.AddMappingSchema(mappingSchema);
 
@@ -418,12 +405,12 @@ public static DataConnection CreateLinq2DbConnectionDetached(this DbContext cont
 		}
 
 
-		static readonly ConcurrentDictionary<Type, Func<DbConnection, string>> _connectionStringExtractors = new ConcurrentDictionary<Type, Func<DbConnection, string>>();
+		static readonly ConcurrentDictionary<Type, Func<DbConnection, string>> _connectionStringExtractors = new();
 
 		/// <summary>
-		/// Extracts database connection information from EF.Core provider data.
+		/// Extracts database connection information from EF Core provider data.
 		/// </summary>
-		/// <param name="info">EF.Core database provider data.</param>
+		/// <param name="info">EF Core database provider data.</param>
 		/// <returns>Database connection information.</returns>
 		public static EFConnectionInfo GetConnectionInfo(EFProviderInfo info)
 		{
@@ -462,10 +449,10 @@ public static EFConnectionInfo GetConnectionInfo(EFProviderInfo info)
 		}
 
 		/// <summary>
-		/// Extracts EF.Core data model instance from <see cref="DbContextOptions"/>.
+		/// Extracts EF Core data model instance from <see cref="DbContextOptions"/>.
 		/// </summary>
 		/// <param name="options"><see cref="DbContextOptions"/> instance.</param>
-		/// <returns>EF.Core data model instance.</returns>
+		/// <returns>EF Core data model instance.</returns>
 		public static IModel? GetModel(DbContextOptions? options)
 		{
 			if (options == null)
@@ -475,9 +462,9 @@ public static EFConnectionInfo GetConnectionInfo(EFProviderInfo info)
 
 		/// <summary>
 		/// Creates new LINQ To DB <see cref="DataConnection"/> instance using connectivity information from
-		/// EF.Core <see cref="DbContextOptions"/> instance.
+		/// EF Core <see cref="DbContextOptions"/> instance.
 		/// </summary>
-		/// <param name="options">EF.Core <see cref="DbContextOptions"/> instance.</param>
+		/// <param name="options">EF Core <see cref="DbContextOptions"/> instance.</param>
 		/// <returns>New LINQ To DB <see cref="DataConnection"/> instance.</returns>
 		public static DataConnection CreateLinqToDbConnection(this DbContextOptions options)
 		{
@@ -505,7 +492,7 @@ public static DataConnection CreateLinqToDbConnection(this DbContextOptions opti
 
 			if (model != null)
 			{
-				var mappingSchema = GetMappingSchema(model, null, null, null);
+				var mappingSchema = GetMappingSchema(model, null);
 				if (mappingSchema != null)
 					dc.AddMappingSchema(mappingSchema);
 			}
@@ -514,10 +501,10 @@ public static DataConnection CreateLinqToDbConnection(this DbContextOptions opti
 		}
 
 		/// <summary>
-		/// Converts EF.Core's query to LINQ To DB query and attach it to provided LINQ To DB <see cref="IDataContext"/>.
+		/// Converts EF Core's query to LINQ To DB query and attach it to provided LINQ To DB <see cref="IDataContext"/>.
 		/// </summary>
 		/// <typeparam name="T">Entity type.</typeparam>
-		/// <param name="query">EF.Core query.</param>
+		/// <param name="query">EF Core query.</param>
 		/// <param name="dc">LINQ To DB <see cref="IDataContext"/> to use with provided query.</param>
 		/// <returns>LINQ To DB query, attached to provided <see cref="IDataContext"/>.</returns>
 		public static IQueryable<T> ToLinqToDB<T>(this IQueryable<T> query, IDataContext dc)
@@ -530,11 +517,11 @@ public static IQueryable<T> ToLinqToDB<T>(this IQueryable<T> query, IDataContext
 		}
 
 		/// <summary>
-		/// Converts EF.Core's query to LINQ To DB query and attach it to current EF.Core connection.
+		/// Converts EF Core's query to LINQ To DB query and attach it to current EF Core connection.
 		/// </summary>
 		/// <typeparam name="T">Entity type.</typeparam>
-		/// <param name="query">EF.Core query.</param>
-		/// <returns>LINQ To DB query, attached to current EF.Core connection.</returns>
+		/// <param name="query">EF Core query.</param>
+		/// <returns>LINQ To DB query, attached to current EF Core connection.</returns>
 		public static IQueryable<T> ToLinqToDB<T>(this IQueryable<T> query)
 		{
 			if (query.Provider is IQueryProviderAsync)
@@ -554,7 +541,7 @@ public static IQueryable<T> ToLinqToDB<T>(this IQueryable<T> query)
 		/// <summary>
 		/// Extracts <see cref="DbContext"/> instance from <see cref="IQueryable"/> object.
 		/// </summary>
-		/// <param name="query">EF.Core query.</param>
+		/// <param name="query">EF Core query.</param>
 		/// <returns>Current <see cref="DbContext"/> instance.</returns>
 		public static DbContext? GetCurrentContext(IQueryable query)
 		{
diff --git a/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs b/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs
index 268d524..78a160c 100644
--- a/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs
+++ b/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs
@@ -43,7 +43,7 @@ namespace LinqToDB.EntityFrameworkCore
 
 	// ReSharper disable once ClassWithVirtualMembersNeverInherited.Global
 	/// <summary>
-	/// Default EF.Core - LINQ To DB integration bridge implementation.
+	/// Default EF Core - LINQ To DB integration bridge implementation.
 	/// </summary>
 	[PublicAPI]
 	public class LinqToDBForEFToolsImplDefault : ILinqToDBForEFTools
@@ -104,10 +104,10 @@ public virtual void ClearCaches()
 		}
 
 		/// <summary>
-		/// Returns LINQ To DB provider, based on provider data from EF.Core.
+		/// Returns LINQ To DB provider, based on provider data from EF Core.
 		/// Could be overriden if you have issues with default detection mechanisms.
 		/// </summary>
-		/// <param name="providerInfo">Provider information, extracted from EF.Core.</param>
+		/// <param name="providerInfo">Provider information, extracted from EF Core.</param>
 		/// <param name="connectionInfo"></param>
 		/// <returns>LINQ TO DB provider instance.</returns>
 		public virtual IDataProvider GetDataProvider(EFProviderInfo providerInfo, EFConnectionInfo connectionInfo)
@@ -121,9 +121,9 @@ public virtual IDataProvider GetDataProvider(EFProviderInfo providerInfo, EFConn
 		}
 
 		/// <summary>
-		/// Converts EF.Core provider settings to linq2db provider settings.
+		/// Converts EF Core provider settings to linq2db provider settings.
 		/// </summary>
-		/// <param name="providerInfo">EF.Core provider settings.</param>
+		/// <param name="providerInfo">EF Core provider settings.</param>
 		/// <returns>linq2db provider settings.</returns>
 		protected virtual LinqToDBProviderInfo GetLinqToDbProviderInfo(EFProviderInfo providerInfo)
 		{
@@ -151,9 +151,9 @@ protected virtual LinqToDBProviderInfo GetLinqToDbProviderInfo(EFProviderInfo pr
 		/// <summary>
 		/// Creates instance of linq2db database provider.
 		/// </summary>
-		/// <param name="providerInfo">EF.Core provider settings.</param>
+		/// <param name="providerInfo">EF Core provider settings.</param>
 		/// <param name="provInfo">linq2db provider settings.</param>
-		/// <param name="connectionInfo">EF.Core connection settings.</param>
+		/// <param name="connectionInfo">EF Core connection settings.</param>
 		/// <returns>linq2db database provider.</returns>
 		protected virtual IDataProvider CreateLinqToDbDataProvider(EFProviderInfo providerInfo, LinqToDBProviderInfo provInfo,
 			EFConnectionInfo connectionInfo)
@@ -197,7 +197,7 @@ protected virtual IDataProvider CreateLinqToDbDataProvider(EFProviderInfo provid
 		/// <summary>
 		/// Creates linq2db provider settings object from <see cref="DatabaseFacade"/> instance.
 		/// </summary>
-		/// <param name="database">EF.Core database information object.</param>
+		/// <param name="database">EF Core database information object.</param>
 		/// <returns>linq2db provider settings.</returns>
 		protected virtual LinqToDBProviderInfo? GetLinqToDbProviderInfo(DatabaseFacade database)
 		{
@@ -285,7 +285,7 @@ protected virtual IDataProvider CreateLinqToDbDataProvider(EFProviderInfo provid
 		/// <summary>
 		/// Creates linq2db provider settings object from <see cref="RelationalOptionsExtension"/> instance.
 		/// </summary>
-		/// <param name="extensions">EF.Core provider options.</param>
+		/// <param name="extensions">EF Core provider options.</param>
 		/// <returns>linq2db provider settings.</returns>
 		protected virtual LinqToDBProviderInfo? GetLinqToDbProviderInfo(RelationalOptionsExtension extensions)
 		{
@@ -387,28 +387,27 @@ protected virtual IDataProvider CreatePostgreSqlProvider(PostgreSQLVersion versi
 		}
 
 		/// <summary>
-		/// Creates metadata provider for specified EF.Core data model. Default implementation uses
+		/// Creates metadata provider for specified EF Core data model. Default implementation uses
 		/// <see cref="EFCoreMetadataReader"/> metadata provider.
 		/// </summary>
-		/// <param name="model">EF.Core data model.</param>
-		/// <param name="dependencies">EF.Core service dependencies.</param>
-		/// <param name="mappingSource">EF.Core mappings source.</param>
-		/// <returns>LINQ To DB metadata provider for specified EF.Core model.</returns>
-		public virtual IMetadataReader CreateMetadataReader(IModel? model,
-			RelationalSqlTranslatingExpressionVisitorDependencies? dependencies,
-			IRelationalTypeMappingSource? mappingSource)
+		/// <param name="model">EF Core data model.</param>
+		/// <param name="accessor">EF Core service provider.</param>
+		/// <returns>LINQ To DB metadata provider for specified EF Core model.</returns>
+		public virtual IMetadataReader CreateMetadataReader(IModel? model, IInfrastructure<IServiceProvider>? accessor)
 		{
-			return new EFCoreMetadataReader(model, dependencies, mappingSource);
+			return new EFCoreMetadataReader(model, accessor);
 		}
 
 		/// <summary>
-		/// Creates mapping schema using provided EF.Core data model and metadata provider.
+		/// Creates mapping schema using provided EF Core data model and metadata provider.
 		/// </summary>
-		/// <param name="model">EF.Core data model.</param>
+		/// <param name="model">EF Core data model.</param>
 		/// <param name="metadataReader">Additional optional LINQ To DB database metadata provider.</param>
 		/// <param name="convertorSelector"></param>
 		/// <returns>Mapping schema for provided EF.Core model.</returns>
-		public virtual MappingSchema CreateMappingSchema(IModel model, IMetadataReader? metadataReader,
+		public virtual MappingSchema CreateMappingSchema(
+			IModel model,
+			IMetadataReader? metadataReader,
 			IValueConverterSelector? convertorSelector)
 		{
 			var schema = new MappingSchema();
@@ -421,10 +420,10 @@ public virtual MappingSchema CreateMappingSchema(IModel model, IMetadataReader?
 		}
 
 		/// <summary>
-		/// Import type conversions from EF.Core model into linq2db mapping schema.
+		/// Import type conversions from EF Core model into linq2db mapping schema.
 		/// </summary>
 		/// <param name="mappingSchema">linq2db mapping schema.</param>
-		/// <param name="model">EF.Core data mode.</param>
+		/// <param name="model">EF Core data mode.</param>
 		/// <param name="convertorSelector">Type filter.</param>
 		public virtual void DefineConvertors(
 			MappingSchema mappingSchema,
@@ -515,9 +514,9 @@ private static Expression WithConvertToObject(Expression valueExpression)
 				: valueExpression;
 		
 		/// <summary>
-		/// Returns mapping schema using provided EF.Core data model and metadata provider.
+		/// Returns mapping schema using provided EF Core data model and metadata provider.
 		/// </summary>
-		/// <param name="model">EF.Core data model.</param>
+		/// <param name="model">EF Core data model.</param>
 		/// <param name="metadataReader">Additional optional LINQ To DB database metadata provider.</param>
 		/// <param name="convertorSelector"></param>
 		/// <returns>Mapping schema for provided EF.Core model.</returns>
@@ -543,9 +542,9 @@ public virtual MappingSchema GetMappingSchema(
 		}
 
 		/// <summary>
-		/// Returns EF.Core <see cref="IDbContextOptions"/> for specific <see cref="DbContext"/> instance.
+		/// Returns EF Core <see cref="IDbContextOptions"/> for specific <see cref="DbContext"/> instance.
 		/// </summary>
-		/// <param name="context">EF.Core <see cref="DbContext"/> instance.</param>
+		/// <param name="context">EF Core <see cref="DbContext"/> instance.</param>
 		/// <returns><see cref="IDbContextOptions"/> instance.</returns>
 		public virtual IDbContextOptions? GetContextOptions(DbContext? context)
 		{
@@ -753,14 +752,14 @@ static List<Expression> CompactTree(List<Expression> items, ExpressionType nodeT
 		}
 
 		/// <summary>
-		/// Transforms EF.Core expression tree to LINQ To DB expression.
-		/// Method replaces EF.Core <see cref="EntityQueryable{TResult}"/> instances with LINQ To DB
+		/// Transforms EF Core expression tree to LINQ To DB expression.
+		/// Method replaces EF Core <see cref="EntityQueryable{TResult}"/> instances with LINQ To DB
 		/// <see cref="DataExtensions.GetTable{T}(IDataContext)"/> calls.
 		/// </summary>
-		/// <param name="expression">EF.Core expression tree.</param>
+		/// <param name="expression">EF Core expression tree.</param>
 		/// <param name="dc">LINQ To DB <see cref="IDataContext"/> instance.</param>
 		/// <param name="ctx">Optional DbContext instance.</param>
-		/// <param name="model">EF.Core data model instance.</param>
+		/// <param name="model">EF Core data model instance.</param>
 		/// <returns>Transformed expression.</returns>
 		public virtual Expression TransformExpression(Expression expression, IDataContext dc, DbContext? ctx, IModel? model)
 		{
@@ -1018,9 +1017,9 @@ static bool IsEnumerableType(Type type, MappingSchema mappingSchema)
 
 		/// <summary>
 		/// Extracts <see cref="DbContext"/> instance from <see cref="IQueryable"/> object.
-		/// Due to unavailability of integration API in EF.Core this method use reflection and could became broken after EF.Core update.
+		/// Due to unavailability of integration API in EF Core this method use reflection and could became broken after EF Core update.
 		/// </summary>
-		/// <param name="query">EF.Core query.</param>
+		/// <param name="query">EF Core query.</param>
 		/// <returns>Current <see cref="DbContext"/> instance.</returns>
 		public virtual DbContext? GetCurrentContext(IQueryable query)
 		{
@@ -1046,10 +1045,10 @@ static bool IsEnumerableType(Type type, MappingSchema mappingSchema)
 		}
 
 		/// <summary>
-		/// Extracts EF.Core connection information object from <see cref="IDbContextOptions"/>.
+		/// Extracts EF Core connection information object from <see cref="IDbContextOptions"/>.
 		/// </summary>
 		/// <param name="options"><see cref="IDbContextOptions"/> instance.</param>
-		/// <returns>EF.Core connection data.</returns>
+		/// <returns>EF Core connection data.</returns>
 		public virtual EFConnectionInfo ExtractConnectionInfo(IDbContextOptions? options)
 		{
 			var relational = options?.Extensions.OfType<RelationalOptionsExtension>().FirstOrDefault();
@@ -1061,10 +1060,10 @@ public virtual EFConnectionInfo ExtractConnectionInfo(IDbContextOptions? options
 		}
 
 		/// <summary>
-		/// Extracts EF.Core data model instance from <see cref="IDbContextOptions"/>.
+		/// Extracts EF Core data model instance from <see cref="IDbContextOptions"/>.
 		/// </summary>
 		/// <param name="options"><see cref="IDbContextOptions"/> instance.</param>
-		/// <returns>EF.Core data model instance.</returns>
+		/// <returns>EF Core data model instance.</returns>
 		public virtual IModel? ExtractModel(IDbContextOptions? options)
 		{
 			var coreOptions = options?.Extensions.OfType<CoreOptionsExtension>().FirstOrDefault();
diff --git a/Tests/LinqToDB.EntityFrameworkCore.SQLite.Tests/Models/ForMapping/ForMappingContext.cs b/Tests/LinqToDB.EntityFrameworkCore.SQLite.Tests/Models/ForMapping/ForMappingContext.cs
index 634131a..b932655 100644
--- a/Tests/LinqToDB.EntityFrameworkCore.SQLite.Tests/Models/ForMapping/ForMappingContext.cs
+++ b/Tests/LinqToDB.EntityFrameworkCore.SQLite.Tests/Models/ForMapping/ForMappingContext.cs
@@ -16,9 +16,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 			modelBuilder.Entity<WithIdentity>(b =>
 			{
 				b.HasKey(e => e.Id);
-
-				b.Property(e => e.Id)
-					.HasAnnotation("Sqlite:Autoincrement", true);
 			});
 
 			modelBuilder.Entity<NoIdentity>(b =>
diff --git a/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/ToolsTests.cs b/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/ToolsTests.cs
index 2f25e2e..927a764 100644
--- a/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/ToolsTests.cs
+++ b/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/ToolsTests.cs
@@ -310,10 +310,7 @@ public void TestKey()
 		{
 			using (var ctx = CreateContext(false))
 			{
-				var dependencies  = ctx.GetService<RelationalSqlTranslatingExpressionVisitorDependencies>();
-				var mappingSource = ctx.GetService<IRelationalTypeMappingSource>();
-				var converters    = ctx.GetService<IValueConverterSelector>();
-				var ms = LinqToDBForEFTools.GetMappingSchema(ctx.Model, converters, dependencies, mappingSource);
+				var ms = LinqToDBForEFTools.GetMappingSchema(ctx.Model, ctx);
 				
 				var customerPk = ms.GetAttribute<ColumnAttribute>(typeof(Customer),
 					MemberHelper.MemberOf<Customer>(c => c.CustomerId));
@@ -330,10 +327,7 @@ public void TestAssociations()
 		{
 			using (var ctx = CreateContext(false))
 			{
-				var dependencies = ctx.GetService<RelationalSqlTranslatingExpressionVisitorDependencies>();
-				var mappingSource = ctx.GetService<IRelationalTypeMappingSource>();
-				var converters    = ctx.GetService<IValueConverterSelector>();
-				var ms = LinqToDBForEFTools.GetMappingSchema(ctx.Model, converters, dependencies, null);
+				var ms = LinqToDBForEFTools.GetMappingSchema(ctx.Model, ctx);
 				
 				var associationOrder = ms.GetAttribute<AssociationAttribute>(typeof(Customer),
 					MemberHelper.MemberOf<Customer>(c => c.Orders));
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 706cc27..2accba6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,8 +1,8 @@
 variables:
   solution: 'linq2db.EFCore.sln'
   build_configuration: 'Release'
-  assemblyVersion: 3.11.0
-  nugetVersion: 3.11.0
+  assemblyVersion: 3.11.1
+  nugetVersion: 3.11.1
   artifact_nugets: 'nugets'
 
 # build on commits to important branches (master + release branches):