diff --git a/Build/linq2db.Default.props b/Build/linq2db.Default.props
index c7c38e2..e3ed806 100644
--- a/Build/linq2db.Default.props
+++ b/Build/linq2db.Default.props
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>5.7.0</Version>
+		<Version>5.8.0</Version>
 
 		<Authors>Svyatoslav Danyliv, Igor Tkachev, Dmitry Lukashenko, Ilya Chudin</Authors>
 		<Product>Linq to DB</Product>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index a24239b..1a5c944 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -5,8 +5,8 @@
 		<PackageVersion Include="NUnit" Version="3.13.2" />
 		<PackageVersion Include="FluentAssertions" Version="5.10.3" />
 
-		<PackageVersion Include="linq2db" Version="3.4.5" />
-		<PackageVersion Include="linq2db.Tools" Version="3.4.5" />
+		<PackageVersion Include="linq2db" Version="3.5.0" />
+		<PackageVersion Include="linq2db.Tools" Version="3.5.0" />
 
 		<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
 
diff --git a/NuGet/linq2db.EntityFrameworkCore.nuspec b/NuGet/linq2db.EntityFrameworkCore.nuspec
index b133c82..8d66a6f 100644
--- a/NuGet/linq2db.EntityFrameworkCore.nuspec
+++ b/NuGet/linq2db.EntityFrameworkCore.nuspec
@@ -16,7 +16,7 @@
 		<dependencies>
 			<group targetFramework=".NETStandard2.1">
 				<dependency id="Microsoft.EntityFrameworkCore.Relational" version="5.0.2" />
-				<dependency id="linq2db" version="3.4.5" />
+				<dependency id="linq2db" version="3.5.0" />
 			</group>
 		</dependencies>
 	</metadata>
diff --git a/Source/LinqToDB.EntityFrameworkCore/EFCoreMetadataReader.cs b/Source/LinqToDB.EntityFrameworkCore/EFCoreMetadataReader.cs
index 860b796..a5ee122 100644
--- a/Source/LinqToDB.EntityFrameworkCore/EFCoreMetadataReader.cs
+++ b/Source/LinqToDB.EntityFrameworkCore/EFCoreMetadataReader.cs
@@ -495,23 +495,12 @@ public override int GetHashCode()
 			return found;
 		}
 
-		private static PropertyInfo GetPropertyInfoForType(Type type, PropertyInfo propInfo)
-		{
-			if (propInfo.DeclaringType == type)
-				return propInfo;
-
-			var found = type.GetProperties()
-				.FirstOrDefault(x => x.Module == propInfo.Module && x.MetadataToken == propInfo.MetadataToken);
-
-			return found ?? propInfo;
-		}
-
 		private Sql.ExpressionAttribute? GetDbFunctionFromProperty(Type type, PropertyInfo propInfo)
 		{
 			if (_dependencies == null || _model == null)
 				return null;
 
-			propInfo = GetPropertyInfoForType(type, propInfo);
+			propInfo = (PropertyInfo)(type.GetMemberEx(propInfo) ?? propInfo);
 
 			var found = _calculatedExtensions.GetOrAdd(propInfo, mi =>
 			{
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index df5b29d..ef49e93 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,8 +1,8 @@
 variables:
   solution: 'linq2db.EFCore.sln'
   build_configuration: 'Release'
-  assemblyVersion: 5.7.0
-  nugetVersion: 5.7.0
+  assemblyVersion: 5.8.0
+  nugetVersion: 5.8.0
   artifact_nugets: 'nugets'
 
 # build on commits to important branches (master + release branches):