diff --git a/Examples/compile_demo.bat b/Examples/compile_demo.bat
index 76475b9..81dbdd7 100755
--- a/Examples/compile_demo.bat
+++ b/Examples/compile_demo.bat
@@ -1 +1 @@
-cl /Ox /W3 /I..\Db demo.c ..\Db\dbmem.c ..\Db\dballoc.c ..\Db\dbdata.c ..\Db\dblock.c ..\DB\dbindex.c ..\Db\dblog.c ..\Db\dbhash.c ..\Db\dbcompare.c ..\Db\dbquery.c ..\Db\dbutil.c ..\Db\dbmpool.c ..\Db\dbjson.c ..\Db\dbschema.c ..\json\JSON_parser.c
+cl /Ox /W3 /I..\Db demo.c ..\Db\dbmem.c ..\Db\dballoc.c ..\Db\dbdata.c ..\Db\dblock.c ..\DB\dbindex.c ..\Db\dblog.c ..\Db\dbhash.c ..\Db\dbcompare.c ..\Db\dbquery.c ..\Db\dbutil.c ..\Db\dbmpool.c ..\Db\dbjson.c ..\Db\dbschema.c ..\json\yajl_all.c
diff --git a/Examples/compile_demo.sh b/Examples/compile_demo.sh
index 88a8d42..875867c 100755
--- a/Examples/compile_demo.sh
+++ b/Examples/compile_demo.sh
@@ -1,3 +1,3 @@
 #/bin/sh
 
-gcc  -O3 -march=pentium4 -o demo  demo.c ../Db/dbmem.c ../Db/dballoc.c ../Db/dbdata.c ../Db/dblock.c ../Db/dbindex.c ../Db/dblog.c ../Db/dbhash.c ../Db/dbcompare.c ../Db/dbquery.c ../Db/dbutil.c ../Db/dbmpool.c ../Db/dbjson.c ../Db/dbschema.c ../json/JSON_parser.c -lm
+gcc  -O3 -march=pentium4 -o demo  demo.c ../Db/dbmem.c ../Db/dballoc.c ../Db/dbdata.c ../Db/dblock.c ../Db/dbindex.c ../Db/dblog.c ../Db/dbhash.c ../Db/dbcompare.c ../Db/dbquery.c ../Db/dbutil.c ../Db/dbmpool.c ../Db/dbjson.c ../Db/dbschema.c ../json/yajl_all.c -lm
diff --git a/Examples/compile_query.bat b/Examples/compile_query.bat
index a302366..98c0e52 100755
--- a/Examples/compile_query.bat
+++ b/Examples/compile_query.bat
@@ -1 +1 @@
-cl /Ox /W3 /I..\Db query.c ..\Db\dbmem.c ..\Db\dballoc.c ..\Db\dbdata.c ..\Db\dblock.c ..\DB\dbindex.c ..\Db\dblog.c ..\Db\dbhash.c ..\Db\dbcompare.c ..\Db\dbquery.c ..\Db\dbutil.c ..\Db\dbtest.c ..\Db\dbmpool.c ..\Db\dbjson.c ..\Db\dbschema.c ..\json\JSON_parser.c
+cl /Ox /W3 /I..\Db query.c ..\Db\dbmem.c ..\Db\dballoc.c ..\Db\dbdata.c ..\Db\dblock.c ..\DB\dbindex.c ..\Db\dblog.c ..\Db\dbhash.c ..\Db\dbcompare.c ..\Db\dbquery.c ..\Db\dbutil.c ..\Db\dbtest.c ..\Db\dbmpool.c ..\Db\dbjson.c ..\Db\dbschema.c ..\json\yajl_all.c
diff --git a/Examples/compile_query.sh b/Examples/compile_query.sh
index 5c88a96..ecfd981 100755
--- a/Examples/compile_query.sh
+++ b/Examples/compile_query.sh
@@ -1,3 +1,3 @@
 #/bin/sh
 
-gcc  -O3 -march=pentium4 -o query  query.c ../Db/dbmem.c ../Db/dballoc.c ../Db/dbdata.c ../Db/dblock.c ../Db/dbindex.c ../Db/dblog.c ../Db/dbhash.c ../Db/dbcompare.c ../Db/dbquery.c ../Db/dbutil.c  ../Db/dbtest.c ../Db/dbmpool.c ../Db/dbjson.c ../Db/dbschema.c ../json/JSON_parser.c -lm
+gcc  -O3 -march=pentium4 -o query  query.c ../Db/dbmem.c ../Db/dballoc.c ../Db/dbdata.c ../Db/dblock.c ../Db/dbindex.c ../Db/dblog.c ../Db/dbhash.c ../Db/dbcompare.c ../Db/dbquery.c ../Db/dbutil.c  ../Db/dbtest.c ../Db/dbmpool.c ../Db/dbjson.c ../Db/dbschema.c ../json/yajl_all.c -lm
diff --git a/Python/compile.bat b/Python/compile.bat
index 4b4bdc6..27a6948 100755
--- a/Python/compile.bat
+++ b/Python/compile.bat
@@ -4,7 +4,7 @@ set PYDIR=c:\Python25
 @rem When compiling for Python 3, replace /export:initwgdb
 @rem with /export:PyInit_wgdb
 
