Further refactoring in executors