Now compatible with the new QueryBuilder