Lazy loading upgrades