Updates to the query interface