Modified queries as extension methods. Added PerformanceTest instrumentation.