Move ScenarioInterceptor into ScenarioHelper