Changes that make the discovery of perf queries work