-@cl /Ox /W3 /MT /I..\Db /I%PYDIR%\include wgdbmodule.c ..\Db\dbmem.c ..\Db\dballoc.c ..\Db\dbdata.c ..\Db\dblock.c ..\Db\dbtest.c ..\DB\dbdump.c ..\Db\dblog.c ..\Db\dbhash.c  ..\Db\dbindex.c ..\Db\dbcompare.c ..\Db\dbquery.c ..\Db\dbutil.c ..\Db\dbmpool.c  ..\Db\dbjson.c ..\Db\dbschema.c ..\json\JSON_parser.c /link /dll /incremental:no /MANIFEST:NO /LIBPATH:%PYDIR%\libs /export:initwgdb /out:wgdb.pyd
+@cl /Ox /W3 /MT /I..\Db /I%PYDIR%\include wgdbmodule.c ..\Db\dbmem.c ..\Db\dballoc.c ..\Db\dbdata.c ..\Db\dblock.c ..\Db\dbtest.c ..\DB\dbdump.c ..\Db\dblog.c ..\Db\dbhash.c  ..\Db\dbindex.c ..\Db\dbcompare.c ..\Db\dbquery.c ..\Db\dbutil.c ..\Db\dbmpool.c  ..\Db\dbjson.c ..\Db\dbschema.c ..\json\yajl_all.c /link /dll /incremental:no /MANIFEST:NO /LIBPATH:%PYDIR%\libs /export:initwgdb /out:wgdb.pyd
 @rem Currently this script produced a statically linked DLL for ease of
 @rem testing and debugging. If dynamic linking is needed:
 @rem 1. replace /MT with /MD
diff --git a/Python/compile.sh b/Python/compile.sh
index 4e68acc..0c4ea0b 100755
--- a/Python/compile.sh
+++ b/Python/compile.sh
@@ -2,4 +2,4 @@
 
 export PYDIR=/usr/include/python2.7
 
-gcc -O3 -Wall -march=pentium4 -shared -I../Db -I${PYDIR} -o wgdb.so wgdbmodule.c ../Db/dbmem.c ../Db/dballoc.c ../Db/dbdata.c ../Db/dblock.c ../Db/dbindex.c ../Db/dbtest.c  ../Db/dblog.c ../Db/dbhash.c  ../Db/dbcompare.c ../Db/dbquery.c ../Db/dbutil.c ../Db/dbmpool.c ../Db/dbjson.c ../Db/dbschema.c ../json/JSON_parser.c
+gcc -O3 -Wall -march=pentium4 -shared -I../Db -I${PYDIR} -o wgdb.so wgdbmodule.c ../Db/dbmem.c ../Db/dballoc.c ../Db/dbdata.c ../Db/dblock.c ../Db/dbindex.c ../Db/dbtest.c  ../Db/dblog.c ../Db/dbhash.c  ../Db/dbcompare.c ../Db/dbquery.c ../Db/dbutil.c ../Db/dbmpool.c ../Db/dbjson.c ../Db/dbschema.c ../json/yajl_all.c
diff --git a/compile.bat b/compile.bat
index a677396..f3abd18 100644
--- a/compile.bat
+++ b/compile.bat
@@ -1,14 +1,14 @@
 @rem current version does not build reasoner: added later
 
-cl /Ox /W3 Main\wgdb.c Db\dbmem.c Db\dballoc.c Db\dbdata.c Db\dblock.c Db\dbtest.c DB\dbdump.c Db\dblog.c Db\dbhash.c Db\dbindex.c Db\dbcompare.c Db\dbquery.c Db\dbutil.c Db\dbmpool.c Db\dbjson.c Db\dbschema.c json\JSON_parser.c
-cl /Ox /W3 Main\indextool.c Db\dbmem.c Db\dballoc.c Db\dbdata.c Db\dblock.c Db\dbtest.c Db\dblog.c Db\dbhash.c Db\dbindex.c Db\dbcompare.c Db\dbquery.c Db\dbutil.c Db\dbmpool.c Db\dbjson.c Db\dbschema.c json\JSON_parser.c
+cl /Ox /W3 Main\wgdb.c Db\dbmem.c Db\dballoc.c Db\dbdata.c Db\dblock.c Db\dbtest.c DB\dbdump.c Db\dblog.c Db\dbhash.c Db\dbindex.c Db\dbcompare.c Db\dbquery.c Db\dbutil.c Db\dbmpool.c Db\dbjson.c Db\dbschema.c json\yajl_all.c
+cl /Ox /W3 Main\indextool.c Db\dbmem.c Db\dballoc.c Db\dbdata.c Db\dblock.c Db\dbtest.c Db\dblog.c Db\dbhash.c Db\dbindex.c Db\dbcompare.c Db\dbquery.c Db\dbutil.c Db\dbmpool.c Db\dbjson.c Db\dbschema.c json\yajl_all.c
 cl /Ox /W3 Main\stresstest.c Db\dbmem.c Db\dballoc.c Db\dbdata.c Db\dblock.c Db\dblog.c Db\dbhash.c Db\dbindex.c Db\dbcompare.c Db\dbmpool.c
 
 @rem build DLL. Currently we are not using it to link executables however.
 @rem unlike gcc build, it is necessary to have all functions declared in
 @rem wgdb.def file. Make sure it's up to date (should list same functions as
 @rem Db/dbapi.h)
