Re Add container Executor

Final fix to revert code back to original state.