Re-added the query classes