-cl /Ox /W3 /MT /Fewgdb /LD Db\dbmem.c Db\dballoc.c Db\dbdata.c Db\dblock.c Db\dbtest.c DB\dbdump.c Db\dblog.c Db\dbhash.c  Db\dbindex.c Db\dbcompare.c Db\dbquery.c Db\dbutil.c Db\dbmpool.c Db\dbjson.c Db\dbschema.c json\JSON_parser.c /link /def:wgdb.def /incremental:no /MANIFEST:NO
+cl /Ox /W3 /MT /Fewgdb /LD Db\dbmem.c Db\dballoc.c Db\dbdata.c Db\dblock.c Db\dbtest.c DB\dbdump.c Db\dblog.c Db\dbhash.c  Db\dbindex.c Db\dbcompare.c Db\dbquery.c Db\dbutil.c Db\dbmpool.c Db\dbjson.c Db\dbschema.c json\yajl_all.c /link /def:wgdb.def /incremental:no /MANIFEST:NO
 
 @rem Example of linking against wgdb.dll
 @rem cl /Ox /W3 Main\stresstest.c wgdb.lib
diff --git a/compile.sh b/compile.sh
index 61ff07f..2ec7b19 100755
--- a/compile.sh
+++ b/compile.sh
@@ -11,11 +11,11 @@ fi
 gcc  -O2 -Wall -march=pentium4 -o Main/wgdb Main/wgdb.c Db/dbmem.c \
   Db/dballoc.c Db/dbdata.c Db/dblock.c Db/dbindex.c Db/dbtest.c Db/dbdump.c  \
   Db/dblog.c Db/dbhash.c Db/dbcompare.c Db/dbquery.c Db/dbutil.c Db/dbmpool.c \
-  Db/dbjson.c Db/dbschema.c json/JSON_parser.c -lm
+  Db/dbjson.c Db/dbschema.c json/yajl_all.c -lm
 gcc  -O2 -march=pentium4 -o Main/indextool  Main/indextool.c Db/dbmem.c \
   Db/dballoc.c Db/dbdata.c Db/dblock.c Db/dbindex.c Db/dbtest.c Db/dblog.c \
   Db/dbhash.c Db/dbcompare.c Db/dbquery.c Db/dbutil.c Db/dbmpool.c \
-  Db/dbjson.c Db/dbschema.c json/JSON_parser.c -lm
+  Db/dbjson.c Db/dbschema.c json/yajl_all.c -lm
 gcc  -O3 -Wall -march=pentium4 -pthread -o Main/stresstest Main/stresstest.c \
   Db/dbmem.c Db/dballoc.c Db/dbdata.c Db/dblock.c Db/dbindex.c  \
   Db/dblog.c Db/dbhash.c Db/dbcompare.c Db/dbmpool.c -lm
diff --git a/java/jni/compile_bridge.sh b/java/jni/compile_bridge.sh
index c0a1373..9f6ea3d 100644
--- a/java/jni/compile_bridge.sh
+++ b/java/jni/compile_bridge.sh
@@ -4,5 +4,5 @@
 DBDIR=../../../Db
 
 cd library
-gcc  -O2 -march=pentium4 -lm -shared -I${JAVA_HOME}/include ../src/native/whitedbDriver.c ${DBDIR}/dbmem.c ${DBDIR}/dballoc.c ${DBDIR}/dbdata.c ${DBDIR}/dblock.c ${DBDIR}/dbindex.c ${DBDIR}/dbtest.c ${DBDIR}/dblog.c ${DBDIR}/dbhash.c ${DBDIR}/dbcompare.c ${DBDIR}/dbquery.c ${DBDIR}/dbutil.c ${DBDIR}/dbmpool.c ${DBDIR}/dbschema.c ${DBDIR}/dbjson.c ${DBDIR}/../json/JSON_parser.c -o libwhitedbDriver.so
+gcc  -O2 -march=pentium4 -lm -shared -I${JAVA_HOME}/include ../src/native/whitedbDriver.c ${DBDIR}/dbmem.c ${DBDIR}/dballoc.c ${DBDIR}/dbdata.c ${DBDIR}/dblock.c ${DBDIR}/dbindex.c ${DBDIR}/dbtest.c ${DBDIR}/dblog.c ${DBDIR}/dbhash.c ${DBDIR}/dbcompare.c ${DBDIR}/dbquery.c ${DBDIR}/dbutil.c ${DBDIR}/dbmpool.c ${DBDIR}/dbschema.c ${DBDIR}/dbjson.c ${DBDIR}/../json/yajl_all.c -o libwhitedbDriver.so