Context runner refactoring