Re add the query builder in a better way.