* updated query builder requirement