Executor rework

Rework based on code review comments.