improving the instrumentation of the original query
changing the driver to use the new EngineDescription classes, and other minor changes