Support for new complex queries.