Commented all the code in Query class