Improve QueryBuilder