LazyLoad upgrades and improvements