Make Executor more extendable