Updating the signature for query