Added query option