Added query parser