added utility function for supplier
started refactoring ScenarioGenerator