Minor refactoring(Request -> Query, Optimizer -> Executor)