diff --git a/Makefile.files b/Makefile.files
index c1d5570da3..4a8354d326 100644
--- a/Makefile.files
+++ b/Makefile.files
@@ -23,6 +23,7 @@ BUILT_SOURCES += $(JAVASCRIPT_HEADER)
 ################################################################################
 
 JAVASCRIPT_BROWSER = \
+	html/admin/js/modules/statement-basics.js \
 	html/admin/js/modules/simple-query-basics.js \
 	html/admin/js/modules/simple-query.js
 
@@ -64,8 +65,9 @@ DOXYGEN = \
 	Doxygen/js/common/modules/graph.c \
 	Doxygen/js/common/modules/jsunity.c \
 	Doxygen/js/common/modules/simple-query-basics.c \
-	Doxygen/js/server/modules/org/arangodb/actions.c \
 	Doxygen/js/server/modules/simple-query.c \
+	Doxygen/js/common/modules/statement-basics.c \
+	Doxygen/js/server/modules/org/arangodb/actions.c \
 	Doxygen/js/server/server.c
 
 ################################################################################
diff --git a/Makefile.in b/Makefile.in
index 75855fa1ef..6dc111a9bd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -130,23 +130,6 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -208,11 +191,7 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
 	$(srcdir)/lib/Makefile.files $(srcdir)/lib/Makefile.flex \
 	$(srcdir)/mr/Makefile.mruby $(srcdir)/utils/Makefile.files \
 	$(top_srcdir)/Documentation/arango.template.in \
