Fix executor path and refactoring work