More re-org. Add missing update scenarios.