Extract Handler from Executor

There are many duplicated codes...