Query Executor class + refactor