diff --git a/build/AgaLib.vcxproj b/build/AgaLib.vcxproj
index c724057e4..b2808d138 100644
--- a/build/AgaLib.vcxproj
+++ b/build/AgaLib.vcxproj
@@ -149,7 +149,6 @@
     <ClInclude Include="..\src\include\csort.h" />
     <ClInclude Include="..\src\include\currency.h" />
     <ClInclude Include="..\src\include\date.h" />
-    <ClInclude Include="..\src\include\dbrset.h" />
     <ClInclude Include="..\src\include\defmask.h" />
     <ClInclude Include="..\src\include\deftabap.h" />
     <ClInclude Include="..\src\include\devprn.h" />
@@ -230,6 +229,8 @@
     <ClInclude Include="..\src\include\spool.h" />
     <ClInclude Include="..\src\include\sqlset.h" />
     <ClInclude Include="..\src\include\stack.h" />
+    <ClInclude Include="..\src\include\tsdb.h" />
+    <ClInclude Include="..\src\include\ttools.h" />
     <ClInclude Include="..\xvaga\statbar.h" />
     <ClInclude Include="..\src\include\stdtypes.h" />
     <ClInclude Include="..\src\include\stosoll.h" />
@@ -360,7 +361,6 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\src\include\dbrset.cpp" />
     <ClCompile Include="..\src\include\diction.cpp">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -651,6 +651,8 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\src\include\treectrl.cpp" />
+    <ClCompile Include="..\src\include\tsdb.cpp" />
+    <ClCompile Include="..\src\include\ttools.cpp" />
     <ClCompile Include="..\src\include\utility.cpp">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/build/AgaLib.vcxproj.filters b/build/AgaLib.vcxproj.filters
index 77142e45d..35f76fded 100644
--- a/build/AgaLib.vcxproj.filters
+++ b/build/AgaLib.vcxproj.filters
@@ -511,7 +511,10 @@
     <ClInclude Include="..\src\include\odbcrset.h">
       <Filter>Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\include\dbrset.h">
+    <ClInclude Include="..\src\include\ttools.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\tsdb.h">
       <Filter>Headers</Filter>
     </ClInclude>
   </ItemGroup>
@@ -759,7 +762,10 @@
     <ClCompile Include="..\src\include\hashtable.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\include\dbrset.cpp">
+    <ClCompile Include="..\src\include\tsdb.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\include\ttools.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
   </ItemGroup>
@@ -768,7 +774,4 @@
       <Filter>Libraries</Filter>
     </Library>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\src\include\bagn009.uml" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/xvtdb.vcxproj b/build/xvtdb.vcxproj
index fdb4ea141..93627086e 100644
--- a/build/xvtdb.vcxproj
+++ b/build/xvtdb.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -14,17 +14,20 @@
     <ProjectGuid>{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}</ProjectGuid>
     <RootNamespace>xvtdb</RootNamespace>
     <ProjectName>xvtdb</ProjectName>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -195,6 +198,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\xvtdb\xvtdb.h" />
+    <ClInclude Include="..\src\xvtdb\xvtdb_errors.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\xvtdb\xvtdb.cpp" />
diff --git a/build/xvtdb.vcxproj.filters b/build/xvtdb.vcxproj.filters
index e951f6512..6eb00d68d 100644
--- a/build/xvtdb.vcxproj.filters
+++ b/build/xvtdb.vcxproj.filters
@@ -20,6 +20,9 @@
     <ClInclude Include="..\src\xvtdb\xvtdb.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\xvtdb\xvtdb_errors.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Library Include="..\lib\sqlapi.lib">