Added Query Class