-	$(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \
-	$(top_srcdir)/config/config.h.in \
-	$(top_srcdir)/config/config.sub $(top_srcdir)/config/depcomp \
-	$(top_srcdir)/config/install-sh $(top_srcdir)/config/missing \
-	$(top_srcdir)/configure \
+	$(top_srcdir)/config/config.h.in $(top_srcdir)/configure \
 	$(top_srcdir)/lib/BasicsC/local-configuration.h.in \
 	config/compile config/config.guess config/config.sub \
 	config/depcomp config/install-sh config/missing
@@ -338,7 +317,7 @@ AR = ar
 ARFLAGS = cru
 AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
-am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_0 = @echo "  AR    " $@;
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
@@ -734,26 +713,26 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_0 = @echo "  CC    " $@;
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_0 = @echo "  CCLD  " $@;
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_0 = @echo "  CXX   " $@;
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(lib_libarango_a_SOURCES) $(lib_libarango_client_a_SOURCES) \
 	$(lib_libarango_fe_a_SOURCES) $(lib_libarango_mruby_a_SOURCES) \
 	$(lib_libarango_v8_a_SOURCES) \
@@ -774,11 +753,6 @@ DIST_SOURCES = $(lib_libarango_a_SOURCES) \
 	$(bin_arango_upgrade_SOURCES) $(am__bin_arangob_SOURCES_DIST) \
 	$(am__bin_arangod_SOURCES_DIST) $(bin_arangoimp_SOURCES) \
 	$(am__bin_arangoirb_SOURCES_DIST) $(bin_arangosh_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -813,8 +787,6 @@ MANS = $(dist_man_MANS)
 DATA = $(arangosysconf_DATA) $(nobase_pkgdata_DATA)
 ETAGS = etags
 CTAGS = ctags
-CSCOPE = cscope
-AM_RECURSIVE_TARGETS = cscope
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -824,10 +796,8 @@ am__remove_distdir = \
       && rm -rf "$(distdir)" \
       || { sleep 5 && rm -rf "$(distdir)"; }; \
   else :; fi
-am__post_remove_distdir = $(am__remove_distdir)
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
-DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -1139,6 +1109,7 @@ JAVASCRIPT_HEADER = \
 ### @brief JavaScript modules for browser
 ################################################################################
 JAVASCRIPT_BROWSER = \
+	html/admin/js/modules/statement-basics.js \
 	html/admin/js/modules/simple-query-basics.js \
 	html/admin/js/modules/simple-query.js
 
@@ -1168,8 +1139,9 @@ DOXYGEN = \
 	Doxygen/js/common/modules/graph.c \
 	Doxygen/js/common/modules/jsunity.c \
 	Doxygen/js/common/modules/simple-query-basics.c \
-	Doxygen/js/server/modules/org/arangodb/actions.c \
 	Doxygen/js/server/modules/simple-query.c \
+	Doxygen/js/common/modules/statement-basics.c \
+	Doxygen/js/server/modules/org/arangodb/actions.c \
 	Doxygen/js/server/server.c
 
 
@@ -2260,11 +2232,8 @@ lib/libarango_v8.a: $(lib_libarango_v8_a_OBJECTS) $(lib_libarango_v8_a_DEPENDENC
 	$(AM_V_at)$(RANLIB) lib/libarango_v8.a
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p; \
@@ -2303,11 +2272,8 @@ clean-noinstPROGRAMS:
 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
+	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
-	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p; \
@@ -4568,18 +4534,11 @@ arangosh/V8Client/bin_arangosh-arangosh.obj: arangosh/V8Client/arangosh.cpp
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bin_arangosh_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o arangosh/V8Client/bin_arangosh-arangosh.obj `if test -f 'arangosh/V8Client/arangosh.cpp'; then $(CYGPATH_W) 'arangosh/V8Client/arangosh.cpp'; else $(CYGPATH_W) '$(srcdir)/arangosh/V8Client/arangosh.cpp'; fi`
 install-man1: $(dist_man_MANS)
 	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(dist_man_MANS)'; \
-	test -n "$(man1dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.1[a-z]*$$/p'; \
-	fi; \
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done; \
+	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1[a-z]*$$/p'; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -4611,18 +4570,11 @@ uninstall-man1:
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-man8: $(dist_man_MANS)
 	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(dist_man_MANS)'; \
-	test -n "$(man8dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.8[a-z]*$$/p'; \
-	fi; \
+	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
+	@list=''; test -n "$(man8dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done; \
+	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.8[a-z]*$$/p'; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -4654,11 +4606,8 @@ uninstall-man8:
 	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
 install-arangosysconfDATA: $(arangosysconf_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(arangosysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(arangosysconfdir)"
 	@list='$(arangosysconf_DATA)'; test -n "$(arangosysconfdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(arangosysconfdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(arangosysconfdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -4675,18 +4624,15 @@ uninstall-arangosysconfDATA:
 	dir='$(DESTDIR)$(arangosysconfdir)'; $(am__uninstall_files_from_dir)
 install-nobase_pkgdataDATA: $(nobase_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(nobase_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	$(am__nobase_list) | while read dir files; do \
 	  xfiles=; for file in $$files; do \
 	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
 	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
 	  test -z "$$xfiles" || { \
 	    test "x$$dir" = x. || { \
-	      echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)/$$dir'"; \
+	      echo "$(MKDIR_P) '$(DESTDIR)$(pkgdatadir)/$$dir'"; \
 	      $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)/$$dir"; }; \
 	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(pkgdatadir)/$$dir'"; \
 	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(pkgdatadir)/$$dir" || exit $$?; }; \
@@ -4742,32 +4688,8 @@ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
 
-cscope: cscope.files
-	test ! -s cscope.files \
-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-
-clean-cscope:
-	-rm -f cscope.files
-
-cscope.files: clean-cscope  cscopelist
-
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
 	@list='$(MANS)'; if test -n "$$list"; then \
@@ -4776,10 +4698,10 @@ distdir: $(DISTFILES)
 	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
 	  if test -n "$$list" && \
 	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
 	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
 	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically 'make maintainer-clean' will remove them" >&2; \
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
 	    exit 1; \
 	  else :; fi; \
 	else :; fi
@@ -4823,36 +4745,40 @@ distdir: $(DISTFILES)
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
+
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
 
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-shar: distdir
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
-dist dist-all:
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
-	$(am__post_remove_distdir)
+dist dist-all: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -4863,6 +4789,8 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.lz*) \
 	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
@@ -4908,7 +4836,7 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
@@ -5144,11 +5072,11 @@ uninstall-man: uninstall-man1 uninstall-man8
 .MAKE: all check install install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-binPROGRAMS clean-cscope clean-generic clean-local \
+	clean-binPROGRAMS clean-generic clean-local \
 	clean-noinstLIBRARIES clean-noinstPROGRAMS clean-sbinPROGRAMS \
-	cscope cscopelist ctags dist dist-all dist-bzip2 dist-gzip \
-	dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
-	distclean distclean-compile distclean-generic distclean-hdr \
+	ctags dist dist-all dist-bzip2 dist-gzip dist-lzip dist-lzma \
+	dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
+	distclean-compile distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-arangosysconfDATA install-binPROGRAMS install-data \
diff --git a/html/admin/index.html b/html/admin/index.html
index f483415f95..8ef6514c8d 100644
--- a/html/admin/index.html
+++ b/html/admin/index.html
@@ -32,6 +32,7 @@
       <script type="text/javascript" language="javascript" src="js/errors.js"></script>
       <script type="text/javascript" language="javascript" src="js/modules/simple-query-basics.js"></script>
       <script type="text/javascript" language="javascript" src="js/modules/simple-query.js"></script>
+      <script type="text/javascript" language="javascript" src="js/modules/statement-basics.js"></script>
       <script type="text/javascript" language="javascript" src="js/client.js"></script>
     <style>
       a:link {color: #797979; text-decoration: none;}  
diff --git a/html/admin/js/.master.js.swo b/html/admin/js/.master.js.swo
deleted file mode 100644
index 93b4afece7..0000000000
Binary files a/html/admin/js/.master.js.swo and /dev/null differ
diff --git a/html/admin/js/modules/statement-basics.js b/html/admin/js/modules/statement-basics.js
new file mode 100644
index 0000000000..57bbc10bb5
--- /dev/null
+++ b/html/admin/js/modules/statement-basics.js
@@ -0,0 +1,228 @@
+module.define("statement-basics", function(exports, module) {
+////////////////////////////////////////////////////////////////////////////////
+/// @brief Arango statements
+///
+/// @file
+///
+/// DISCLAIMER
+///
+/// Copyright 2012 triagens GmbH, Cologne, Germany
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+/// Copyright holder is triAGENS GmbH, Cologne, Germany
+///
+/// @author Jan Steemann
+/// @author Copyright 2012, triAGENS GmbH, Cologne, Germany
+////////////////////////////////////////////////////////////////////////////////
+
+var internal = require("internal");
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                   ArangoStatement
+// -----------------------------------------------------------------------------
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                      constructors and destructors
+// -----------------------------------------------------------------------------
+
+////////////////////////////////////////////////////////////////////////////////
+/// @addtogroup ArangoStatement
+/// @{
+////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief constructor
+////////////////////////////////////////////////////////////////////////////////
+
+function ArangoStatement (database, data) {
+  this._database = database;
+  this._doCount = false;
+  this._batchSize = null;
+  this._bindVars = {};
+  
+  if (!(data instanceof Object)) {
+    throw "ArangoStatement needs initial data";
+  }
+    
+  if (data.query === undefined || data.query === "") {
+    throw "ArangoStatement needs a valid query attribute";
+  }
+  this.setQuery(data.query);
+
+  if (data.count !== undefined) {
+    this.setCount(data.count);
+  }
+  if (data.batchSize !== undefined) {
+    this.setBatchSize(data.batchSize);
+  }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief bind a parameter to the statement
+///
+/// This function can be called multiple times, once for each bind parameter.
+/// All bind parameters will be transferred to the server in one go when 
+/// execute() is called.
+////////////////////////////////////////////////////////////////////////////////
+
+ArangoStatement.prototype.bind = function (key, value) {
+  if (key instanceof Object) {
+    if (value !== undefined) {
+      throw "invalid bind parameter declaration";
+    }
+
+    this._bindVars = key;
+  }
+  else if (typeof(key) === "string") {
+    if (this._bindVars[key] !== undefined) {
+      throw "redeclaration of bind parameter";
+    }
+
+    this._bindVars[key] = value;
+  }
+  else if (typeof(key) === "number") {
+    var strKey = String(parseInt(key));
+
+    if (strKey !== String(key)) {
+      throw "invalid bind parameter declaration";
+    }
+
+    if (this._bindVars[strKey] !== undefined) {
+      throw "redeclaration of bind parameter";
+    }
+
+    this._bindVars[strKey] = value;
+  }
+  else {
+    throw "invalid bind parameter declaration";
+  }
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief return the bind variables already set
+////////////////////////////////////////////////////////////////////////////////
+
+ArangoStatement.prototype.getBindVariables = function () {
+  return this._bindVars;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief get the count flag for the statement
+////////////////////////////////////////////////////////////////////////////////
+
+ArangoStatement.prototype.getCount = function () {
+  return this._doCount;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief get the maximum number of results documents the cursor will return
+/// in a single server roundtrip.
+////////////////////////////////////////////////////////////////////////////////
+
+ArangoStatement.prototype.getBatchSize = function () {
+  return this._batchSize;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief get query string
+////////////////////////////////////////////////////////////////////////////////
+
+ArangoStatement.prototype.getQuery = function () {
+  return this._query;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief set the count flag for the statement
+///
+/// Setting the count flag will make the statement's result cursor return the
+/// total number of result documents. The count flag is not set by default.
+////////////////////////////////////////////////////////////////////////////////
+
+ArangoStatement.prototype.setCount = function (bool) {
+  this._doCount = bool ? true : false;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief set the maximum number of results documents the cursor will return
+/// in a single server roundtrip.
+/// The higher this number is, the less server roundtrips will be made when
+/// iterating over the result documents of a cursor.
+////////////////////////////////////////////////////////////////////////////////
+
+ArangoStatement.prototype.setBatchSize = function (value) {
+  if (parseInt(value) > 0) {
+    this._batchSize = parseInt(value);
+  }
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief set the query string
+////////////////////////////////////////////////////////////////////////////////
+
+ArangoStatement.prototype.setQuery = function (query) {
+  this._query = query;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief parse a query and return the results
+////////////////////////////////////////////////////////////////////////////////
+
+ArangoStatement.prototype.parse = function () {
+  throw "cannot call abstract method parse()";
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief explain a query and return the results
+////////////////////////////////////////////////////////////////////////////////
+
+ArangoStatement.prototype.explain = function () {
+  throw "cannot call abstract method explain()";
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief execute the query
+///
+/// Invoking execute() will transfer the query and all bind parameters to the
+/// server. It will return a cursor with the query results in case of success.
+/// In case of an error, the error will be printed
+////////////////////////////////////////////////////////////////////////////////
+
+ArangoStatement.prototype.execute = function () {
+  throw "cannot call abstract method execute()";
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @}
+////////////////////////////////////////////////////////////////////////////////
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                    MODULE EXPORTS
+// -----------------------------------------------------------------------------
+
+////////////////////////////////////////////////////////////////////////////////
+/// @addtogroup ArangoStatement
+/// @{
+////////////////////////////////////////////////////////////////////////////////
+
+exports.ArangoStatement = ArangoStatement; 
+
+////////////////////////////////////////////////////////////////////////////////
+/// @}
+////////////////////////////////////////////////////////////////////////////////
+
+// Local Variables:
+// mode: outline-minor
+// outline-regexp: "^\\(/// @brief\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @}\\)"
+// End:
+});
diff --git a/js/common/modules/statement-basics.js b/js/common/modules/statement-basics.js
index 15a708c26e..2bc310f1d4 100644
--- a/js/common/modules/statement-basics.js
+++ b/js/common/modules/statement-basics.js
@@ -25,6 +25,8 @@
 /// @author Copyright 2012, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
+var internal = require("internal");
+
 // -----------------------------------------------------------------------------
 // --SECTION--                                                   ArangoStatement
 // -----------------------------------------------------------------------------