diff --git a/msvc/sqlite-db-tests/sqlite-db-tests.vcxproj b/msvc/sqlite-db-tests/sqlite-db-tests.vcxproj
index a2b1ce0..27499c7 100644
--- a/msvc/sqlite-db-tests/sqlite-db-tests.vcxproj
+++ b/msvc/sqlite-db-tests/sqlite-db-tests.vcxproj
@@ -116,7 +116,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <AdditionalDependencies>sqlite-db.lib;sqlite3.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)\sqlite3\x64\Debug;$(LibraryPath)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)\sqlite3\Debug;$(LibraryPath)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -136,7 +136,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>sqlite-db.lib;sqlite3.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)\sqlite3\x64\Release;$(LibraryPath)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)\sqlite3\Release;$(LibraryPath)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/msvc/yw-cli-tests/yw-cli-tests.vcxproj b/msvc/yw-cli-tests/yw-cli-tests.vcxproj
index 7cfc51f..3c0a3ab 100644
--- a/msvc/yw-cli-tests/yw-cli-tests.vcxproj
+++ b/msvc/yw-cli-tests/yw-cli-tests.vcxproj
@@ -77,7 +77,6 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <LibraryPath>$(SolutionDir)\antlr4-runtime\x64\Debug;$(OutDir);$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
@@ -87,7 +86,6 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <LibraryPath>$(SolutionDir)\antlr4-runtime\x64\Release;$(OutDir);$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -101,8 +99,8 @@
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>yw-cli.lib;yw-config.lib;antlr4-runtime.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)\antlr4-runtime\x64\Debug;$(OutDir);</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -117,8 +115,8 @@
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>yw-cli.lib;yw-config.lib;antlr4-runtime.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)\antlr4-runtime\Debug;$(OutDir);</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -137,8 +135,8 @@
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>yw-cli.lib;yw-config.lib;antlr4-runtime.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)\antlr4-runtime\Release;$(OutDir);</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -157,8 +155,8 @@
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>yw-cli.lib;yw-config.lib;antlr4-runtime.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)\antlr4-runtime\x64\Release;$(OutDir);</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/msvc/yw-config/yw-config.vcxproj b/msvc/yw-config/yw-config.vcxproj
index 793d0f3..4ab7f10 100644
--- a/msvc/yw-config/yw-config.vcxproj
+++ b/msvc/yw-config/yw-config.vcxproj
@@ -122,7 +122,7 @@
       <WarningLevel>Level3</WarningLevel>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\src\yw-types;</AdditionalIncludeDirectories>
