Added query builder files