Architectural upgrades