Added query override