Added builder class for Query.