Updated Query file