updated query builder return type