Upgrade the query capabilities