add query parser and executor