Split usecase into two work flows again