Added class Query, Pass em to query builder and etc.