diff --git a/msvc/yw-db-tests/yw-db-tests.vcxproj b/msvc/yw-db-tests/yw-db-tests.vcxproj
index 1ff72a9..e7255e2 100644
--- a/msvc/yw-db-tests/yw-db-tests.vcxproj
+++ b/msvc/yw-db-tests/yw-db-tests.vcxproj
@@ -114,7 +114,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <AdditionalDependencies>yw-db.lib;sqlite-db.lib;sqlite3.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)\sqlite3\x64\Debug;</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)\sqlite3\Debug;</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -133,7 +133,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>yw-db.lib;sqlite-db.lib;sqlite3.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)\sqlite3\x64\Release;</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)\sqlite3\Release;</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/msvc/yw-extract-app/yw-extract-app.vcxproj b/msvc/yw-extract-app/yw-extract-app.vcxproj
index f32487d..17520e6 100644
--- a/msvc/yw-extract-app/yw-extract-app.vcxproj
+++ b/msvc/yw-extract-app/yw-extract-app.vcxproj
@@ -107,7 +107,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <AdditionalDependencies>sqlite3.lib;sqlite-db.lib;yw-db.lib;yw-extract.lib;yw-parse.lib;yw-config.lib;yw-cli.lib;antlr4-runtime.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)\sqlite3\x64\Debug;$(SolutionDir)\antlr4-runtime\x64\Debug;$(OutDir)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)\sqlite3\Debug;$(SolutionDir)\antlr4-runtime\Debug;$(OutDir)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -125,7 +125,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>sqlite3.lib;sqlite-db.lib;yw-db.lib;yw-extract.lib;yw-parse.lib;yw-config.lib;yw-cli.lib;antlr4-runtime.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)\sqlite3\x64\Release;$(SolutionDir)\antlr4-runtime\x64\Release;$(OutDir)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)\sqlite3\Release;$(SolutionDir)\antlr4-runtime\Release;$(OutDir)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/msvc/yw-extract-tests/yw-extract-tests.vcxproj b/msvc/yw-extract-tests/yw-extract-tests.vcxproj
index a075749..2248eac 100644
--- a/msvc/yw-extract-tests/yw-extract-tests.vcxproj
+++ b/msvc/yw-extract-tests/yw-extract-tests.vcxproj
@@ -116,7 +116,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <AdditionalDependencies>sqlite3.lib;sqlite-db.lib;yw-db.lib;yw-extract.lib;yw-parse.lib; yw-config.lib;antlr4-runtime.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)\sqlite3\x64\Debug;$(SolutionDir)\antlr4-runtime\x64\Debug;$(OutDir);</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)\sqlite3\Debug;$(SolutionDir)\antlr4-runtime\Debug;$(OutDir);</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -136,7 +136,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>sqlite3.lib;sqlite-db.lib;yw-db.lib;yw-extract.lib;yw-parse.lib; yw-config.lib;antlr4-runtime.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)\sqlite3\x64\Release;$(SolutionDir)\antlr4-runtime\x64\Release;$(OutDir);</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)\sqlite3\Release;$(SolutionDir)\antlr4-runtime\Release;$(OutDir);</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/msvc/yw-graph-app/yw-graph-app.vcxproj b/msvc/yw-graph-app/yw-graph-app.vcxproj
index c7c73f9..514f5c0 100644
--- a/msvc/yw-graph-app/yw-graph-app.vcxproj
+++ b/msvc/yw-graph-app/yw-graph-app.vcxproj
@@ -111,7 +111,7 @@
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
-      <AdditionalLibraryDirectories>$(OutDir);$(GRAPHVIZ_SRC)/x64/StaticDebug;$(SolutionDir)\sqlite3\x64\Debug;$(SolutionDir)\antlr4-runtime\x64\Debug;</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir);$(GRAPHVIZ_SRC)/Win32/StaticDebug;$(SolutionDir)\sqlite3\Debug;$(SolutionDir)\antlr4-runtime\Debug;</AdditionalLibraryDirectories>
       <AdditionalDependencies>yw-graphviz.lib;cdt.lib;cgraph.lib;gvc.lib;gvplugin_core.lib;pathplan.lib;gvplugin_dot_layout.lib;dotgen.lib;xdot.lib;sqlite3.lib;sqlite-db.lib;yw-db.lib;yw-extract.lib;yw-graph.lib;yw-model.lib;yw-parse.lib;yw-config.lib;yw-cli.lib;antlr4-runtime.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -129,7 +129,7 @@
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(OutDir);$(GRAPHVIZ_SRC)/x64/StaticRelease;$(SolutionDir)\sqlite3\x64\Release;$(SolutionDir)\antlr4-runtime\x64\Release;</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir);$(GRAPHVIZ_SRC)/Win32/StaticRelease;$(SolutionDir)\sqlite3\Release;$(SolutionDir)\antlr4-runtime\Release;</AdditionalLibraryDirectories>
       <AdditionalDependencies>yw-graphviz.lib;cdt.lib;cgraph.lib;gvc.lib;gvplugin_core.lib;pathplan.lib;gvplugin_dot_layout.lib;dotgen.lib;xdot.lib;sqlite3.lib;sqlite-db.lib;yw-db.lib;yw-extract.lib;yw-graph.lib;yw-model.lib;yw-parse.lib;yw-config.lib;yw-cli.lib;antlr4-runtime.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
