Made Query extendable