Added reference to Query objects