SwitchYard: UseCase refactoring