added remaining query classes