adding query builder support