add some query classes