diff --git a/msvc/yw-graph-tests/yw-graph-tests.vcxproj b/msvc/yw-graph-tests/yw-graph-tests.vcxproj
index b1eff60..272d072 100644
--- a/msvc/yw-graph-tests/yw-graph-tests.vcxproj
+++ b/msvc/yw-graph-tests/yw-graph-tests.vcxproj
@@ -117,7 +117,7 @@
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)\sqlite3\x64\Debug;$(SolutionDir)\antlr4-runtime\x64\Debug;$(GRAPHVIZ_SRC)/x64/StaticDebug</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)\sqlite3\Debug;$(SolutionDir)\antlr4-runtime\Debug;$(GRAPHVIZ_SRC)/Win32/StaticDebug</AdditionalLibraryDirectories>
       <AdditionalDependencies>yw-graphviz.lib;cdt.lib;cgraph.lib;gvc.lib;gvplugin_core.lib;pathplan.lib;gvplugin_dot_layout.lib;dotgen.lib;xdot.lib;antlr4-runtime.lib;sqlite3.lib;sqlite-db.lib;yw-config.lib;yw-cli.lib;yw-db.lib;yw-extract.lib;yw-graph.lib;yw-model.lib;yw-parse.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -137,7 +137,7 @@
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)\sqlite3\x64\Debug;$(SolutionDir)\antlr4-runtime\x64\Release;$(GRAPHVIZ_SRC)/x64/StaticRelease</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)\sqlite3\Release;$(SolutionDir)\antlr4-runtime\Release;$(GRAPHVIZ_SRC)/Win32/StaticRelease</AdditionalLibraryDirectories>
       <AdditionalDependencies>yw-graphviz.lib;cdt.lib;cgraph.lib;gvc.lib;gvplugin_core.lib;pathplan.lib;gvplugin_dot_layout.lib;dotgen.lib;xdot.lib;antlr4-runtime.lib;sqlite3.lib;sqlite-db.lib;yw-config.lib;yw-cli.lib;yw-db.lib;yw-extract.lib;yw-graph.lib;yw-model.lib;yw-parse.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
