Upgrade architecture