Add query and query specs