added query classes