Added references to the query service