Updated comments in the query class