Added QueryBuilder part