add support for query