Added query parser.