diff --git a/Extras/Core/FastReport.Data/Directory.Build.props b/Extras/Core/FastReport.Data/Directory.Build.props
index b4b99490..82233ecb 100644
--- a/Extras/Core/FastReport.Data/Directory.Build.props
+++ b/Extras/Core/FastReport.Data/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+  <!--<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />-->
   
   <PropertyGroup>
     <NetFrameworkMinimum>net462</NetFrameworkMinimum>
diff --git a/FastReport.OpenSource.sln b/FastReport.OpenSource.sln
index d6ef419f..a467065c 100644
--- a/FastReport.OpenSource.sln
+++ b/FastReport.OpenSource.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29201.188
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33110.190
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource", "FastReport.OpenSource\FastReport.OpenSource.csproj", "{62667265-5E09-444D-8218-244DE84804A7}"
 EndProject
@@ -45,6 +45,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.Data.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.Data.Firebird", "Extras\Core\FastReport.Data\FastReport.Data.Firebird\FastReport.OpenSource.Data.Firebird.csproj", "{2DB7A38A-4E08-4411-8AE0-D85DED02C2DE}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.Data.Cassandra", "Extras\Core\FastReport.Data\FastReport.Data.Cassandra\FastReport.OpenSource.Data.Cassandra.csproj", "{32A6139B-F913-457D-9913-3CFC1C7990AB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.Data.ElasticSearch", "Extras\Core\FastReport.Data\FastReport.Data.ElasticSearch\FastReport.OpenSource.Data.ElasticSearch.csproj", "{C766181C-FB64-4204-BFAF-BECE1E5218DD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.Data.Excel", "Extras\Core\FastReport.Data\FastReport.Data.Excel\FastReport.OpenSource.Data.Excel.csproj", "{43BC1122-E846-406F-AA7D-737E8AC5AA6E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Academic|Any CPU = Academic|Any CPU
@@ -234,6 +240,36 @@ Global
 		{2DB7A38A-4E08-4411-8AE0-D85DED02C2DE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2DB7A38A-4E08-4411-8AE0-D85DED02C2DE}.WinForms|Any CPU.ActiveCfg = Debug|Any CPU
 		{2DB7A38A-4E08-4411-8AE0-D85DED02C2DE}.WinForms|Any CPU.Build.0 = Debug|Any CPU
+		{32A6139B-F913-457D-9913-3CFC1C7990AB}.Academic|Any CPU.ActiveCfg = Debug|Any CPU
+		{32A6139B-F913-457D-9913-3CFC1C7990AB}.Academic|Any CPU.Build.0 = Debug|Any CPU
+		{32A6139B-F913-457D-9913-3CFC1C7990AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32A6139B-F913-457D-9913-3CFC1C7990AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32A6139B-F913-457D-9913-3CFC1C7990AB}.Demo|Any CPU.ActiveCfg = Debug|Any CPU
+		{32A6139B-F913-457D-9913-3CFC1C7990AB}.Demo|Any CPU.Build.0 = Debug|Any CPU
+		{32A6139B-F913-457D-9913-3CFC1C7990AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32A6139B-F913-457D-9913-3CFC1C7990AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32A6139B-F913-457D-9913-3CFC1C7990AB}.WinForms|Any CPU.ActiveCfg = Debug|Any CPU
+		{32A6139B-F913-457D-9913-3CFC1C7990AB}.WinForms|Any CPU.Build.0 = Debug|Any CPU
+		{C766181C-FB64-4204-BFAF-BECE1E5218DD}.Academic|Any CPU.ActiveCfg = Debug|Any CPU
+		{C766181C-FB64-4204-BFAF-BECE1E5218DD}.Academic|Any CPU.Build.0 = Debug|Any CPU
+		{C766181C-FB64-4204-BFAF-BECE1E5218DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C766181C-FB64-4204-BFAF-BECE1E5218DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C766181C-FB64-4204-BFAF-BECE1E5218DD}.Demo|Any CPU.ActiveCfg = Debug|Any CPU
+		{C766181C-FB64-4204-BFAF-BECE1E5218DD}.Demo|Any CPU.Build.0 = Debug|Any CPU
+		{C766181C-FB64-4204-BFAF-BECE1E5218DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C766181C-FB64-4204-BFAF-BECE1E5218DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C766181C-FB64-4204-BFAF-BECE1E5218DD}.WinForms|Any CPU.ActiveCfg = Debug|Any CPU
+		{C766181C-FB64-4204-BFAF-BECE1E5218DD}.WinForms|Any CPU.Build.0 = Debug|Any CPU
+		{43BC1122-E846-406F-AA7D-737E8AC5AA6E}.Academic|Any CPU.ActiveCfg = Debug|Any CPU
+		{43BC1122-E846-406F-AA7D-737E8AC5AA6E}.Academic|Any CPU.Build.0 = Debug|Any CPU
+		{43BC1122-E846-406F-AA7D-737E8AC5AA6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43BC1122-E846-406F-AA7D-737E8AC5AA6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43BC1122-E846-406F-AA7D-737E8AC5AA6E}.Demo|Any CPU.ActiveCfg = Debug|Any CPU
+		{43BC1122-E846-406F-AA7D-737E8AC5AA6E}.Demo|Any CPU.Build.0 = Debug|Any CPU
+		{43BC1122-E846-406F-AA7D-737E8AC5AA6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43BC1122-E846-406F-AA7D-737E8AC5AA6E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43BC1122-E846-406F-AA7D-737E8AC5AA6E}.WinForms|Any CPU.ActiveCfg = Debug|Any CPU
+		{43BC1122-E846-406F-AA7D-737E8AC5AA6E}.WinForms|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -255,6 +291,9 @@ Global
 		{01DA6786-77D4-4457-BF33-E204F0C9E155} = {CCF32DAC-85D9-43D4-A4A7-72626A13D806}
 		{BDB7D5CB-8DD2-48DB-BA81-FDDC88135B35} = {898AF8DC-11C3-4640-B60C-5D8CBF2F29CF}
 		{2DB7A38A-4E08-4411-8AE0-D85DED02C2DE} = {898AF8DC-11C3-4640-B60C-5D8CBF2F29CF}
+		{32A6139B-F913-457D-9913-3CFC1C7990AB} = {898AF8DC-11C3-4640-B60C-5D8CBF2F29CF}
+		{C766181C-FB64-4204-BFAF-BECE1E5218DD} = {898AF8DC-11C3-4640-B60C-5D8CBF2F29CF}
+		{43BC1122-E846-406F-AA7D-737E8AC5AA6E} = {898AF8DC-11C3-4640-B60C-5D8CBF2F29CF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DFBB1F5B-F03E-4BCB-AFEE-A45A2C4D5BB8}