Refactor of Executor
Api was changed - version 2.0