Add QueryBuilder class