refactor senarios and configurations