Added support for query evaluation