Refactor
Add DelegateTo annotation
Rename executor class