Improved SubQueryBuilder