Adding Query related changes