Added the initial query classes