diff --git a/msvc/yw-graphviz-tests/yw-graphviz-tests.vcxproj b/msvc/yw-graphviz-tests/yw-graphviz-tests.vcxproj
index 9c96d4c..c266f52 100644
--- a/msvc/yw-graphviz-tests/yw-graphviz-tests.vcxproj
+++ b/msvc/yw-graphviz-tests/yw-graphviz-tests.vcxproj
@@ -115,8 +115,8 @@
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>yw-graphviz.lib;cdt.lib;cgraph.lib;gvc.lib;gvplugin_core.lib;pathplan.lib;gvplugin_dot_layout.lib;dotgen.lib;xdot.lib;yw-graphviz.lib;cdt.lib;cgraph.lib;circogen.lib;dotgen.lib;fdpgen.lib;gvc.lib;gvortho.lib;gvplugin_core.lib;gvplugin_dot_layout.lib;ingraphs.lib;gvplugin_pango.lib;neatogen.lib;patchwork.lib;pathplan.lib;sparse.lib;twopigen.lib;vpsc.lib;xdot.lib;cairo.lib;cairo-gobject.lib;expat.lib;glib-2.0.lib;gobject-2.0.lib;pango-1.0.lib;pangocairo-1.0.lib;pangoft2-1.0.lib;pangowin32-1.0.lib;rxspencer.lib;zlib.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);$(GRAPHVIZ_SRC)/x64/StaticDebug</AdditionalLibraryDirectories>
+      <AdditionalDependencies>yw-graphviz.lib;cdt.lib;cgraph.lib;gvc.lib;gvplugin_core.lib;pathplan.lib;gvplugin_dot_layout.lib;dotgen.lib;xdot.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir);$(GRAPHVIZ_SRC)/Win32/StaticDebug</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -135,8 +135,8 @@
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>yw-graphviz.lib;cdt.lib;cgraph.lib;gvc.lib;gvplugin_core.lib;pathplan.lib;gvplugin_dot_layout.lib;dotgen.lib;xdot.lib;yw-graphviz.lib;cdt.lib;cgraph.lib;circogen.lib;dotgen.lib;fdpgen.lib;gvc.lib;gvortho.lib;gvplugin_core.lib;gvplugin_dot_layout.lib;ingraphs.lib;gvplugin_pango.lib;neatogen.lib;patchwork.lib;pathplan.lib;sparse.lib;twopigen.lib;vpsc.lib;xdot.lib;cairo.lib;cairo-gobject.lib;expat.lib;glib-2.0.lib;gobject-2.0.lib;pango-1.0.lib;pangocairo-1.0.lib;pangoft2-1.0.lib;pangowin32-1.0.lib;rxspencer.lib;zlib.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);$(GRAPHVIZ_SRC)/x64/StaticRelease</AdditionalLibraryDirectories>
+      <AdditionalDependencies>yw-graphviz.lib;cdt.lib;cgraph.lib;gvc.lib;gvplugin_core.lib;pathplan.lib;gvplugin_dot_layout.lib;dotgen.lib;xdot.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir);$(GRAPHVIZ_SRC)/Win32/StaticRelease</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/msvc/yw-model-tests/yw-model-tests.vcxproj b/msvc/yw-model-tests/yw-model-tests.vcxproj
index c3589e7..c66c75c 100644
--- a/msvc/yw-model-tests/yw-model-tests.vcxproj
+++ b/msvc/yw-model-tests/yw-model-tests.vcxproj
@@ -109,14 +109,16 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ANTLR4CPP_STATIC;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UseFullPaths>true</UseFullPaths>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\src\yw-model;$(SolutionDir)\..\src\yw-types;$(SolutionDir)\..\src\yw-extract;$(SolutionDir)\..\src\yw-db;$(SolutionDir)\..\src\sqlite-3.19.3;$(SolutionDir)\..\src\yw-parse;$(SolutionDir)\..\src\sqlite-db;$(SolutionDir)\..\test\yw-test;$(SolutionDir)\..\test\yw-extract-tests;$(SolutionDir)\..\test\yw-model-tests;$(SolutionDir)\..\test\yw-db-tests;$(SolutionDir)\..\test\yw-test;$(SolutionDir)\yw-model-tests;$(ANTLR4_RUNTIME_SRC);</AdditionalIncludeDirectories>
+      <PrecompiledHeaderFile>yw_model_tests.h</PrecompiledHeaderFile>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>$(SolutionDir)\sqlite3\x64\Debug;$(SolutionDir)\antlr4-runtime\x64\Debug;$(OutDir)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)\sqlite3\Debug;$(SolutionDir)\antlr4-runtime\Debug;$(OutDir)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>sqlite3.lib;sqlite-db.lib;yw-db.lib;yw-model.lib;yw-extract.lib;yw-parse.lib;antlr4-runtime.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -126,16 +128,18 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ANTLR4CPP_STATIC;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UseFullPaths>true</UseFullPaths>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\src\yw-model;$(SolutionDir)\..\src\yw-types;$(SolutionDir)\..\src\yw-extract;$(SolutionDir)\..\src\yw-db;$(SolutionDir)\..\src\sqlite-3.19.3;$(SolutionDir)\..\src\yw-parse;$(SolutionDir)\..\src\sqlite-db;$(SolutionDir)\..\test\yw-test;$(SolutionDir)\..\test\yw-extract-tests;$(SolutionDir)\..\test\yw-model-tests;$(SolutionDir)\..\test\yw-db-tests;$(SolutionDir)\..\test\yw-test;$(SolutionDir)\yw-model-tests;$(ANTLR4_RUNTIME_SRC);</AdditionalIncludeDirectories>
+      <PrecompiledHeaderFile>yw_model_tests.h</PrecompiledHeaderFile>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(SolutionDir)\sqlite3\x64\Release;$(SolutionDir)\antlr4-runtime\x64\Release;$(OutDir)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)\sqlite3\Release;$(SolutionDir)\antlr4-runtime\Release;$(OutDir)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>sqlite3.lib;sqlite-db.lib;yw-db.lib;yw-model.lib;yw-extract.lib;yw-parse.lib;antlr4-runtime.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/msvc/yw-parse-tests/yw-parse-tests.vcxproj b/msvc/yw-parse-tests/yw-parse-tests.vcxproj
index 66392bf..6741941 100644
--- a/msvc/yw-parse-tests/yw-parse-tests.vcxproj
+++ b/msvc/yw-parse-tests/yw-parse-tests.vcxproj
@@ -116,7 +116,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <AdditionalDependencies>yw-parse.lib;antlr4-runtime.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)\antlr4-runtime\x64\Debug;$(OutDir)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)\antlr4-runtime\Debug;$(OutDir)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -136,7 +136,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>yw-parse.lib;antlr4-runtime.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)\antlr4-runtime\x64\Release;$(OutDir)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)\antlr4-runtime\Release;$(OutDir)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/msvc/yw.sln b/msvc/yw.sln
index 2fb74a5..2ea8349 100644
--- a/msvc/yw.sln
+++ b/msvc/yw.sln
@@ -197,6 +197,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yw-config-tests", "yw-confi
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yw-graph", "yw-graph\yw-graph.vcxproj", "{EA928567-D2AB-4353-B0CB-43461B488643}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2D4FE63C-61E8-486F-A3BC-65CB44CDFF28} = {2D4FE63C-61E8-486F-A3BC-65CB44CDFF28}
 		{B511807B-8856-43EF-BD68-8B26D18642D4} = {B511807B-8856-43EF-BD68-8B26D18642D4}
 		{12F54AB5-EC93-4E17-A652-E1620667FDDB} = {12F54AB5-EC93-4E17-A652-E1620667FDDB}
 		{7FF323B9-9432-48FA-8B1A-090062B6440B} = {7FF323B9-9432-48FA-8B1A-090062B6440B}