refactoring for inclusion of customer service in orchestration