Add more functions to query passes