QueryBuilder and PathBuilder added