Adapt SQLQueryBuilder to new module