Structural update to QueryBuilder classes