Create version v2 of the query engine. Adjust CMake and lisp files Connect query engine v2 with storage engine v3