added query builder