IQueryBuilder api change implementation