Improved Executor and ProgramHandler