Add withQuery