Components upgrades