Improve AbstractQueryBuilder