added query classes (2)