Updated query specs