More changes for the query builder aspect.